Sync region scopes to upstream C#

Fixes #221

Author: michaelblyons

PowerShell.sublime-syntax

@@ -1297,19 +1297,17 @@ contexts:
         2: punctuation.definition.label.powershell
 
   regions:
-    - match: ^\s*((#)\s*(region\b)(?:\s*(\S.*))?(\n?))
-      captures:
-        1: comment.line.powershell
-        2: punctuation.definition.comment.powershell
-        3: keyword.other.region.begin.powershell
-        4: meta.toc-list.powershell entity.name.section.powershell
-        5: meta.fold.begin.powershell
-    - match: ^\s*((#)\s*(endregion\b).*(\n?))
-      captures:
-        1: comment.line.powershell
-        2: punctuation.definition.comment.powershell
-        3: keyword.other.region.end.powershell
-        4: meta.fold.end.powershell
+    - match: ^\s*(#)\s*(region\b)(?:\s*(\S.*))?(\s*\n?)
+      captures:
+        1: punctuation.definition.preprocessor.powershell
+        2: keyword.control.directive.region.powershell
+        3: entity.name.section.powershell
+        4: meta.fold.block.begin.powershell
+    - match: ^\s*(#)\s*(endregion\b)(?:\s*(\S.*))?\s*\n?
+      captures:
+        1: meta.fold.block.end.powershell punctuation.definition.preprocessor.powershell
+        2: keyword.control.directive.endregion.powershell
+        3: variable.other.section.powershell
 
 ###[ COMMENTS ]################################################################
 

support/Fold.tmPreferences

@@ -9,9 +9,9 @@
         <array>
             <dict>
                 <key>begin</key>
-                <string>meta.fold.begin</string>
+                <string>meta.fold.block.begin</string>
                 <key>end</key>
-                <string>meta.fold.end</string>
+                <string>meta.fold.block.end</string>
             </dict>
             <dict>
                 <key>begin</key>

support/Symbol List - Region.tmPreferences

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+    <key>scope</key>
+    <string>source.powershell entity.name.section</string>
+    <key>settings</key>
+    <dict>
+        <key>showInSymbolList</key>
+        <integer>1</integer>
+        <key>symbolTransformation</key>
+        <string>
+        s/\s{2,}/ /g; # collapse whitespace
+        s/^/#region /;# prepend "#region " to the region name
+        </string>
+    </dict>
+</dict>
+</plist>

tests/syntax_test_PowerShell.ps1

@@ -2364,30 +2364,26 @@ $a3[1..2]
 #>
 
 #region Test
-#<- punctuation.definition.comment
-#^^^^^^ keyword.other.region.begin
-#<- comment.line.powershell
-#       ^^^^ meta.toc-list entity.name.section
-#       @@@@ local-definition
-#           ^ meta.fold.begin
+#<- punctuation.definition.preprocessor
+#^^^^^^ keyword.control.directive.region
+#       ^^^^ entity.name.section
+#       @@@@ local-definition "#region Test"
+#           ^ meta.fold.block.begin
     Do-Stuff
 #   @@@@@@@@ reference
 #endregion (More comments)
-#<- punctuation.definition.comment.powershell
-#^^^^^^^^^ keyword.other.region.end.powershell
-#<- comment.line
-#                         ^ meta.fold.end
+#<- meta.fold.block.end punctuation.definition.preprocessor
+#^^^^^^^^^ keyword.control.directive.endregion
+#          ^^^^^^^^^^^^^^^ variable.other.section.powershell
 
 #region
-#<- punctuation.definition.comment
-#^^^^^^ keyword.other.region.begin
-#<- comment.line.powershell
-#      ^ meta.fold.begin
+#<- punctuation.definition.preprocessor
+#^^^^^^ keyword.control.directive.region
+#      ^ meta.fold.block.begin
 #endregion (More comments)
-#<- punctuation.definition.comment.powershell
-#^^^^^^^^^ keyword.other.region.end.powershell
-#<- comment.line
-#                         ^ meta.fold.end
+#<- meta.fold.block.end punctuation.definition.preprocessor
+#^^^^^^^^^ keyword.control.directive.endregion
+#          ^^^^^^^^^^^^^^^ variable.other.section.powershell
 
 function Process-DeploymentConfig {
 #        @@@@@@@@@@@@@@@@@@@@@@@@ definition
@@ -2401,12 +2397,11 @@ function Process-DeploymentConfig {
   )
 
   #region PathHelper
-# ^^^^^^^^^^^^^^^^^^^ comment.line.powershell
-# ^ punctuation.definition.comment
-#  ^^^^^^ keyword.other.region.begin
-#         ^^^^^^^^^^ meta.toc-list entity.name.section
-#         @@@@@@@@@@ local-definition
-#                   ^ meta.fold.begin
+# ^ punctuation.definition.preprocessor
+#  ^^^^^^ keyword.control.directive.region
+#         ^^^^^^^^^^ entity.name.section
+#         @@@@@@@@@@ local-definition "#region PathHelper"
+#                   ^ meta.fold.block.begin
 
   function Resolve-ConfigPath {
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function.powershell meta.function.powershell
@@ -2430,11 +2425,10 @@ function Process-DeploymentConfig {
     }
     return $ResolvedPath
   }
-  #endregion
-# ^^^^^^^^^^^ comment.line.powershell
-# ^ punctuation.definition.comment.powershell
-#  ^^^^^^^^^ keyword.other.region.end.powershell
-#           ^ meta.fold.end
+  #endregion PathHelper
+# ^ meta.fold.block.end punctuation.definition.preprocessor
+#  ^^^^^^ keyword.control.directive.endregion
+#            ^^^^^^^^^^ variable.other.section.powershell
 
 
   Resolve-ConfigPath -Path "Foo" -PathVariables $PathVariables