Skip to content

lsh: fix strings in PowerShell #790

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

Merged
DHowett merged 7 commits into from
Mar 31, 2026
Merged

lsh: fix strings in PowerShell #790

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5a4a2e2
lsh: fix PowerShell strings
DHowett Mar 31, 2026
ee7e8f9
add the invalid token type
DHowett Mar 31, 2026
e73093e
Mark invalid herestrings with the new invalid token
DHowett Mar 31, 2026
4bbf234
PR feedback
DHowett Mar 31, 2026
90ce165
Revert "PR feedback"
DHowett Mar 31, 2026
b30b9d0
Revert "Mark invalid herestrings with the new invalid token"
DHowett Mar 31, 2026
344cb97
Revert "add the invalid token type"
DHowett Mar 31, 2026
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: 20 additions & 6 deletions crates/lsh/definitions/powershell.lsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,35 @@ pub fn powershell() {
} else if /'/ {
loop {
yield string;
if /\\./ {}
else if /'/ { yield string; break; }
if /'/ { yield string; break; }
await input;
}
} else if /@"/ {
} else if /@'\s*$/ {
Copy link
Copy Markdown
Member Author

@DHowett DHowett Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this avoids marking invalid ones as invalid, but it does still reject them.

Copy link
Copy Markdown
Member Author

@DHowett DHowett Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(it falls through to the normal string case later, which gobbles until it gets a ')

yield string;
loop {
if /.*/ {}
yield string;
if /\\./ {}
else if /"@/ { yield string; break; }
await input;
if /'@/ {
yield string;
break;
}
}
} else if /@"\s*$/ {
yield string;
loop {
if /.*/ {}
yield string;
await input;
if /"@/ {
yield string;
break;
}
}
} else if /"/ {
loop {
yield string;
if /\\./ {}
Copy link
Copy Markdown
Member

@lhecker lhecker Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, woops lol

if /`./ {}
else if /"/ { yield string; break; }
await input;
}
Expand Down
Loading