neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix: file_type_config should not use syntax.FileType.get_all()

Browse source
This commit is contained in:
CJ van den Berg 2025-07-14 17:13:55 +02:00
parent f7cea96844
commit f88613a9e4
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/file_type_config.zig
View file

@ -130,9 +130,9 @@ fn load_all(allocator: std.mem.Allocator) ![]const []const u8 {
try names.put(allocator, try allocator.dupe(u8, file_type_name), {}); try names.put(allocator, try allocator.dupe(u8, file_type_name), {});
} }
for (syntax.FileType.get_all()) |static_file_type| { for (syntax.FileType.get_all()) |file_type| {
if (!names.contains(static_file_type.name)) if (!names.contains(file_type.name))
try names.put(allocator, try allocator.dupe(u8, static_file_type.name), {}); try names.put(allocator, try allocator.dupe(u8, file_type.name), {});
} }
var list: std.ArrayListUnmanaged([]const u8) = .empty; var list: std.ArrayListUnmanaged([]const u8) = .empty;
@ -159,9 +159,9 @@ pub fn guess_file_type(file_path: ?[]const u8, content: []const u8) ?@This() {
fn guess(file_path: ?[]const u8, content: []const u8) ?@This() { fn guess(file_path: ?[]const u8, content: []const u8) ?@This() {
if (guess_first_line(content)) |ft| return ft; if (guess_first_line(content)) |ft| return ft;
for (syntax.FileType.get_all()) |static_file_type| { for (get_all_names()) |file_type_name| {
const file_type = get(static_file_type.name) catch unreachable orelse unreachable; const file_type = get(file_type_name) catch unreachable orelse unreachable;
if (file_path) |fp| if (syntax.FileType.match_file_type(file_type.extensions orelse static_file_type.extensions, fp)) if (file_path) |fp| if (syntax.FileType.match_file_type(file_type.extensions orelse continue, fp))
return file_type; return file_type;
} }
return null; return null;
@ -169,8 +169,8 @@ fn guess(file_path: ?[]const u8, content: []const u8) ?@This() {
fn guess_first_line(content: []const u8) ?@This() { fn guess_first_line(content: []const u8) ?@This() {
const first_line = if (std.mem.indexOf(u8, content, "\n")) |pos| content[0..pos] else content; const first_line = if (std.mem.indexOf(u8, content, "\n")) |pos| content[0..pos] else content;
for (syntax.FileType.get_all()) |static_file_type| { for (get_all_names()) |file_type_name| {
const file_type = get(static_file_type.name) catch unreachable orelse unreachable; const file_type = get(file_type_name) catch unreachable orelse unreachable;
if (syntax.FileType.match_first_line(file_type.first_line_matches_prefix, file_type.first_line_matches_content, first_line)) if (syntax.FileType.match_first_line(file_type.first_line_matches_prefix, file_type.first_line_matches_content, first_line))
return file_type; return file_type;
} }