diff options
| author | Stephan Seitz <stephan.seitz@fau.de> | 2020-07-04 22:00:59 +0200 |
|---|---|---|
| committer | Thomas Vigouroux <39092278+vigoux@users.noreply.github.com> | 2020-07-05 19:48:02 +0200 |
| commit | 63c1853674f8f6c81bc8883383ad550499410568 (patch) | |
| tree | 5e06ff1dfc89a06f992715d6c4247cf1be4b55cd /queries/c | |
| parent | Update README.md (diff) | |
| download | nvim-treesitter-63c1853674f8f6c81bc8883383ad550499410568.tar nvim-treesitter-63c1853674f8f6c81bc8883383ad550499410568.tar.gz nvim-treesitter-63c1853674f8f6c81bc8883383ad550499410568.tar.bz2 nvim-treesitter-63c1853674f8f6c81bc8883383ad550499410568.tar.lz nvim-treesitter-63c1853674f8f6c81bc8883383ad550499410568.tar.xz nvim-treesitter-63c1853674f8f6c81bc8883383ad550499410568.tar.zst nvim-treesitter-63c1853674f8f6c81bc8883383ad550499410568.zip | |
C/C++ highlights: update to new syntax
This changed the highlight of "switch" to conditional and of "break" to repeat.
Diffstat (limited to 'queries/c')
| -rw-r--r-- | queries/c/highlights.scm | 117 | ||||
| -rw-r--r-- | queries/c/locals.scm | 14 |
2 files changed, 68 insertions, 63 deletions
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm index 5a79a2b5e..3fbf4ffa9 100644 --- a/queries/c/highlights.scm +++ b/queries/c/highlights.scm @@ -1,24 +1,34 @@ -"break" @keyword -"case" @conditional -"const" @keyword -"continue" @repeat -"default" @keyword -"do" @repeat -"else" @conditional -"enum" @keyword -"extern" @keyword -"for" @repeat -"if" @conditional -"inline" @keyword -"return" @keyword -"sizeof" @keyword -"static" @keyword -"struct" @keyword -"switch" @keyword -"typedef" @keyword -"union" @keyword -"volatile" @keyword -"while" @repeat +[ + "const" + "default" + "enum" + "extern" + "inline" + "return" + "sizeof" + "static" + "struct" + "typedef" + "union" + "volatile" +] @keyword + +[ + "while" + "for" + "do" + "continue" + "break" +] @repeat + +[ + "if" + "else" + "case" + "switch" +] @conditional + +(conditional_expression [ "?" ":" ] @conditional) "#define" @constant.macro [ @@ -32,45 +42,38 @@ (preproc_directive) ] @keyword -"--" @operator -"-" @operator -"->" @operator -"!=" @operator -"*" @operator -"/" @operator -"&" @operator -"&&" @operator -"+" @operator -"++" @operator -"<" @operator -"<=" @operator -"==" @operator -"=" @operator -"~" @operator -">" @operator -">=" @operator -"!" @operator -"||" @operator -(conditional_expression [ "?" ":" ] @conditional) +[ + "--" + "-" + "->" + "!=" + "*" + "/" + "&" + "&&" + "+" + "++" + "<" + "<=" + "==" + "=" + "~" + ">" + ">=" + "!" + "||" -"-=" @operator -"+=" @operator -"*=" @operator -"/=" @operator -"|=" @operator -"&=" @operator + "-=" + "+=" + "*=" + "/=" + "|=" + "&=" +] @operator -"." @punctuation.delimiter -";" @punctuation.delimiter -":" @punctuation.delimiter -"," @punctuation.delimiter +[ "." ";" ":" "," ] @punctuation.delimiter -"(" @punctuation.bracket -")" @punctuation.bracket -"[" @punctuation.bracket -"]" @punctuation.bracket -"{" @punctuation.bracket -"}" @punctuation.bracket +[ "(" ")" "[" "]" "{" "}"] @punctuation.bracket (string_literal) @string (system_lib_string) @string diff --git a/queries/c/locals.scm b/queries/c/locals.scm index 505db5b57..06b5a4c95 100644 --- a/queries/c/locals.scm +++ b/queries/c/locals.scm @@ -31,9 +31,11 @@ (identifier) @reference ;; Scope -(for_statement) @scope -(if_statement) @scope -(while_statement) @scope -(translation_unit) @scope -(function_definition) @scope -(compound_statement) @scope ; a block in curly braces +[ + (for_statement) + (if_statement) + (while_statement) + (translation_unit) + (function_definition) + (compound_statement) ; a block in curly braces +] @scope |