add more rules, improve highlights - add enum, errordomain, interface, and struct - highlight more keywords

Changes

2 changed files (+114/-10)

• grammar.js
  • @@ -33,6 +33,10 @@ repeat($.attribute),
    choice( $.namespace_declaration, $.class_declaration, + $.interface_declaration, + $.struct_declaration, + $.enum_declaration, + $.errordomain_declaration, $.method_declaration, $.field_declaration, $.constant_declaration
  • @@ -166,14 +170,9 @@ this_access: $ => 'this',
    base_access: $ => 'base', - oce_type: $ => seq( - $.symbol, - optional($.type_arguments), - ), - object_creation_expression: $ => seq( 'new', - $.oce_type, + $.unqualified_type, '(', optional(seq($.argument, repeat(seq(',', $.argument)))), ')'
  • @@ -239,6 +238,11 @@ repeat($.array_type)
    ) ), + unqualified_type: $ => seq( + $.symbol, + optional($.type_arguments) + ), + type_arguments: $ => seq( '<', $.type,
  • @@ -294,9 +298,9 @@ ),
    class_declaration: $ => seq( optional($.access_modifier), - optional(seq($.type_declaration_modifier, repeat(seq(',', $.type_declaration_modifier)))), + repeat($.type_declaration_modifier), 'class', - $.type, + $.unqualified_type, optional(seq(':', $.type, repeat(seq(',', $.type)))), '{', repeat($.class_member),
  • @@ -307,12 +311,98 @@ class_member: $ => seq(
    repeat($.attribute), choice( $.class_declaration, + $.interface_declaration, + $.struct_declaration, + $.enum_declaration, $.method_declaration, $.creation_method_declaration, $.field_declaration, $.constant_declaration, $.property_declaration ), + ), + + interface_declaration: $ => seq( + optional($.access_modifier), + repeat($.type_declaration_modifier), + 'interface', + $.unqualified_type, + optional(seq(':', $.type, repeat(seq(',', $.type)))), + '{', + repeat($.interface_member), + '}' + ), + + interface_member: $ => seq( + repeat($.attribute), + choice( + $.class_declaration, + $.interface_declaration, + $.struct_declaration, + $.enum_declaration, + $.method_declaration, + $.field_declaration, + $.constant_declaration, + $.property_declaration + ) + ), + + struct_declaration: $ => seq( + optional($.access_modifier), + repeat($.type_declaration_modifier), + 'struct', + $.unqualified_type, + optional(seq(':', $.type, repeat(seq(',', $.type)))), + '{', + repeat($.struct_member), + '}' + ), + + struct_member: $ => seq( + repeat($.attribute), + choice( + $.method_declaration, + $.field_declaration, + $.constant_declaration, + $.property_declaration + ) + ), + + enum_declaration: $ => seq( + optional($.access_modifier), + repeat($.type_declaration_modifier), + 'enum', + $.symbol, + '{', + $.enum_value, + repeat(seq(',', $.enum_value)), + optional(seq(';', repeat(choice($.method_declaration, $.constant_declaration)))), + '}' + ), + + enum_value: $ => seq( + repeat($.attribute), + $.identifier, + '=', + $._expression + ), + + errordomain_declaration: $ => seq( + optional($.access_modifier), + repeat($.type_declaration_modifier), + 'errordomain', + $.symbol, + '{', + $.errorcode, + repeat(seq(',', $.errorcode)), + optional(seq(';', repeat($.method_declaration))), + '}' + ), + + errorcode: $ => seq( + repeat($.attribute), + $.identifier, + optional(seq('=', $._expression)) ), parameter: $ => seq(
• queries/highlights.scm
  • @@ -2,11 +2,15 @@ ; highlights.scm
    (comment) @comment (type) @type - (oce_type) @type ; unqualified types appearing within object creation expressions - (access_modifier) @keyword + (unqualified_type) @type (attribute) @attribute (method_declaration (symbol (identifier) @function)) (creation_method_declaration (symbol (identifier) @constructor)) + (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)) (parameter (identifier) @variable.parameter) (property_declaration (symbol (identifier) @property))
  • @@ -42,6 +46,8 @@ "default"
    "do" "dynamic" "else" + "enum" + "errordomain" "extern" "finally" "for"
  • @@ -49,6 +55,9 @@ "foreach"
    "get" "if" "in" + "inline" + "interface" + "internal" "is" "lock" "namespace"
  • @@ -56,10 +65,15 @@ "new"
    "not" "out" "override" + "private" + "protected" + "public" "ref" "return" "set" "sizeof" + "static" + "struct" "switch" "throw" "throws"