Skip to content

Embedded subexpressions#183

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
Andy Jordan (andyleejordan) merged 2 commits into from
Mar 17, 2021
Merged

Embedded subexpressions #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d14162e
imrpove embedded subexpressions
msftrncs Aug 17, 2019
84a64bc
Adjust test, of embedded substatements in double quoted strings.
msftrncs Aug 17, 2019
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
61 changes: 36 additions & 25 deletions PowerShellSyntax.tmLanguage
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@
</dict>
<dict>
<key>include</key>
<string>#interpolatedStringContent</string>
<string>#subexpression</string>
</dict>
<dict>
<key>include</key>
Expand DownExpand Up@@ -214,15 +214,20 @@
</dict>
<dict>
<key>begin</key>
<string>(\$)(\()</string>
<string>((\$))(\()</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>punctuation.definition.variable.powershell</string>
<string>keyword.other.substatement.powershell</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>punctuation.definition.subexpression.powershell</string>
</dict>
<key>3</key>
<dict>
<key>name</key>
<string>punctuation.section.group.begin.powershell</string>
Expand DownExpand Up@@ -666,7 +671,7 @@
</dict>
</array>
</dict>
<key>interpolatedStringContent</key>
<key>subexpression</key>
<dict>
<key>begin</key>
<string>\(</string>
Expand All@@ -678,8 +683,6 @@
<string>punctuation.section.group.begin.powershell</string>
</dict>
</dict>
<key>contentName</key>
<string>interpolated.simple.source.powershell</string>
<key>end</key>
<string>\)</string>
<key>endCaptures</key>
Expand All@@ -690,65 +693,73 @@
<string>punctuation.section.group.end.powershell</string>
</dict>
</dict>
<key>name</key>
<string>meta.group.simple.subexpression.powershell</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>$self</string>
</dict>
<dict>
<key>include</key>
<string>#interpolation</string>
</dict>
<dict>
<key>include</key>
<string>#interpolatedStringContent</string>
</dict>
</array>
</dict>
<key>interpolation</key>
<dict>
<key>begin</key>
<string>(\$)(\()</string>
<string>(((\$)))((\())</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>punctuation.definition.variable.powershell</string>
<string>keyword.other.substatement.powershell</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>punctuation.definition.substatement.powershell</string>
</dict>
<key>3</key>
<dict>
<key>name</key>
<string>punctuation.section.embedded.substatement.begin.powershell</string>
</dict>
<key>4</key>
<dict>
<key>name</key>
<string>punctuation.section.group.begin.powershell</string>
</dict>
<key>5</key>
<dict>
<key>name</key>
<string>punctuation.section.embedded.substatement.begin.powershell</string>
</dict>
</dict>
<key>contentName</key>
<string>interpolated.complex.source.powershell</string>
<key>end</key>
<string>\)</string>
<string>(\))</string>
<key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.section.group.end.powershell</string>
</dict>
<key>1</key>
<dict>
<key>name</key>
<string>punctuation.section.embedded.substatement.end.powershell</string>
</dict>
</dict>
<key>name</key>
<string>meta.embedded.substatement.powershell</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>$self</string>
</dict>
<dict>
<key>include</key>
<string>#interpolation</string>
</dict>
<dict>
<key>include</key>
<string>#interpolatedStringContent</string>
</dict>
</array>
</dict>
<key>numericConstant</key>
Expand Down
16 changes: 12 additions & 4 deletions spec/testfiles/syntax_test_TheBigTestFile.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -153,7 +153,11 @@ $variable.Name
"This is my $($variable.Name)!"
# <- punctuation.definition.string.begin.powershell string.quoted.double.powershell
# ^^^^^^^^^^ ^^ string.quoted.double.powershell
# ^ ^ punctuation.definition.variable.powershell
# ^^ punctuation.section.embedded.substatement.begin.powershell
# ^ punctuation.section.embedded.substatement.end.powershell
# ^^^^^^^^^^^^^^^^^ meta.embedded.substatement.powershell
# ^ keyword.other.substatement.powershell
# ^ punctuation.definition.variable.powershell
# ^ punctuation.section.group.begin.powershell
# ^ punctuation.section.group.end.powershell
# ^^^^^^^^ variable.other.readwrite.powershell
Expand DownExpand Up@@ -372,7 +376,10 @@ $a3[1..2]
# ^^^^^^^^^^^^ string.quoted.double.powershell
"$(Invoke-Something)"
# ^ ^ string.quoted.double.powershell
# ^ punctuation.definition.variable.powershell
# ^^ punctuation.section.embedded.substatement.begin.powershell
# ^ punctuation.section.embedded.substatement.end.powershell
# ^^^^^^^^^^^^^^^^^^^ meta.embedded.substatement.powershell
# ^ keyword.other.substatement.powershell
# ^ punctuation.section.group.begin.powershell
# ^ interpolated.complex.source.powershell support.function.powershell
# ^ punctuation.section.group.end.powershell
Expand DownExpand Up@@ -1183,7 +1190,7 @@ $file = join-path $env:SystemDrive "$([System.io.path]::GetRandomFileName()).ps1
# ^ support.function.powershell
# ^ support.variable.drive.powershell
# ^ variable.other.readwrite.powershell
# ^ string.quoted.double.powershell punctuation.definition.variable.powershell
# ^ string.quoted.double.powershell punctuation.definition.substatement.powershell punctuation.section.embedded.substatement.begin.powershell
# ^ storage.type.powershell
$ScriptBlock | Out-File $file -Force
# <- punctuation.definition.variable.powershell
Expand DownExpand Up@@ -1217,7 +1224,8 @@ get-thing | Out-WithYou > $null # destroy
# ^^ constant.character.escape.powershell
# ^^ ^^ ^^ ^^ ^^ not:constant.character.escape.powershell
"When you call a method: $( get-number | %{ invoke-command $( [string]::format("Like (this{0})","what?") ) $var } )"
# ^ ^ punctuation.definition.variable.powershell
# ^ string.quoted.double.powershell punctuation.definition.substatement.powershell punctuation.section.embedded.substatement.begin.powershell
# ^ punctuation.definition.variable.powershell
# ^ keyword.operator.other.powershell
# ^ ^ meta.group.complex.subexpression.powershell punctuation.section.group.begin.powershell
# ^ storage.type.powershell
Expand Down