Added support for properties and fixed missing abstract keyword on classes

Author: codecat

AngelScript.sublime-syntax

@@ -11,6 +11,9 @@ variables:
   number: ((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f)?
   primitives: (int|int8|int16|int32|int64|uint|uint8|uint16|uint32|uint64|bool|float|double|bool|auto|void|array|dictionary|ref)
 
+  class_modifiers: '(abstract)'
+  definition_modifiers: '(protected|private)'
+
   language_variables: '(this)'
   language_support_functions: '(GetVar(Int|Float|Bool|String|Ivec2|Vec[234])|GetParam(Int|Long|Float|Bool|I?Vec[234]|String|Array|Dictionary)|HashString|SetVar|AddVar|print|xy|xyz|xyzw|atan|sin|asin|cos|acos|sqrt|pow|pow2|round|roundl|floor|ceil|log|normalize|dot|length|lengthsq|max|min|clamp|randf|randi|randdir|randfn|addrot|rottowards|capangle|angdiff|dist|distsq|formatTime|ease|formatThousands|formatInt|formatFloat|lerp|ilerp|sign|tocolor|i?vec[234]|UnitPtr)'
 
@@ -54,10 +57,12 @@ contexts:
           pop: true
 
   class:
-    - match: 'class'
+    - meta_scope: meta.class
+    - match: '\b{{class_modifiers}}\b'
+      scope: storage.modifier
+    - match: '\bclass\b'
       scope: storage.type.class
       set:
-        - meta_scope: meta.class
         - include: global
         - match: '{{identifier}}'
           scope: entity.name.class
@@ -441,17 +446,35 @@ contexts:
 
   definition:
     - include: global
-    - match: '(?={{identifier}}\s*[=;])'
-      set: variable-definition
     - match: '(?={{identifier}}\s*\()'
       set: function-definition
+    - match: '(?={{identifier}}\s*)'
+      set: variable-definition
 
   definition-in-code:
     - include: global
     - match: '(?={{identifier}}\s*[=;\(])'
       set: variable-definition
 
   variable-definition-value:
+    - match: '{'
+      scope: punctuation.section.brackets.begin
+      set:
+        - include: global
+        - match: '\b{{definition_modifiers}}\b'
+          scope: storage.modifier
+        - match: '\b(get|set)\b'
+          scope: keyword.other
+          push:
+            - include: global
+            - match: '{'
+              scope: punctuation.section.block.begin
+              set:
+                - meta_scope: meta.function
+                - include: code-scope
+        - match: '}'
+          scope: punctuation.section.brackets.end
+          pop: true
     - match: '='
       scope: keyword.operator.assignment
       set: expression
@@ -591,7 +614,7 @@ contexts:
 
   has-classes:
     - include: has-metadatas
-    - match: '\b(?=class)\b'
+    - match: '\b(?=({{class_modifiers}}\s+)?class)\b'
       push: class
 
   has-enums:
@@ -606,7 +629,7 @@ contexts:
 
   has-definitions:
     - include: has-metadatas
-    - match: '\b(protected|private)\b'
+    - match: '\b{{definition_modifiers}}\b'
       scope: storage.modifier
     - match: '(?=\b{{possible_typename}})'
       push:

syntax_test_stuff.as

@@ -22,6 +22,25 @@
 // <- source.as
 #endif
 
+abstract class ProjectileBase : IProjectile {}
+// <- meta.class storage.modifier
+//       ^^^^^ meta.class storage.type.class
+
+class ClassWithProperty
+{
+  uint Team { get { return 0; } }
+  // <- storage.type
+  //   ^^^^ variable.other
+  //        ^ punctuation.section.brackets.begin
+  //          ^^^ keyword.other
+  //              ^ punctuation.section.block.begin
+  //                ^^^^^^ keyword.control
+  //                       ^ constant.numeric
+  //                        ^ punctuation.terminator
+  //                          ^ punctuation.section.block.end
+  //                            ^ punctuation.section.brackets.end
+}
+
 void func2(const string &in str, SValue& sval) {}
 // <- storage.type
 //   ^^^^^ meta.function entity.name.function