Skip to content

Fix array type parsing in generic types #19205

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
daxian-dbw merged 3 commits into from
May 8, 2023
Merged

Fix array type parsing in generic types #19205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1406500
Fix array type parsing in generic types
MartinGC94 Feb 23, 2023
7cea0bd
Merge branch 'PowerShell:master' into FixArrayTypeParsingInGenerics
MartinGC94 Feb 23, 2023
362e7cd
Merge branch 'PowerShell:master' into FixArrayTypeParsingInGenerics
MartinGC94 Mar 31, 2023
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: 6 additions & 4 deletions src/System.Management.Automation/engine/parser/Parser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1346,7 +1346,7 @@ private ITypeName FinishTypeNameRule(Token typeName, bool unBracketedGenericArg
case TokenKind.RBracket:
case TokenKind.Comma:
var elementType = new TypeName(typeName.Extent, typeName.Text);
return CompleteArrayTypeName(elementType, elementType, token);
return CompleteArrayTypeName(elementType, elementType, token, unBracketedGenericArg);

case TokenKind.LBracket:
case TokenKind.Identifier:
Expand Down Expand Up @@ -1496,7 +1496,7 @@ private ITypeName GenericTypeNameRule(Token genericTypeName, Token firstToken, b
if (token.Kind == TokenKind.LBracket)
{
SkipToken();
return CompleteArrayTypeName(result, openGenericType, NextToken());
return CompleteArrayTypeName(result, openGenericType, NextToken(), unbracketedGenericArg);
}

if (token.Kind == TokenKind.Comma && !unbracketedGenericArg)
Expand All @@ -1519,7 +1519,7 @@ private ITypeName GenericTypeNameRule(Token genericTypeName, Token firstToken, b
return result;
}

private ITypeName CompleteArrayTypeName(ITypeName elementType, TypeName typeForAssemblyQualification, Token firstTokenAfterLBracket)
private ITypeName CompleteArrayTypeName(ITypeName elementType, TypeName typeForAssemblyQualification, Token firstTokenAfterLBracket, bool unBracketedGenericArg)
{
while (true)
{
Expand Down Expand Up @@ -1592,7 +1592,9 @@ private ITypeName CompleteArrayTypeName(ITypeName elementType, TypeName typeForA
}

token = PeekToken();
if (token.Kind == TokenKind.Comma)

// An array declared inside an unbracketed generic type argument cannot be assembly qualified
if (!unBracketedGenericArg && token.Kind == TokenKind.Comma)
{
SkipToken();
var assemblyName = _tokenizer.GetAssemblyNameSpec();
Expand Down
8 changes: 8 additions & 0 deletions test/powershell/Language/Parser/Parsing.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,3 +664,11 @@ Describe "Parsing using statement with alias and linebreak and comma" -Tag CI {
}
}
}

It "Should correctly parse array types that are used as arguments without brackets in generic type" {
$tks = $null
$ers = $null
$Script = '[System.Tuple[System.String[],System.Int32[]]]'
$result = [System.Management.Automation.Language.Parser]::ParseInput($Script, [ref]$tks, [ref]$ers)
$result.EndBlock.Statements[0].PipelineElements[0].Expression.TypeName.FullName | Should -Be 'System.Tuple[System.String[],System.Int32[]]'
}