Skip to content

Fix AlignAssignment rule to calculate alignment position correctly and avoid crash #1070

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
merged 3 commits into from
Sep 21, 2018
Merged

Fix AlignAssignment rule to calculate alignment position correctly and avoid crash #1070

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
be5ce70
Use proper calculation of widest assignment sign by looking at the AS…
bergmeister Sep 10, 2018
bd97663
Add regression test
bergmeister Sep 11, 2018
dfdf06f
fix test
bergmeister Sep 11, 2018
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: 1 addition & 9 deletions Rules/AlignAssignmentStatement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,15 +191,7 @@ private IEnumerable<DiagnosticRecord> FindHashtableViolations(TokenOperations to
continue;
}

var widestKeyExtent = extentTuples
.Select(t => t.Item1)
.Aggregate((t1, tAggregate) =>
{
return TokenOperations.GetExtentWidth(tAggregate) > TokenOperations.GetExtentWidth(t1)
? tAggregate
: t1;
});
var expectedStartColumnNumber = widestKeyExtent.EndColumnNumber + 1;
var expectedStartColumnNumber = extentTuples.Max(x => x.Item1.EndColumnNumber) + 1;
foreach (var extentTuple in extentTuples)
{
if (extentTuple.Item2.StartColumnNumber != expectedStartColumnNumber)
Expand Down
10 changes: 10 additions & 0 deletions Tests/Rules/AlignAssignmentStatement.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@ $hashtable = @{
Test-CorrectionExtentFromContent $def $violations 1 ' ' ' '
}

It "Should not crash if property name reaches further to the right than the longest property name (regression test for issue 1067)" {
$def = @'
$hashtable = @{ property1 = "value"
anotherProperty = "another value"
}
'@

$violations = Invoke-ScriptAnalyzer -ScriptDefinition $def -Settings $settings -ErrorAction Stop | Get-Count | Should -Be 0
}

It "Should ignore if a hashtable is empty" {
$def = @'
$x = @{ }
Expand Down