Skip to content

Fix #139 Where-Object #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

Fix #139 Where-Object #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fb14a1a
Add pssc and psrc extensions
Jaykul Nov 24, 2015
d03bc21
Add a test showing how where and foreach are wrong.
Jaykul Nov 24, 2015
0e7ef44
Add pssc and psrc extensions
Jaykul Nov 24, 2015
9079c68
Add some tests for commands including paths
Jaykul Nov 24, 2015
f8e3ea4
Move keywords ahead of includes
Jaykul Nov 24, 2015
943685d
Separate applications and fix them to allow paths
Jaykul Nov 24, 2015
0e40d47
Add a missing comma
Jaykul Nov 24, 2015
f9a0c1e
Add one extra test for #137
Jaykul Nov 24, 2015
86bd929
Fix case-sensitive pattern
Jaykul Apr 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions Support/PowershellSyntax.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<string>ps1</string>
<string>psm1</string>
<string>psd1</string>
<string>pssc</string>
<string>psrc</string>
</array>
<key>name</key>
<string>PowerShell</string>
Expand Down Expand Up @@ -64,6 +66,12 @@
<key>name</key>
<string>keyword.operator.redirection.powershell</string>
</dict>
<dict>
<key>match</key>
<string>(?&lt;!\w)(?i)(begin|break|catch|continue|data|define|do|dynamicparam|else|elseif|end|exit|finally|for|foreach(?=\s*\()|from|if|in|inlinescript|parallel|param|process|return|switch|throw|trap|try|until|using|var|while)(?!\w)</string>
<key>name</key>
<string>keyword.control.powershell</string>
</dict>
<dict>
<key>include</key>
<string>#commands</string>
Expand Down Expand Up @@ -244,12 +252,6 @@
<key>name</key>
<string>support.function.powershell</string>
</dict>
<dict>
<key>match</key>
<string>(?&lt;!\w)((?i:begin|break|catch|continue|data|define|do|dynamicparam|else|elseif|end|exit|finally|for|foreach(?!-object)|from|if|in|inlinescript|parallel|param|process|return|switch|throw|trap|try|until|using|var|where(?!=-object)|while)|%|\?)(?!\w)</string>
<key>name</key>
<string>keyword.control.powershell</string>
</dict>
<dict>
<key>captures</key>
<dict>
Expand Down Expand Up @@ -410,19 +412,27 @@
<dict>
<key>patterns</key>
<array>
<dict>
<key>comment</key>
<string>Applications:</string>
<key>match</key>
<string>(?i)(?&lt;=\s|\||^|;)(\p{L}|\d|_|-|\\|\:|\.)*\.(?:exe|cmd|bat|ps1|py|js|vbs|wsf|com|msc|cpl)\b</string>
<key>name</key>
<string>support.function.application</string>
</dict>
<dict>
<key>comment</key>
<string>Verb-Noun pattern:</string>
<key>match</key>
<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)\-.+?(?:\.(?i:exe|cmd|bat|ps1))?\b</string>
<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)\-(\p{L}|\d|_|-)+?\b</string>
<key>name</key>
<string>support.function.powershell</string>
</dict>
<dict>
<key>comment</key>
<string>Builtin cmdlets with reserved verbs</string>
<key>match</key>
<string>(?&lt;!\w)(?i:foreach-object)(?!\w)</string>
<string>(?&lt;=\s|\||^|;)(?:(?i:foreach|where|sort|tee)(?i:-object)?|%|\?)\b</string>
<key>name</key>
<string>support.function.powershell</string>
</dict>
Expand Down
38 changes: 33 additions & 5 deletions tests/samples/test-file.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,12 @@ $a = $("Guess what, happens ""here, hey""" | "Hm... $("this, is" strange.) you c
# file ext shouldn't be styled as numeric
# TODO: the whole file name really ought to be styled as a command *sigh*
this-isnot.ps1
.\path\to\this.ps1
# FIXME:
a_mistake.here.ps1
"anothermistake.ps1"
# FIXME:
notepad.exe
notepad.exe;notepad.exe;
# TODO: file ext shouldn't be styled as numeric, even if it's short:
get-content test.1

Expand Down Expand Up @@ -330,9 +331,36 @@ do {

}

# foreach statement
foreach($item in get-childitem) {
remove-item $item -whatif
}

# where and foreach are COMMANDS here
# They should be highlighted the same as get-childitem
get-childitem | where-object { $true } | foreach-object {
remove-item $_ -whatif
}
# The short forms of them should be highlighted correctly too, they're special
get-childitem |where { $true } |foreach {
remove-item $_ -whatif
}
get-childitem|where { $true }|foreach {
remove-item $_ -whatif
}
get-childitem | ? { $true } | % {
remove-item $_ -whatif
}
get-childitem|?{ $true }|%{
remove-item $_ -whatif
}
# Just to be sure, lets use where and foreach in places they shouldn't get highlighted
Test-Highlight -Somewhere StringForEach
Test-Highlight .\AFolderSomewhere .\ANew\ForEach\Folder\Where\Things
Something.exe -Where Pattern
Test-Highlight -ForEach StringValue



for($i = 0; $i -lt 10; $i++) {

Expand All @@ -343,7 +371,7 @@ get-item $()
if (10 -cgt 100) { }
$a -is $b
$b -contains $c
$x -notcontains $c
$x -notcontains $c
$a -match $b
$a -notmatch $b
$x -like $c
Expand Down Expand Up @@ -458,10 +486,9 @@ function Get-EscapedPath
param(
[Parameter(
Position=0,
Mandatory=$true
Mandatory=$true,
ValueFromPipeline=$true,
ValueFromPipelineByPropertyName=$true)
]
ValueFromPipelineByPropertyName=$true)]
[string]$path
)

Expand All @@ -478,6 +505,7 @@ function Get-EscapedPath
# These three should highlight roughly the same:
Test-Highlight -Something StringValue
Move-Item .\AFolderForWorkflow .\ANew\Location
Get-WMIObject Win32_NetworkAdapterConfiguration
Test-Function -StringFilter Pattern
Test-Highlight -TestFunction StringValue
function Test-Thing { <# When broken, only this comment wasn't broken #> }
Expand Down