Merge pull request #137 from Jaykul/feature/fixfunctions

Fix function highligting

Author: vors

Support/PowershellSyntax.tmLanguage

@@ -522,7 +522,7 @@
 		<key>function</key>
 		<dict>
 			<key>begin</key>
-			<string>((?i:function|filter|configuration|workflow))\s+((?:\p{L}|\d|_|-|\.)+)</string>
+			<string>(?&lt;!\S)(?i)(function|filter|configuration|workflow)\s+(?:(global|local|script|private):)?((?:\p{L}|\d|_|-|\.)+)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>0</key>
@@ -538,7 +538,12 @@
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>entity.name.function</string>
+					<string>storage.modifier.scope.powershell</string>
+				</dict>
+				<key>3</key>
+				<dict>
+					<key>name</key>
+					<string>entity.name.function.powershell</string>
 				</dict>
 			</dict>
 			<key>end</key>

tests/samples/test-file.ps1

@@ -473,3 +473,16 @@ function Get-EscapedPath
         return $path
     }
 }
+
+#TODO: "function" should not be highlighted inside a command:
+#      These three should highlight roughly the same:
+Test-Highlight -Something StringValue
+Move-Item .\AFolderForWorkflow .\ANew\Location
+Test-Function -StringFilter Pattern
+Test-Highlight -TestFunction StringValue
+function Test-Thing { <# When broken, only this comment wasn't broken #> }
+
+# TODO: we should support scope on function names
+function global:Test-Thing { Get-Command $global:VariableName }
+function local:Test-Thing { Get-Command $global:VariableName }
+function script:Test-Thing { Get-Command $global:VariableName }