Skip to content

Commit d610f4c

Browse files
committed
Merge pull request #57 from bcrotty/patch-1
Update PowershellSyntax.tmLanguage
2 parents c03b2d4 + 85423ae commit d610f4c

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Support/PowershellSyntax.tmLanguage

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -226,19 +226,19 @@
226226
</dict>
227227
<dict>
228228
<key>match</key>
229-
<string>-([lg][te]|[ci]?(eq|ne))</string>
229+
<string>-([ci]?[lg][te]|eq|ne)</string>
230230
<key>name</key>
231231
<string>keyword.operator.logical.powershell</string>
232232
</dict>
233233
<dict>
234234
<key>match</key>
235-
<string>(?i:[a-z][a-z0-9]+-?[a-z][a-z0-9]+)(?i:\.(?:exe|cmd|bat|ps1))</string>
235+
<string>(?i:(\S&&[^<>"/\|?*])+)(?i:\.(?:exe|cmd|bat|ps1))</string>
236236
<key>name</key>
237237
<string>support.function.powershell</string>
238238
</dict>
239239
<dict>
240240
<key>match</key>
241-
<string>\b(?&lt;!\.)(?i:begin|break|catch|class|continue|data|define|do|dynamicparam|else|elseif|end|exit|filter|finally|for|foreach(?!=-object)|from|if|in|inlinescript|parallel|param|process|return|switch|throw|trap|try|until|using|var|while|workflow)\b</string>
241+
<string>(?&lt;!\w)((?i:begin|break|catch|class|continue|data|define|do|dynamicparam|else|elseif|end|exit|filter|finally|for|foreach(?!=-object)|from|if|in|inlinescript|parallel|param|process|return|switch|throw|trap|try|until|using|var|where(?!=-object)|while|workflow)|%|\?)(?!\w)</string>
242242
<key>name</key>
243243
<string>keyword.control.powershell</string>
244244
</dict>
@@ -250,31 +250,31 @@
250250
</dict>
251251
<dict>
252252
<key>match</key>
253-
<string>-(?i:[ic]?(?:eq|ne|[gl][te]|(?:not)?(?:like|match|contains)|replace))\b</string>
253+
<string>-(?i:[ic]?(?:eq|ne|[gl][te]|(?:not)?(?:like|match|contains|in)|replace))(?!\p{L})</string>
254254
<key>name</key>
255255
<string>keyword.operator.comparison.powershell</string>
256256
</dict>
257257
<dict>
258258
<key>match</key>
259-
<string>-(?i:join|split)|!</string>
259+
<string>-(?i:join|split)(?!\p{L})|!</string>
260260
<key>name</key>
261261
<string>keyword.operator.unary.powershell</string>
262262
</dict>
263263
<dict>
264264
<key>match</key>
265-
<string>-(?i:and|or|not|xor)|!</string>
265+
<string>-(?i:and|or|not|xor)(?!\p{L})|!</string>
266266
<key>name</key>
267267
<string>keyword.operator.logical.powershell</string>
268268
</dict>
269269
<dict>
270270
<key>match</key>
271-
<string>-(?i:band|bor|bnot|bxor)\b</string>
271+
<string>-(?i:band|bor|bnot|bxor)(?!\p{L})</string>
272272
<key>name</key>
273273
<string>keyword.operator.bitwise.powershell</string>
274274
</dict>
275275
<dict>
276276
<key>match</key>
277-
<string>-f\b</string>
277+
<string>-(?i:f)(?!\p{L})</string>
278278
<key>name</key>
279279
<string>keyword.operator.string-format.powershell</string>
280280
</dict>
@@ -390,7 +390,7 @@
390390
<key>comment</key>
391391
<string>Verb-Noun pattern:</string>
392392
<key>match</key>
393-
<string>(?:[a-zA-Z.]*\\)?(?i:Add|Approve|Assert|Backup|Block|Checkpoint|Clear|Close|Compare|Complete|Compress|Confirm|Connect|Convert|ConvertFrom|ConvertTo|Copy|Debug|Deny|Disable|Disconnect|Dismount|Edit|Enable|Enter|Exit|Expand|Export|Find|Format|Get|Grant|Group|Hide|Import|Initialize|Install|Invoke|Join|Limit|Lock|Measure|Merge|Mount|Move|New|Open|Optimize|Out|Ping|Pop|Protect|Publish|Push|Read|Receive|Redo|Register|Remove|Rename|Repair|Request|Reset|Resize|Resolve|Restart|Restore|Resume|Revoke|Save|Search|Select|Send|Set|Show|Skip|Split|Start|Step|Stop|Submit|Suspend|Switch|Sync|Test|Trace|Unblock|Undo|Uninstall|Unlock|Unprotect|Unpublish|Unregister|Update|Use|Wait|Watch|Write)\-.+?(?:\.(?:exe|cmd|bat|ps1))?\b</string>
393+
<string>(?:(\p{L}|\d|_|-|\\|\:)*\\)?\b(?i:Add|Approve|Assert|Backup|Block|Checkpoint|Clear|Close|Compare|Complete|Compress|Confirm|Connect|Convert|ConvertFrom|ConvertTo|Copy|Debug|Deny|Disable|Disconnect|Dismount|Edit|Enable|Enter|Exit|Expand|Export|Find|Format|Get|Grant|Group|Hide|Import|Initialize|Install|Invoke|Join|Limit|Lock|Measure|Merge|Mount|Move|New|Open|Optimize|Out|Ping|Pop|Protect|Publish|Push|Read|Receive|Redo|Register|Remove|Rename|Repair|Request|Reset|Resize|Resolve|Restart|Restore|Resume|Revoke|Save|Search|Select|Send|Set|Show|Skip|Split|Start|Step|Stop|Submit|Suspend|Switch|Sync|Test|Trace|Unblock|Undo|Uninstall|Unlock|Unprotect|Unpublish|Unregister|Update|Use|Wait|Watch|Write)\-.+?(?:\.(?:exe|cmd|bat|ps1))?\b</string>
394394
<key>name</key>
395395
<string>support.function.powershell</string>
396396
</dict>

0 commit comments

Comments
 (0)