Skip to content

Index hashtable brace positions in token operations #2299

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
Kire (kireadmin) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Index hashtable brace positions in token operations #2299

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
10 changes: 4 additions & 6 deletions Engine/TokenOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ public IEnumerable<Token> GetCloseBracesInCommandElements()
public IEnumerable<Tuple<Token, Token>> GetBracePairs()
{
var openBraceStack = new Stack<Token>();
IEnumerable<Ast> hashtableAsts = ast.FindAll(oneAst => oneAst is HashtableAst, searchNestedScriptBlocks: true);
var hashtableEndOffsets = new HashSet<int>(
ast.FindAll(oneAst => oneAst is HashtableAst, searchNestedScriptBlocks: true)
.Select(hashtableAst => hashtableAst.Extent.EndOffset));
foreach (var token in tokens)
{
if (token.Kind == TokenKind.LCurly)
Expand All @@ -85,11 +87,7 @@ public IEnumerable<Tuple<Token, Token>> GetBracePairs()
if (token.Kind == TokenKind.RCurly
&& openBraceStack.Count > 0)
{
bool closeBraceBelongsToHashTable = hashtableAsts.Any(hashtableAst =>
{
return hashtableAst.Extent.EndLineNumber == token.Extent.EndLineNumber
&& hashtableAst.Extent.EndColumnNumber == token.Extent.EndColumnNumber;
});
bool closeBraceBelongsToHashTable = hashtableEndOffsets.Contains(token.Extent.EndOffset);

if (!closeBraceBelongsToHashTable)
{
Expand Down
20 changes: 20 additions & 0 deletions Tests/Engine/TokenOperations.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,26 @@ $h = @{
$hashTableAst.Extent.Text | Should -Be '@{ z = "hi" }'
}

It "Should pair script block braces without matching hashtable braces" {
$scriptText = @'
$h = @{ key = 72 }
if ($true) {
'value'
}
'@
$tokens = $null
$parseErrors = $null
$scriptAst = [System.Management.Automation.Language.Parser]::ParseInput($scriptText, [ref] $tokens, [ref] $parseErrors)
$tokenOperations = [Microsoft.Windows.PowerShell.ScriptAnalyzer.TokenOperations]::new($tokens, $scriptAst)
$bracePairs = @($tokenOperations.GetBracePairs())

$bracePairs.Count | Should -Be 1
$bracePairs[0].Item1.Extent.Text | Should -Be '{'
$bracePairs[0].Item2.Extent.Text | Should -Be '}'
$bracePairs[0].Item1.Extent.StartLineNumber | Should -Be 2
$bracePairs[0].Item2.Extent.StartLineNumber | Should -Be 4
}

Context 'Braced Member Access Ranges' {

BeforeDiscovery {
Expand Down