From ab8e46360b80aad85d32f634ab84aa254e2099a6 Mon Sep 17 00:00:00 2001
From: msftrncs <msftrncs@midlands.net>
Date: Sat, 30 Mar 2019 17:36:26 -0500
Subject: [PATCH] dot source and unquoted argument updates

---
 PowerShellSyntax.tmLanguage | 117 +++++++++++++++++++++++++++++++-----
 1 file changed, 101 insertions(+), 16 deletions(-)

diff --git a/PowerShellSyntax.tmLanguage b/PowerShellSyntax.tmLanguage
index f8d2055..32b79fd 100644
--- a/PowerShellSyntax.tmLanguage
+++ b/PowerShellSyntax.tmLanguage
@@ -2584,7 +2584,7 @@
 					<key>comment</key>
 					<string>(dot) source operator, requires trailing space, or invoke operator</string>
 					<key>begin</key>
-					<string>&amp;|\.(?=\*?[\s,;&amp;|{}\(\)]|\$[\p{L}$?^:_{])</string>
+					<string>&amp;|\.(?=[\s{(,;&amp;|)}"\x{201C}-\x{201E}'\x{2018}-\x{201B}]|\$[\p{L}$?^:_{(])</string>
 					<key>beginCaptures</key>
 					<dict>
 						<key>0</key>
@@ -2860,10 +2860,6 @@
 					<key>include</key>
 					<string>#expressionGroup</string>
 				</dict>
-				<dict>
-					<key>include</key>
-					<string>#substatement</string>
-				</dict>
 				<dict>
 					<key>include</key>
 					<string>#hashtable</string>
@@ -2874,15 +2870,81 @@
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#variable</string>
+					<string>#quotedStrings_Members</string>
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#quotedStrings_Members</string>
+					<string>#numericConstant_argumentMode</string>
+				</dict>
+				<dict>
+					<key>comment</key>
+					<string>could be variable reference, if it doesn't have member reference, its the start of an unquoted expandable string</string>
+					<key>begin</key>
+					<string>(?=\$(?!\())</string>
+					<key>end</key>
+					<string>(?=.|$)</string>
+					<key>applyEndPatternLast</key>
+					<true/>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>comment</key>
+							<string>check out the first variable reference</string>
+							<key>begin</key>
+							<string>\G(?=\$)</string>
+							<key>end</key>
+							<string>(?!\G)</string>
+							<key>patterns</key>
+							<array>
+								<dict>
+									<key>include</key>
+									<string>#variableNoProperty</string>
+								</dict>
+							</array>
+						</dict>
+						<dict>
+							<key>comment</key>
+							<string>if a member access doesn't occur after variable, finish as an unquoted expandable string argument.</string>
+							<key>begin</key>
+							<string>(?=[^\s{(,;&amp;|)}])(?!(?=\.(?!\.)|::|\[))</string>
+							<key>end</key>
+							<string>(?=.|$)</string>
+							<key>applyEndPatternLast</key>
+							<true/>
+							<key>patterns</key>
+							<array>
+								<dict>
+									<key>include</key>
+									<string>#unquotedArgument</string>
+								</dict>
+							</array>
+						</dict>
+						<dict>
+							<key>begin</key>
+							<string>(?=\.(?!\.)|::|\[)</string>
+							<key>end</key>
+							<string>(?=.|$)</string>
+							<key>applyEndPatternLast</key>
+							<true/>
+							<key>patterns</key>
+							<array>
+								<dict>
+									<key>include</key>
+									<string>#accessors</string>
+								</dict>
+								<dict>
+									<key>comment</key>
+									<string>attempt another argument after member access</string>
+									<key>include</key>
+									<string>#argument</string>
+								</dict>
+							</array>
+						</dict>
+					</array>
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#numericConstant_argumentMode</string>
+					<string>#substatement</string>
 				</dict>
 				<dict>
 					<key>include</key>
@@ -2996,6 +3058,12 @@
 					<key>name</key>
 					<string>invalid.character.escape.powershell</string>
 				</dict>
+				<dict>
+					<key>match</key>
+					<string>\.(?=\$)</string>
+					<key>name</key>
+					<string>string.unquoted.argument.powershell</string>
+				</dict>
 				<dict>
 					<key>begin</key>
 					<string>(?=[^\s{(,;&amp;|)}])</string>
@@ -5746,14 +5814,14 @@
 					<key>begin</key>
 					<string>(?=\$(?:(?&gt;[\w][\w?]*:(?!:)|:)?(?:[\w?](?:[\w?]|:(?!:))*|:(?!:))|[$^:]|\{))</string>
 					<key>end</key>
-					<string>(?=.|$)</string>
+					<string>(?!\G)</string>
 					<key>applyEndPatternLast</key>
-					<true/>
+					<false/>
 					<key>patterns</key>
 					<array>
 						<dict>
 							<key>begin</key>
-							<string>\$(?:(?&gt;[\w][\w?]*:(?!:)|:)?(?:[\w?](?:[\w?]|:(?!:))*|:(?!:))|[$^:])(?=\.(?!\.)|::|\[)</string>
+							<string>\G\$(?:(?&gt;[\w][\w?]*:(?!:)|:)?(?:[\w?](?:[\w?]|:(?!:))*|:(?!:))|[$^:])(?=\.(?!\.)|::|\[)</string>
 							<key>beginCaptures</key>
 							<dict>
 								<key>0</key>
@@ -5781,7 +5849,7 @@
 						</dict>
 						<dict>
 							<key>match</key>
-							<string>\$(?:(?&gt;[\w][\w?]*:(?!:)|:)?(?:[\w?](?:[\w?]|:(?!:))*|:(?!:))|[$^:])</string>
+							<string>\G\$(?:(?&gt;[\w][\w?]*:(?!:)|:)?(?:[\w?](?:[\w?]|:(?!:))*|:(?!:))|[$^:])</string>
 							<key>captures</key>
 							<dict>
 								<key>0</key>
@@ -5806,7 +5874,7 @@
 					<key>comment</key>
 					<string>splatting cannot have members and certain characters following, including no line comment</string>
 					<key>match</key>
-					<string>(?&gt;@(?:(?&gt;[\w][\w?]*:(?!:)|:)?(?:[\w?](?:[\w?]|:(?!:))*|:(?!:))|[$^:]))(?![~`!@#$%^*&lt;&gt;\]\\/"\x{201C}-\x{201E}'\x{2018}-\x{201B}+-])</string>
+					<string>\G(?&gt;@(?:(?&gt;[\w][\w?]*:(?!:)|:)?(?:[\w?](?:[\w?]|:(?!:))*|:(?!:))|[$^:]))(?![~`!@#$%^*&lt;&gt;\]\\/"\x{201C}-\x{201E}'\x{2018}-\x{201B}+-])</string>
 					<key>captures</key>
 					<dict>
 						<key>0</key>
@@ -5828,14 +5896,14 @@
 			<key>begin</key>
 			<string>(?=\$(?:(?&gt;[\w][\w?]*:(?!:)|:)?(?:[\w?](?:[\w?]|:(?!:))*|:(?!:))|[$^:]|\{))</string>
 			<key>end</key>
-			<string>(?=.|$)</string>
+			<string>(?!\G)</string>
 			<key>applyEndPatternLast</key>
-			<true/>
+			<false/>
 			<key>patterns</key>
 			<array>
 				<dict>
 					<key>match</key>
-					<string>\$(?:(?&gt;[\w][\w?]*:(?!:)|:)?(?:[\w?](?:[\w?]|:(?!:))*|:(?!:))|[$^:])</string>
+					<string>\G\$(?:(?&gt;[\w][\w?]*:(?!:)|:)?(?:[\w?](?:[\w?]|:(?!:))*|:(?!:))|[$^:])</string>
 					<key>captures</key>
 					<dict>
 						<key>0</key>
@@ -6255,6 +6323,23 @@
 						</dict>
 					</array>
 				</dict>
+				<dict>
+					<key>begin</key>
+					<string>\$\{</string>
+					<key>end</key>
+					<string>}</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>match</key>
+							<string>\$</string>
+						</dict>
+						<dict>
+							<key>include</key>
+							<string>#functionName</string>
+						</dict>
+					</array>
+				</dict>
 			</array>
 		</dict>
 		<key>unquotedStrings_text</key>