Allow member access of groups

Author: michaelblyons

PowerShell.sublime-syntax

@@ -400,7 +400,7 @@ contexts:
   types:
     - match: \[
       scope: punctuation.section.brackets.begin.powershell
-      push: [maybe-static-member, inside-type]
+      push: [members, inside-type]
 
   types-without-members:
     - match: \[
@@ -426,15 +426,6 @@ contexts:
     - match: \+
       scope: punctuation.accessor.plus.powershell
 
-  static-members:
-    - match: '::'
-      scope: punctuation.accessor.double-colon.powershell
-      set: members
-
-  maybe-static-member:
-    - include: static-members
-    - include: immediately-pop
-
 ###[ OPERATORS ]###############################################################
 
   operators:
@@ -632,6 +623,8 @@ contexts:
       pop: 1
     - match: \.(?=\w)
       scope: punctuation.accessor.dot.powershell
+    - match: ::(?=\w)
+      scope: punctuation.accessor.double-colon.powershell
     - match: (\w+)(\()
       captures:
         1: meta.function-call.powershell variable.function.powershell
@@ -663,7 +656,7 @@ contexts:
         - meta_scope: meta.group.powershell
         - match: \)
           scope: punctuation.section.group.end.powershell
-          pop: 1
+          set: members
         - include: attributes
         - include: expressions
 

Tests/syntax_test_Class.ps1

@@ -390,6 +390,7 @@ while ($true) {
         Start-Sleep -ms 100
 #       @@@@@@@@@@@ reference
         ($Using:unsafe)::ShowRunspaceId($_)
+#                        @@@@@@@@@@@@@@ reference
     }
 }
 
@@ -415,5 +416,6 @@ while ($true) {
         Start-Sleep -ms 100
 #       @@@@@@@@@@@ reference
         ($Using:safe)::ShowRunspaceId($_)
+#                      @@@@@@@@@@@@@@ reference
     }
 }

Tests/syntax_test_PowerShell.ps1

@@ -1617,6 +1617,40 @@ function get-number {}
 #                                                                                                        ^ meta.group.complex.subexpression punctuation.section.group.end
 #                                                                                                          ^ punctuation.definition.variable
 #                                                                                                                 ^ punctuation.section.interpolation.end - source.powershell.embedded
+
+    ([MyType])::Name[2]
+#   ^^^^^^^^^^ meta.group.powershell
+#   ^ punctuation.section.group.begin.powershell
+#    ^ punctuation.section.brackets.begin.powershell
+#     ^^^^^^ support.type.powershell
+#           ^ punctuation.section.brackets.end.powershell
+#            ^ punctuation.section.group.end.powershell
+#             ^^ punctuation.accessor.double-colon.powershell
+#               ^^^^ variable.other.member.powershell
+#                   ^^^ meta.brackets.indexer.powershell
+#                   ^ punctuation.section.brackets.begin.powershell
+#                    ^ meta.number.integer.decimal.powershell constant.numeric.value.powershell
+#                     ^ punctuation.section.brackets.end.powershell
+    ([MyType])::Name.ToString()[2]
+#   ^^^^^^^^^^ meta.group.powershell
+#   ^ punctuation.section.group.begin.powershell
+#    ^ punctuation.section.brackets.begin.powershell
+#     ^^^^^^ support.type.powershell
+#           ^ punctuation.section.brackets.end.powershell
+#            ^ punctuation.section.group.end.powershell
+#             ^^ punctuation.accessor.double-colon.powershell
+#               ^^^^ variable.other.member.powershell
+#                   ^ punctuation.accessor.dot.powershell
+#                    ^^^^^^^^ meta.function-call.powershell variable.function.powershell
+#                    @@@@@@@@ reference
+#                            ^^ meta.function-call.arguments.powershell
+#                            ^ punctuation.section.arguments.begin.powershell
+#                             ^ punctuation.section.arguments.end.powershell
+#                              ^^^ meta.brackets.indexer.powershell
+#                              ^ punctuation.section.brackets.begin.powershell
+#                               ^ meta.number.integer.decimal.powershell constant.numeric.value.powershell
+#                                ^ punctuation.section.brackets.end.powershell
+
 "This is the DebugPreference variable: $DebugPreference"
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string string.quoted.double
 #                                      ^^^^^^^^^^^^^^^^ meta.string meta.interpolation variable.language - string

Tests/syntax_test_strings.ps1

@@ -240,19 +240,21 @@
 #               ^^ variable.other.readwrite.powershell
 #               ^ punctuation.definition.variable.powershell
 
-    # TODO: Mark ToString as a function
     (1.11).ToString("#.#")
 #   ^^^^^^ meta.group.powershell
 #   ^ punctuation.section.group.begin.powershell
 #    ^^^^ meta.number.float.decimal.powershell constant.numeric.value.powershell
 #     ^ punctuation.separator.decimal.powershell
 #        ^ punctuation.section.group.end.powershell
-#                  ^^^^^^^ meta.group.powershell
-#                  ^ punctuation.section.group.begin.powershell
-#                   ^^^^^ meta.string.interpolated.powershell string.quoted.double.powershell - comment
+#         ^ punctuation.accessor.dot.powershell
+#          ^^^^^^^^ meta.function-call.powershell variable.function.powershell
+#          @@@@@@@@ reference
+#                  ^^^^^^^ meta.function-call.arguments.powershell
+#                  ^ punctuation.section.arguments.begin.powershell
+#                   ^^^^^ meta.string.interpolated.powershell string.quoted.double.powershell
 #                   ^ punctuation.definition.string.begin.powershell
 #                       ^ punctuation.definition.string.end.powershell
-#                        ^ punctuation.section.group.end.powershell
+#                        ^ punctuation.section.arguments.end.powershell
 
     "{1,10} {0,10} {2,10:x}" -f "First", "Second", 255
 #   ^^^^^^^^^^^^^^^^^^^^^^^^ meta.string.interpolated.powershell string.quoted.double.powershell