helix-editor · kirawi · Sep 11, 2022 · Sep 13, 2022 · Sep 13, 2022 · Sep 13, 2022
diff --git a/book/src/languages.md b/book/src/languages.md
@@ -61,6 +61,7 @@ These configuration keys are available:
 | `config`              | Language Server configuration                                 |
 | `grammar`             | The tree-sitter grammar to use (defaults to the value of `name`) |
 | `formatter`           | The formatter for the language, it will take precedence over the lsp when defined. The formatter must be able to take the original file as input from stdin and write the formatted file to stdout |
+| `append-error-node`   | Whether to append a `(ERROR) @error` capture to the language query. (defaults to `true`) |
 
 ### Language Server configuration
 

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
@@ -54,6 +54,10 @@ fn default_timeout() -> u64 {
     20
 }
 
+fn default_append_error_node() -> bool {
+    true
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Configuration {
     pub language: Vec<LanguageConfiguration>,
@@ -115,6 +119,9 @@ pub struct LanguageConfiguration {
     pub auto_pairs: Option<AutoPairs>,
 
     pub rulers: Option<Vec<u16>>, // if set, override editor's rulers
+
+    #[serde(default = "default_append_error_node")]
+    pub append_error_node: bool,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -355,9 +362,11 @@ impl LanguageConfiguration {
     fn initialize_highlight(&self, scopes: &[String]) -> Option<Arc<HighlightConfiguration>> {
         let language = self.language_id.to_ascii_lowercase();
 
-        let highlights_query = read_query(&language, "highlights.scm");
-        // always highlight syntax errors
-        // highlights_query += "\n(ERROR) @error";
+        let mut highlights_query = read_query(&language, "highlights.scm");
+
+        if self.append_error_node {
+            highlights_query += "\n(ERROR) @error";
+        }
 
         let injections_query = read_query(&language, "injections.scm");
         let locals_query = read_query(&language, "locals.scm");

diff --git a/languages.toml b/languages.toml
@@ -184,7 +184,7 @@ args = { console = "internalConsole", attachCommands = [ "platform select remote
 
 [[grammar]]
 name = "c"
-source = { git = "https://github.com/tree-sitter/tree-sitter-c", rev = "f05e279aedde06a25801c3f2b2cc8ac17fac52ae" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-c", rev = "7175a6dd5fc1cee660dce6fe23f6043d75af424a" }
 
 [[language]]
 name = "cpp"

diff --git a/runtime/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
@@ -1,72 +1,147 @@
 (storage_class_specifier) @keyword.storage
 
-"goto" @keyword
-"register" @keyword
-"break" @keyword
-"case" @keyword
-"continue" @keyword
-"default" @keyword
-"do" @keyword
-"else" @keyword
-"enum" @keyword
-"extern" @keyword
-"for" @keyword
-"if" @keyword
-"inline" @keyword
-"return" @keyword
-"sizeof" @keyword
-"struct" @keyword
-"switch" @keyword
-"typedef" @keyword
-"union" @keyword
-"volatile" @keyword
-"while" @keyword
-"const" @keyword
+[
+  "const"
+  "default"
+  "enum"
+  "extern"
+  "inline"
+  "static"
+  "struct"
+  "typedef"
+  "union"
+  "volatile"
+  "goto"
+  "register"
+] @keyword
+
+"sizeof" @keyword.operator
+"return" @keyword.control.return
+
+[
+  "while"
+  "for"
+  "do"
+  "continue"
+  "break"
+] @keyword.control.repeat
+
+[
+  "if"
+  "else"
+  "case"
+  "switch"
+] @keyword.control.conditional
+(conditional_expression [ "?" ":" ] @keyword.control.conditional)
 
 [
- "#define"
- "#elif"
- "#else"
- "#endif"
- "#if"
- "#ifdef"
- "#ifndef"
- "#include"
- (preproc_directive)
+  "#define"
+  "#include"
+  "#if"
+  "#ifdef"
+  "#ifndef"
+  "#else"
+  "#elif"
+  "#endif"
+  (preproc_directive)
 ] @keyword.directive
 
-"--" @operator
-"-" @operator
-"-=" @operator
-"->" @operator
-"=" @operator
-"!=" @operator
-"*" @operator
-"&" @operator
-"&&" @operator
-"+" @operator
-"++" @operator
-"+=" @operator
-"<" @operator
-"==" @operator
-">" @operator
-"||" @operator
-">=" @operator
-"<=" @operator
-
-"." @punctuation.delimiter
-";" @punctuation.delimiter
-
-[(true) (false)] @constant.builtin.boolean
-
-(enumerator) @type.enum.variant
+[ ";" ":" "," ] @punctuation.delimiter
+[ "(" ")" "[" "]" "{" "}"] @punctuation.bracket
+"..." @punctuation.special
+
+[
+  "="
+
+  "-"
+  "*"
+  "/"
+  "+"
+  "%"
+
+  "~"
+  "|"
+  "&"
+  "^"
+  "<<"
+  ">>"
+
+  "->"
+  "."
+
+  "<"
+  "<="
+  ">="
+  ">"
+  "=="
+  "!="
+
+  "!"
+  "&&"
+  "||"
+
+  "-="
+  "+="
+  "*="
+  "/="
+  "%="
+  "|="
+  "&="
+  "^="
+  ">>="
+  "<<="
+  "--"
+  "++"
+] @operator
+
+;; Make sure the comma operator is given a highlight group after the comma
+;; punctuator so the operator is highlighted properly.
+(comma_expression [ "," ] @operator)
+
+[
+  (true)
+  (false)
+] @constant.builtin.boolean
 
 (string_literal) @string
-(system_lib_string) @string
+(system_lib_string) @string.special.path
 
-(null) @constant
-(number_literal) @constant.numeric.integer
+(escape_sequence) @constant.character.escape
 (char_literal) @constant.character
+(number_literal) @constant.numeric
+(null) @constant.builtin
+
+[
+  (preproc_arg)
+  (preproc_defined)
+] @function.macro
+
+(statement_identifier) @label
+
+[
+ (type_identifier)
+ (sized_type_specifier)
+ (type_descriptor)
+] @type
+(primitive_type) @type.builtin
+
+(sizeof_expression value: (parenthesized_expression (identifier) @type))
+(enumerator
+  name: (identifier) @type.enum.variant)
+
+((identifier) @constant
+ (#match? @constant "^[A-Z][A-Z\\d_]*$"))
+
+(case_statement
+  value: (identifier) @constant)
+
+;; Preproc def / undef
+(preproc_def
+  name: (_) @constant)
+(preproc_call
+  directive: (preproc_directive) @_u
+  argument: (_) @constant
+  (#eq? @_u "#undef"))
 
 (call_expression
   function: (identifier) @function)
@@ -76,17 +151,29 @@
 (function_declarator
   declarator: (identifier) @function)
 (preproc_function_def
-  name: (identifier) @function.special)
+  name: (identifier) @function.macro)
 
-(field_identifier) @variable.other.member
-(statement_identifier) @label
-(type_identifier) @type
-(primitive_type) @type
-(sized_type_specifier) @type
+(comment) @comment
 
-((identifier) @constant
- (#match? @constant "^[A-Z][A-Z\\d_]*$"))
+;; Parameters
+(parameter_declaration
+  declarator: (identifier) @variable.parameter)
+(parameter_declaration
+  declarator: (pointer_declarator) @variable.parameter)
+(preproc_params (identifier) @variable.parameter)
 
-(identifier) @variable
+[
+  "__attribute__"
+  "__cdecl"
+  "__clrcall"
+  "__stdcall"
+  "__fastcall"
+  "__thiscall"
+  "__vectorcall"
+  "_unaligned"
+  "__unaligned"
+  "__declspec"
+  (attribute_declaration)
+] @attribute
 
-(comment) @comment
+(field_identifier) @variable.other.member
diff --git a/runtime/queries/cpon/highlights.scm b/runtime/queries/cpon/highlights.scm
@@ -13,7 +13,6 @@
 
 (string) @string
 (escape_sequence) @constant.character.escape
-(ERROR) @error
 
 "," @punctuation.delimiter
 [

diff --git a/runtime/queries/dart/highlights.scm b/runtime/queries/dart/highlights.scm
@@ -233,5 +233,4 @@
  (#match? @variable.builtin "^(abstract|as|covariant|deferred|dynamic|export|external|factory|Function|get|implements|import|interface|library|operator|mixin|part|set|static|typedef)$"))
 
 ; Error
-(ERROR) @error
 
diff --git a/runtime/queries/dot/highlights.scm b/runtime/queries/dot/highlights.scm
@@ -38,6 +38,5 @@
   (preproc)
 ] @comment
 
-(ERROR) @error
 
 (identifier) @variable
diff --git a/runtime/queries/fish/highlights.scm b/runtime/queries/fish/highlights.scm
@@ -153,4 +153,3 @@
 
 ;; Error
 
-(ERROR) @error
diff --git a/runtime/queries/git-rebase/highlights.scm b/runtime/queries/git-rebase/highlights.scm
@@ -8,4 +8,3 @@
 "#" @punctuation.delimiter
 (comment) @comment
 
-(ERROR) @error
diff --git a/runtime/queries/godot-resource/highlights.scm b/runtime/queries/godot-resource/highlights.scm
@@ -24,5 +24,3 @@
 ] @punctuation.bracket
 
 "=" @operator
-
-(ERROR) @error
diff --git a/runtime/queries/gotmpl/highlights.scm b/runtime/queries/gotmpl/highlights.scm
@@ -73,4 +73,3 @@
 (nil) @constant.builtin
 
 (comment) @comment
-(ERROR) @error
diff --git a/runtime/queries/json/highlights.scm b/runtime/queries/json/highlights.scm
@@ -9,7 +9,6 @@
 
 (string) @string
 (escape_sequence) @constant.character.escape
-(ERROR) @error
 
 "," @punctuation.delimiter
 [

diff --git a/runtime/queries/latex/highlights.scm b/runtime/queries/latex/highlights.scm
@@ -1,5 +1,4 @@
 ;; General syntax
-(ERROR) @error
 
 (command_name) @function
 (caption

diff --git a/runtime/queries/lean/highlights.scm b/runtime/queries/lean/highlights.scm
@@ -211,7 +211,6 @@
 (sorry) @error
 
 ;; Error
-(ERROR) @error
 
 ; Variables
 (identifier) @variable
diff --git a/runtime/queries/llvm-mir/highlights.scm b/runtime/queries/llvm-mir/highlights.scm
@@ -133,4 +133,3 @@
   (float_keyword)
 ] @keyword
 
-(ERROR) @error
diff --git a/runtime/queries/llvm/highlights.scm b/runtime/queries/llvm/highlights.scm
@@ -155,4 +155,3 @@
   "zeroinitializer"
 ] @constant.builtin
 
-(ERROR) @error
diff --git a/runtime/queries/lua/highlights.scm b/runtime/queries/lua/highlights.scm
@@ -163,4 +163,3 @@
 (identifier) @variable
 
 ;; Error
-(ERROR) @error
diff --git a/runtime/queries/ocaml/highlights.scm b/runtime/queries/ocaml/highlights.scm
@@ -152,7 +152,6 @@
 
 [(comment) (line_number_directive) (directive) (shebang)] @comment
 
-(ERROR) @error
 
 ; Blanket highlights
 ; ------------------

diff --git a/runtime/queries/python/highlights.scm b/runtime/queries/python/highlights.scm
@@ -217,4 +217,3 @@
   (#match? @type.builtin
     "^(BaseException|Exception|ArithmeticError|BufferError|LookupError|AssertionError|AttributeError|EOFError|FloatingPointError|GeneratorExit|ImportError|ModuleNotFoundError|IndexError|KeyError|KeyboardInterrupt|MemoryError|NameError|NotImplementedError|OSError|OverflowError|RecursionError|ReferenceError|RuntimeError|StopIteration|StopAsyncIteration|SyntaxError|IndentationError|TabError|SystemError|SystemExit|TypeError|UnboundLocalError|UnicodeError|UnicodeEncodeError|UnicodeDecodeError|UnicodeTranslateError|ValueError|ZeroDivisionError|EnvironmentError|IOError|WindowsError|BlockingIOError|ChildProcessError|ConnectionError|BrokenPipeError|ConnectionAbortedError|ConnectionRefusedError|ConnectionResetError|FileExistsError|FileNotFoundError|InterruptedError|IsADirectoryError|NotADirectoryError|PermissionError|ProcessLookupError|TimeoutError|Warning|UserWarning|DeprecationWarning|PendingDeprecationWarning|SyntaxWarning|RuntimeWarning|FutureWarning|ImportWarning|UnicodeWarning|BytesWarning|ResourceWarning)$"))
 
-(ERROR) @error
diff --git a/runtime/queries/r/highlights.scm b/runtime/queries/r/highlights.scm
@@ -125,4 +125,3 @@
 (identifier) @variable
 
 ; Error
-(ERROR) @error