Skip to content

Fix minor variable grammar bugs #22

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
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix minor variable grammar bugs #22

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c33cdd9
Add variable_name to match exactly the name of the variable if it exists
dolphinau Jun 12, 2025
55f0cf3
Clean variables and fix bugs
dolphinau Jun 13, 2025
5adf5ed
Clean
dolphinau Jun 13, 2025
aeebb52
add new PSDrive
dolphinau Jun 13, 2025
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
22 changes: 16 additions & 6 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,18 +199,28 @@ module.exports = grammar({
format_operator: $ => reservedWord("-f"),

// Variables
variable: $ => choice(
variable: _ => choice(
'$$',
'$^',
'$?',
'$_',
token(seq('$', optional(seq(choice(reservedWord("global:"), reservedWord("local:"), reservedWord("private:"), reservedWord("script:"), reservedWord("using:"), reservedWord("workflow:"), /[a-zA-Z0-9_]+/), ":")), /[a-zA-Z0-9_]+|\?/)),
token(seq('@', optional(seq(choice(reservedWord("global:"), reservedWord("local:"), reservedWord("private:"), reservedWord("script:"), reservedWord("using:"), reservedWord("workflow:"), /[a-zA-Z0-9_]+/), ":")), /[a-zA-Z0-9_]+|\?/)),
$.braced_variable
'$::', // Weird variable allowed in powershell

// Simple variable with $ or spalted with @
token(seq(
choice('$', '@'),
optional(seq(choice(reservedWord("global"), reservedWord("local"), reservedWord("private"), reservedWord("script"), reservedWord("using"), reservedWord("workflow"), reservedWord("alias"), reservedWord("env"), reservedWord("function"), reservedWord("variable"), /[a-zA-Z0-9_]+/), ":")),
/([a-zA-Z0-9_?]+:?)+/
)),

// Braced variable surrounded by ${}
token(seq(
"${",
optional(seq(choice(reservedWord("global"), reservedWord("local"), reservedWord("private"), reservedWord("script"), reservedWord("using"), reservedWord("workflow"), reservedWord("alias"), reservedWord("env"), reservedWord("function"), reservedWord("variable"), /[a-zA-Z0-9_]+/), ":")),
/([^}]|`\})+\}/
)),
),

braced_variable: $=> /\$\{[^}]+\}/,

// Commands
generic_token: $ => token(
/[^\(\)\$\"\'\-\{\}@\|\[`\s][^\s\(\)\}\|;,]*/,
Expand Down