Require class stuff to at least be in a block

Author: michaelblyons

PowerShell.sublime-syntax

@@ -24,12 +24,9 @@ contexts:
     - include: statements
 
   statements:
+    - include: classes
     - include: expressions
     - include: functions
-    - match: \b((?i:class))\s+([\w-]+)\b
-      captures:
-        1: storage.type.class.powershell
-        2: meta.class.powershell entity.name.class.powershell
     # Exceptions
     - match: \b(?i:throw){{kebab_break}}
       scope: keyword.control.exception.raise.powershell
@@ -101,7 +98,6 @@ contexts:
     - include: script-blocks
     - include: escape-sequences
     - include: numbers
-    - include: class-methods
     - include: groups
     - include: arrays
     - include: subexpressions
@@ -120,9 +116,6 @@ contexts:
       push:
         - meta_content_scope: string.unquoted.powershell
         - include: pop-before-eol
-    - match: \b(?i:hidden|static)\b
-      # This should only be relevant inside a class but will require a rework of how classes are matched. This is a temp fix.
-      scope: storage.modifier.powershell
 
     - include: operators
 
@@ -349,6 +342,12 @@ contexts:
         - match: \}
           scope: punctuation.section.braces.end.powershell
           pop: true
+
+        # TODO: Fix classes, so this doesn't nest here.
+        - include: class-methods
+        - match: \b(?i:hidden|static)\b
+          scope: storage.modifier.powershell
+
         - include: statements
 
   types:
@@ -366,6 +365,30 @@ contexts:
           scope: storage.type.powershell
         - include: types
 
+###[ CLASSES ]#################################################################
+
+  classes:
+    - match: \b((?i:class))\s+([\w-]+)\b
+      captures:
+        1: storage.type.class.powershell
+        2: meta.class.powershell entity.name.class.powershell
+
+  class-methods:
+    - match: ^(?:\s*)(?i)(hidden|static)?\s*(\[)((?!\d+|\.)[\p{L}\p{N}.]+)(\])\s*((?:\p{L}|\d|_|-|\.)+)\s*(?=\()
+      scope: meta.function.powershell
+      captures:
+        1: storage.modifier.powershell
+        2: punctuation.section.brackets.begin.powershell
+        3: storage.type.powershell
+        4: punctuation.section.brackets.end.powershell
+        5: entity.name.function.powershell
+      push:
+        - match: (?=\()
+          pop: true
+        - include: comment-line
+
+###[ VARIABLES ]###############################################################
+
   variables:
     - match: |-
         (?xi:
@@ -526,20 +549,6 @@ contexts:
         4: variable.other.readwrite.powershell
         5: punctuation.section.braces.end
 
-  class-methods:
-    - match: ^(?:\s*)(?i)(hidden|static)?\s*(\[)((?!\d+|\.)[\p{L}\p{N}.]+)(\])\s*((?:\p{L}|\d|_|-|\.)+)\s*(?=\()
-      scope: meta.function.powershell
-      captures:
-        1: storage.modifier.powershell
-        2: punctuation.section.brackets.begin.powershell
-        3: storage.type.powershell
-        4: punctuation.section.brackets.end.powershell
-        5: entity.name.function.powershell
-      push:
-        - match: (?=\()
-          pop: true
-        - include: comment-line
-
 ###[ GROUPS ]##################################################################
 
   groups: