aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlaž Hrastnik2021-04-23 09:42:29 +0000
committerBlaž Hrastnik2021-04-23 09:42:29 +0000
commit77db3599ba4eaaae3e03217abd57416f09834536 (patch)
tree1c773548f1e70aee817a629a60271aea3ce62a1a
parent7e9ea30a0b4eee08322d689450efebe74dec8097 (diff)
Fix C highlighting inconsistencies.
-rw-r--r--runtime/queries/c/highlights.scm26
-rw-r--r--theme.toml5
2 files changed, 18 insertions, 13 deletions
diff --git a/runtime/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
index 04d9a04f..36fe47d9 100644
--- a/runtime/queries/c/highlights.scm
+++ b/runtime/queries/c/highlights.scm
@@ -1,3 +1,5 @@
+"goto" @keyword
+"register" @keyword
"break" @keyword
"case" @keyword
"const" @keyword
@@ -20,15 +22,17 @@
"volatile" @keyword
"while" @keyword
-"#define" @keyword
-"#elif" @keyword
-"#else" @keyword
-"#endif" @keyword
-"#if" @keyword
-"#ifdef" @keyword
-"#ifndef" @keyword
-"#include" @keyword
-(preproc_directive) @keyword
+[
+ "#define"
+ "#elif"
+ "#else"
+ "#endif"
+ "#if"
+ "#ifdef"
+ "#ifndef"
+ "#include"
+ (preproc_directive)
+] @keyword.directive
"--" @operator
"-" @operator
@@ -47,8 +51,8 @@
">" @operator
"||" @operator
-"." @delimiter
-";" @delimiter
+"." @punctuation.delimiter
+";" @punctuation.delimiter
(string_literal) @string
(system_lib_string) @string
diff --git a/theme.toml b/theme.toml
index f46ce1a9..0d4e0857 100644
--- a/theme.toml
+++ b/theme.toml
@@ -1,12 +1,13 @@
"attribute" = "#dbbfef" # lilac
"keyword" = "#eccdba" # almond
+"keyword.directive" = "#dbbfef" # lilac -- preprocessor comments (#if in C)
"punctuation" = "#a4a0e8" # lavender
"punctuation.delimiter" = "#a4a0e8" # lavender
"operator" = "#dbbfef" # lilac
# "property" = "#a4a0e8" # lavender
"property" = "#ffffff" # white
-# "variable" = "#a4a0e8" # lavender
-"variable" = "#eccdba" # almond
+"variable" = "#a4a0e8" # lavender
+# "variable" = "#eccdba" # almond TODO: metavariables only
"variable.parameter" = "#a4a0e8" # lavender
# TODO distinguish type from type.builtin?
"type" = "#ffffff" # white