improvements

Changes

2 changed files (+53/-35)

• package.json
  • @@ -27,6 +27,8 @@ "file-types": [
    "vala", "vapi" ], + "highlights": ["queries/highlights.scm"], + "locals": ["queries/locals.scm"], "first-line-regex": "#!.*\\bvala$", "injection-regex": "^vala$" }
• queries/nvim/highlights.scm
  • @@ -13,7 +13,7 @@ )
    (comment) @comment - (type (symbol (_)? @include (identifier) @type)) + (type (symbol (_)? @namespace (identifier) @type)) ; highlight creation methods in object creation expressions (
  • @@ -22,21 +22,33 @@ (#match? @constructor "^[a-z][a-z_0-9]*$")
    ) (unqualified_type (symbol . (identifier) @type)) - (unqualified_type (symbol (symbol) @include (identifier) @type)) + (unqualified_type (symbol (symbol) @namespace (identifier) @type)) (attribute) @attribute + (namespace_declaration (symbol) @namespace) (method_declaration (symbol (symbol) @type (identifier) @function)) (method_declaration (symbol (identifier) @function)) (local_function_declaration (identifier) @function) (destructor_declaration (identifier) @function) (creation_method_declaration (symbol (symbol) @type (identifier) @constructor)) (creation_method_declaration (symbol (identifier) @constructor)) + (constructor_declaration "construct" @keyword.function) (enum_declaration (symbol) @type) (enum_value (identifier) @constant) (errordomain_declaration (symbol) @type) (errorcode (identifier) @constant) (constant_declaration (identifier) @constant) (method_call_expression (member_access_expression (identifier) @function)) + ; highlight special methods + ( + (method_call_expression (member_access_expression (identifier) @function.builtin)) + (#match? @function.builtin "exit") + ) + ; highlight macros + ( + (method_call_expression (member_access_expression (identifier) @function.macro)) + (#match? @function.macro "^(assert|error|info|print|warning(_once)?)$") + ) (lambda_expression (identifier) @parameter) (parameter (identifier) @parameter) (property_declaration (symbol (identifier) @property))
  • @@ -48,15 +60,13 @@ (value_access)
    ] @variable.builtin (boolean) @boolean (character) @character + (escape_sequence) @character.special (integer) @number (null) @constant.builtin (real) @float - (regex) @constant + (regex) @string.regex (string) @string - [ - (escape_sequence) - (string_formatter) - ] @string.special + (string_formatter) @string.special (template_string) @string (template_string_expression) @string.special (verbatim_string) @string
  • @@ -81,66 +91,72 @@ "break"
    "case" "catch" "class" - "const" "construct" "continue" "default" "delegate" - "do" - "dynamic" - "else" "enum" "errordomain" - "extern" "finally" - "for" - "foreach" "get" - "if" "inline" "interface" - "internal" - "lock" "namespace" "new" "out" "override" - "owned" "partial" - "private" - "protected" - "public" "ref" "set" "signal" - "static" "struct" "switch" "throw" "throws" "try" - "unowned" "virtual" - "weak" - "while" "with" ] @keyword [ - "and" - "as" - "delete" - "in" - "is" - "not" - "or" - "sizeof" - "typeof" + "const" + "dynamic" + "owned" + "weak" + "unowned" + ] @type.qualifier + + [ + "else" + "if" + ] @conditional + + [ + "extern" + "internal" + "private" + "protected" + "public" + "static" + ] @storageclass + + [ + "and" + "as" + "delete" + "in" + "is" + "lock" + "not" + "or" + "sizeof" + "typeof" ] @keyword.operator "using" @include + (using_directive (symbol) @namespace) - (symbol "global::" @include) + (symbol "global::" @namespace) (array_creation_expression "new" @keyword.operator) (object_creation_expression "new" @keyword.operator)