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

fix: make cpp highlights inherit from c highlights

Browse source 
closes #42
This commit is contained in:
CJ van den Berg 2024-09-11 15:51:40 +02:00
parent b4d8cf6b3d
commit 7a46ce585b
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/syntax/src/file_type.zig
View file

@ -125,6 +125,8 @@ fn load_file_types(comptime Namespace: type) []const FileType {
.highlights = if (build_options.use_tree_sitter) .highlights = if (build_options.use_tree_sitter)
if (@hasField(@TypeOf(args), "highlights")) if (@hasField(@TypeOf(args), "highlights"))
@embedFile(args.highlights) @embedFile(args.highlights)
else if (@hasField(@TypeOf(args), "highlights_list"))
@embedFile(args.highlights_list[0]) ++ "\n" ++ @embedFile(args.highlights_list[1])
else else
@embedFile("tree-sitter-" ++ lang ++ "/queries/highlights.scm") @embedFile("tree-sitter-" ++ lang ++ "/queries/highlights.scm")
else else

4
src/syntax/src/file_types.zig
View file

@ -43,6 +43,10 @@ pub const cpp = .{
.icon = "", .icon = "",
.extensions = .{ "cc", "cpp", "cxx", "hpp", "hxx", "h", "ipp", "ixx" }, .extensions = .{ "cc", "cpp", "cxx", "hpp", "hxx", "h", "ipp", "ixx" },
.comment = "//", .comment = "//",
.highlights_list = .{
"tree-sitter-c/queries/highlights.scm",
"tree-sitter-cpp/queries/highlights.scm",
},
.injections = "tree-sitter-cpp/queries/injections.scm", .injections = "tree-sitter-cpp/queries/injections.scm",
.formatter = .{"clang-format"}, .formatter = .{"clang-format"},
.language_server = .{"clangd"}, .language_server = .{"clangd"},