Update hashtable scopes

Author: michaelblyons

PowerShell.sublime-syntax

@@ -207,13 +207,22 @@ contexts:
     - match: \}
       scope: punctuation.section.braces.end.powershell
       pop: 1
-    - match: \b(['"]?)(\w+)(['"]?)\s*(=)\s*
-      scope: meta.hashtable.assignment.powershell
+    - match: \b(({{single_quote}}){{identifier_simple}}({{single_quote}}))\s*(=)\s*
       captures:
-        1: punctuation.definition.string.begin.powershell
-        2: variable.other.readwrite.powershell
+        1: meta.mapping.key.powershell string.quoted.single.powershell
+        2: punctuation.definition.string.begin.powershell
         3: punctuation.definition.string.end.powershell
-        4: keyword.operator.assignment.powershell
+        4: punctuation.separator.key-value.powershell
+    - match: \b(({{double_quote}}){{identifier_simple}}({{double_quote}}))\s*(=)\s*
+      captures:
+        1: meta.mapping.key.powershell string.quoted.double.powershell
+        2: punctuation.definition.string.begin.powershell
+        3: punctuation.definition.string.end.powershell
+        4: punctuation.separator.key-value.powershell
+    - match: \b({{identifier_simple}})\s*(=)\s*
+      captures:
+        1: meta.mapping.key.powershell string.unquoted.powershell
+        2: punctuation.separator.key-value.powershell
     - include: expressions
 
   subexpressions:

Tests/syntax_test_PowerShell.ps1

@@ -68,24 +68,25 @@ using namespace System.Management.Automation
 #         ^^^^^^^^ variable.parameter
 #Requires -Modules PSWorkflow, @{ModuleName="PSScheduledJob"; ModuleVersion="1.0.0.0"}
 # <- punctuation.definition.keyword
-#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.requires
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.requires
 #^^^^^^^^ keyword.control.import.require
 #         ^^^^^^^^ variable.parameter
 #                            ^ punctuation.separator
-#                                ^^^^^^^^^^ meta.requires meta.hashtable variable.other.readwrite
-#                                          ^ meta.requires meta.hashtable
-#                                           ^^^^^^^^^^^^^^^^ meta.requires meta.hashtable string.quoted.double
-#                                                           ^ meta.requires meta.hashtable punctuation.terminator.statement
-#                                                             ^^^^^^^^^^^^^ meta.requires meta.hashtable variable.other.readwrite
-#                                                                          ^ meta.requires meta.hashtable
-#                                                                           ^^^^^^^^^ meta.requires meta.hashtable string.quoted.double
+#                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.hashtable.powershell
+#                                ^^^^^^^^^^ meta.mapping.key string.unquoted
+#                                          ^ punctuation.separator.key-value.powershell
+#                                           ^^^^^^^^^^^^^^^^ string.quoted.double
+#                                                           ^ punctuation.terminator.statement
+#                                                             ^^^^^^^^^^^^^ meta.mapping.key string.unquoted
+#                                                                          ^ punctuation.separator.key-value.powershell
+#                                                                           ^^^^^^^^^ string.quoted.double
 
     :label1
 #   ^^^^^^^ entity.name.label.powershell
 #   ^ punctuation.definition.label.powershell
 
 throw "Do not run this file!"
-# <- keyword.control
+# <- keyword.control.exception
 #     ^^^^^^^^^^^^^^^^^^^^^^^ string.quoted.double
 
 # Stop parsing
@@ -241,33 +242,44 @@ $properties = @{
 #             ^ keyword.other.hashtable.begin
 #              ^ punctuation.section.braces.begin
     Name      = 'Name'
-    # <- meta.hashtable meta.hashtable.assignment variable.other.readwrite
-    #         ^ meta.hashtable meta.hashtable.assignment keyword.operator.assignment
-    #           ^ meta.hashtable string.quoted.single
+#^^^^^^^^^^^^^^^^^^^^^ meta.hashtable.powershell
+#   ^^^^ meta.mapping.key.powershell string.unquoted.powershell
+#             ^ punctuation.separator.key-value.powershell
+#               ^^^^^^ meta.string.powershell string.quoted.single.powershell
+#               ^ punctuation.definition.string.begin.powershell
+#                    ^ punctuation.definition.string.end.powershell
     Something = $else
 #^^^^^^^^^^^^^^^^^^^^ meta.hashtable.powershell
-#   ^^^^^^^^^^^^ meta.hashtable.assignment.powershell
-#   ^^^^^^^^^ variable.other.readwrite.powershell
-#             ^ keyword.operator.assignment.powershell
+#   ^^^^^^^^^ meta.mapping.key.powershell string.unquoted.powershell
+#             ^ punctuation.separator.key-value.powershell
 #               ^^^^^ variable.other.readwrite.powershell
 #               ^ punctuation.definition.variable.powershell
     Number    = 16
-    # <- meta.hashtable meta.hashtable.assignment variable.other.readwrite
-    #         ^ meta.hashtable meta.hashtable.assignment keyword.operator.assignment
-    #           ^^ meta.hashtable meta.number.integer.decimal constant.numeric.value
+#^^^^^^^^^^^^^^^^^ meta.hashtable.powershell
+#   ^^^^^^ meta.mapping.key.powershell string.unquoted.powershell
+#             ^ punctuation.separator.key-value.powershell
+#               ^^ meta.number.integer.decimal.powershell constant.numeric.value.powershell
     from      = 'hello world'
-    # <- meta.hashtable meta.hashtable.assignment variable.other.readwrite
-    #         ^ meta.hashtable meta.hashtable.assignment keyword.operator.assignment
-    #           ^^^^^^^^^^^^^ meta.hashtable string.quoted.single
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.hashtable.powershell
+#   ^^^^ meta.mapping.key.powershell string.unquoted.powershell
+#             ^ punctuation.separator.key-value.powershell
+#               ^^^^^^^^^^^^^ meta.string.powershell string.quoted.single.powershell
+#               ^ punctuation.definition.string.begin.powershell
+#                           ^ punctuation.definition.string.end.powershell
     hash      = @{
-    # <- meta.hashtable meta.hashtable.assignment variable.other.readwrite
-    #         ^ meta.hashtable meta.hashtable.assignment keyword.operator.assignment
-    #           ^ keyword.other.hashtable.begin
-    #            ^ punctuation.section.braces.begin
+#^^^^^^^^^^^^^^^^^ meta.hashtable.powershell
+#   ^^^^ meta.mapping.key.powershell string.unquoted.powershell
+#             ^ punctuation.separator.key-value.powershell
+#               ^^ meta.hashtable.powershell
+#               ^ keyword.other.hashtable.begin.powershell
+#                ^ punctuation.section.braces.begin.powershell
         hello = 'world'
-        # <- meta.hashtable meta.hashtable.assignment variable.other.readwrite
-        #     ^ meta.hashtable meta.hashtable.assignment keyword.operator.assignment
-        #       ^^^^^^^ meta.hashtable string.quoted.single
+#^^^^^^^^^^^^^^^^^^^^^^ meta.hashtable.powershell meta.hashtable.powershell
+#       ^^^^^ meta.mapping.key.powershell string.unquoted.powershell
+#             ^ punctuation.separator.key-value.powershell
+#               ^^^^^^^ meta.string.powershell string.quoted.single.powershell
+#               ^ punctuation.definition.string.begin.powershell
+#                     ^ punctuation.definition.string.end.powershell
     }
     # <- punctuation.section.braces.end
 }