Fix C highlighting inconsistencies.

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
+ "#define"
-"#else" @keyword
+ "#elif"
-"#endif" @keyword
+ "#else"
-"#if" @keyword
+ "#endif"
-"#ifdef" @keyword
+ "#if"
-"#ifndef" @keyword
+ "#ifdef"
-"#include" @keyword
+ "#ifndef"
-(preproc_directive) @keyword
+ "#include"
+ (preproc_directive)
+] @keyword.directive
 
 "--" @operator
 "-" @operator
@@ -47,8 +51,8 @@
 ">" @operator
 "||" @operator
 
-"." @delimiter
+"." @punctuation.delimiter
-";" @delimiter
+";" @punctuation.delimiter
 
 (string_literal) @string
 (system_lib_string) @string

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" = "#a4a0e8" # lavender
-"variable" = "#eccdba" # almond
+# "variable" = "#eccdba" # almond TODO: metavariables only
 "variable.parameter" = "#a4a0e8" # lavender
 # TODO distinguish type from type.builtin?
 "type" = "#ffffff" # white