Skip to content

lsh: Fix PowerShell commands and operators matching keyword rules #999

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

Open
Jae Birdsall (jaeminbird) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

lsh: Fix PowerShell commands and operators matching keyword rules #999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions assets/highlighting-tests/powershell.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,8 @@ Write-Host "2 + 2 = $($array[0] + $array[1])"
# Command substitution
$pwdPath = $(Get-Location).Path
Write-Host "Current directory: $pwdPath"

# Commands and operators that begin with a keyword
Get-ChildItem | ForEach-Object { $_.Name } | Format-Table
Invoke-WebRequest -Uri "https://example.com"
if (42 -in $array) { Exit-PSSession }
7 changes: 5 additions & 2 deletions crates/lsh/definitions/powershell.lsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ pub fn powershell() {
else if /"/ { yield string; break; }
await input;
}
} else if /[\w\d?:]+-[\w\d?:-]*/ {
// Commands like ForEach-Object or Invoke-WebRequest, which may begin with a keyword
yield method;
} else if /-[a-zA-Z]\w*/ {
// Operators and parameters like -in or -Path, which may contain a keyword
} else if /(?i:begin|class|clean|data|define|dynamicparam|end|enum|filter|from|function|hidden|in|param|process|static|using|var)/ {
if /\w+/ {
yield other;
Expand All @@ -75,8 +80,6 @@ pub fn powershell() {
}
} else if /[$@][\w\d?:]+/ {
yield variable;
} else if /[\w\d?:]+-[\w\d?:-]*/ {
yield method;
} else if /[\w\d?:]+/ {
// Gobble any other tokens that should not be highlighted
}
Expand Down