Skip to content

Improve performance of UseConsistentIndentation -> 35% speedup for formatter #1458

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 4 commits into from
Apr 24, 2020
Merged

Improve performance of UseConsistentIndentation -> 35% speedup for formatter #1458

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65b645b
only go back as much as needed
Apr 20, 2020
4ebc4bf
refactor into function
Apr 22, 2020
d5e5229
simplify
Apr 22, 2020
2814147
Apply suggestions from code review
bergmeister Apr 22, 2020
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: 18 additions & 4 deletions Rules/UseConsistentIndentation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,7 @@ public override IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string file
}
}

var lineHasPipelineBeforeToken = tokens.Any(oneToken =>
oneToken.Kind == TokenKind.Pipe &&
oneToken.Extent.StartLineNumber == token.Extent.StartLineNumber &&
oneToken.Extent.StartColumnNumber < token.Extent.StartColumnNumber);
bool lineHasPipelineBeforeToken = LineHasPipelineBeforeToken(tokens, tokenIndex, token);

AddViolation(token, tempIndentationLevel, diagnosticRecords, ref onNewLine, lineHasPipelineBeforeToken);
}
Expand Down Expand Up @@ -257,6 +254,23 @@ public override IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string file
return diagnosticRecords;
}

private static bool LineHasPipelineBeforeToken(Token[] tokens, int tokenIndex, Token token)
{
int searchIndex = tokenIndex;
int searchLine = token.Extent.StartLineNumber;
do
{
searchLine = tokens[searchIndex].Extent.StartLineNumber;
int searchcolumn = tokens[searchIndex].Extent.StartColumnNumber;
if (tokens[searchIndex].Kind == TokenKind.Pipe && searchcolumn < token.Extent.StartColumnNumber)
{
return true;
}
searchIndex--;
} while (searchLine == token.Extent.StartLineNumber && searchIndex >= 0);
return false;
}

private static CommandBaseAst LastPipeOnFirstLineWithPipeUsage(PipelineAst pipelineAst)
{
CommandBaseAst lastPipeOnFirstLineWithPipeUsage = pipelineAst.PipelineElements[0];
Expand Down