Skip to content

Commit d7fb5b9

Browse files
msftrncsmsftrncs
committed
correct redirect file argument
1 parent da006d7 commit d7fb5b9

File tree

1 file changed

+63
-34
lines changed

1 file changed

+63
-34
lines changed

‎PowerShellSyntax.tmLanguage

Lines changed: 63 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3079,15 +3079,15 @@
30793079
</dict>
30803080
<dict>
30813081
<key>match</key>
3082-
<string>\.(?=\$)</string>
3082+
<string>\.(?=['\x{2018}-\x{201B}"\x{201C}-\x{201E}\s{(,;&amp;|)}$])</string>
30833083
<key>name</key>
30843084
<string>string.unquoted.argument.powershell</string>
30853085
</dict>
30863086
<dict>
30873087
<key>begin</key>
30883088
<string>(?=[^\s{(,;&amp;|)}])</string>
30893089
<key>alternateBegin</key>
3090-
<string>(?=[^\x{2018}-\x{201B}"\x{201C}-\x{201E}\s\[{(,;&amp;|)}$@])|(?&lt;=\S)(?=[$@&lt;&gt;])</string>
3090+
<string>(?=[^'\x{2018}-\x{201B}"\x{201C}-\x{201E}\s\[{(,;&amp;|)}$@])|(?&lt;=\S)(?=[$@&lt;&gt;])</string>
30913091
<key>end</key>
30923092
<string>(?=[\s{(,;&amp;|)}])</string>
30933093
<key>contentName</key>
@@ -5123,6 +5123,12 @@
51235123
<key>name</key>
51245124
<string>punctuation.separator.comma.powershell</string>
51255125
</dict>
5126+
<dict>
5127+
<key>match</key>
5128+
<string>[^\s\[\]+,]+</string>
5129+
<key>name</key>
5130+
<string>invalid.character.powershell</string>
5131+
</dict>
51265132
</array>
51275133
</dict>
51285134
<dict>
@@ -5183,7 +5189,7 @@
51835189
</dict>
51845190
<dict>
51855191
<key>match</key>
5186-
<string>(?&lt;!])[^\s\[\]+,]+</string>
5192+
<string>(?&lt;!])[^\s\[\]\(+,]+</string>
51875193
<key>name</key>
51885194
<string>invalid.character.powershell</string>
51895195
</dict>
@@ -5221,12 +5227,44 @@
52215227
</dict>
52225228
</array>
52235229
</dict>
5230+
<key>advanceToArgument</key>
5231+
<dict>
5232+
<key>comment</key>
5233+
<string>consume spaces and comments (but not unescaped line ends) until the next token appears</string>
5234+
<key>begin</key>
5235+
<string>\G(?=[\s]|&lt;#|`\s)</string>
5236+
<key>end</key>
5237+
<string>(?!\s)(?!$)|$(?=\n)</string>
5238+
<key>applyEndPatternLast</key>
5239+
<true/>
5240+
<key>patterns</key>
5241+
<array>
5242+
<dict>
5243+
<key>match</key>
5244+
<string>`\n</string>
5245+
<key>name</key>
5246+
<string>constant.character.escape.powershell</string>
5247+
</dict>
5248+
<dict>
5249+
<key>comment</key>
5250+
<string>useless escape, and doesn't count as a token</string>
5251+
<key>match</key>
5252+
<string>`\s</string>
5253+
<key>name</key>
5254+
<string>invalid.character.escape.powershell</string>
5255+
</dict>
5256+
<dict>
5257+
<key>include</key>
5258+
<string>#commentBlock</string>
5259+
</dict>
5260+
</array>
5261+
</dict>
52245262
<key>advanceToToken</key>
52255263
<dict>
52265264
<key>comment</key>
52275265
<string>consume spaces and comments and line ends until the next token appears</string>
52285266
<key>begin</key>
5229-
<string>\G(?=[\s#]|&lt;#|`\n)</string>
5267+
<string>\G(?=[\s#]|&lt;#|`\s)</string>
52305268
<key>end</key>
52315269
<string>(?!\s)(?!$)</string>
52325270
<key>applyEndPatternLast</key>
@@ -5239,6 +5277,14 @@
52395277
<key>name</key>
52405278
<string>constant.character.escape.powershell</string>
52415279
</dict>
5280+
<dict>
5281+
<key>comment</key>
5282+
<string>useless escape, and doesn't count as a token</string>
5283+
<key>match</key>
5284+
<string>`\s</string>
5285+
<key>name</key>
5286+
<string>invalid.character.escape.powershell</string>
5287+
</dict>
52425288
<dict>
52435289
<key>include</key>
52445290
<string>#commentLine</string>
@@ -7095,47 +7141,30 @@
70957141
<true/>
70967142
<key>patterns</key>
70977143
<array>
7144+
<dict>
7145+
<key>include</key>
7146+
<string>#advanceToArgument</string>
7147+
</dict>
70987148
<dict>
70997149
<key>begin</key>
7100-
<string>\G(?![;&amp;|)}]|$)</string>
7150+
<string>(?&lt;=[\s&gt;]|\G|^)(?![\s#;&amp;|)}]|&lt;#|$|`\s)</string>
71017151
<key>end</key>
7102-
<string>(?![\s#]|&lt;#|`\n)|$</string>
7103-
<key>applyEndPatternLast</key>
7104-
<false/>
7152+
<string>(?!\G)</string>
7153+
<key>name</key>
7154+
<string>meta.argument.redirect-file.powershell</string>
71057155
<key>patterns</key>
71067156
<array>
71077157
<dict>
7158+
<key>comment</key>
7159+
<string>`,`, `&lt;` and `&gt;` not permitted here</string>
71087160
<key>match</key>
7109-
<string>`\n</string>
7161+
<string>[,&lt;&gt;]</string>
71107162
<key>name</key>
7111-
<string>constant.character.escape.powershell</string>
7163+
<string>invalid.source.powershell</string>
71127164
</dict>
71137165
<dict>
71147166
<key>include</key>
7115-
<string>#commentBlock</string>
7116-
</dict>
7117-
<dict>
7118-
<key>begin</key>
7119-
<string>(?![\s#;&amp;|)}]|&lt;#|$|`\n)</string>
7120-
<key>end</key>
7121-
<string>(?!\G)</string>
7122-
<key>name</key>
7123-
<string>meta.argument.redirect-file.powershell</string>
7124-
<key>patterns</key>
7125-
<array>
7126-
<dict>
7127-
<key>comment</key>
7128-
<string>`,`, `&lt;` and `&gt;` not permitted here</string>
7129-
<key>match</key>
7130-
<string>[,&lt;&gt;]</string>
7131-
<key>name</key>
7132-
<string>invalid.source.powershell</string>
7133-
</dict>
7134-
<dict>
7135-
<key>include</key>
7136-
<string>#argument</string>
7137-
</dict>
7138-
</array>
7167+
<string>#argument</string>
71397168
</dict>
71407169
</array>
71417170
</dict>

0 commit comments

Comments
 (0)