Skip to content

Fix PSCloseBrace rule to not wrongly flag closing brace of one-line hashtable, which lead to incorrect formatting #1309

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 7 commits into from
Aug 19, 2019
Merged

Fix PSCloseBrace rule to not wrongly flag closing brace of one-line hashtable, which lead to incorrect formatting #1309

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e6c4fb
Ignore Hashtables for PlaceCloseBrace rule
bergmeister Jul 8, 2019
6a824b8
suppress only single line hash tables
bergmeister Aug 15, 2019
7b4b473
Add test and make fix in proper place where RCurly of hashtable gets …
bergmeister Aug 17, 2019
b6239b9
cleanup code
bergmeister Aug 17, 2019
d28b4ef
revert change to minimise diff
bergmeister Aug 17, 2019
51fe11c
final cleanup
bergmeister Aug 17, 2019
0384e94
Apply suggestions from code review
bergmeister Aug 19, 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
Prev Previous commit
Next Next commit
cleanup code
  • Loading branch information
@bergmeister
bergmeister committed Aug 17, 2019
commit b6239b9c1bcd837f372bb794633f2535efe39d37
12 changes: 0 additions & 12 deletions Engine/TokenOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,6 @@ public class TokenOperations
private readonly Token[] tokens;
private LinkedList<Token> tokensLL;
private readonly Ast ast;
private IEnumerable<Ast> hashtableAsts
{
get
{
if (_hashtableAsts == null)
{
_hashtableAsts = ast.FindAll(oneAst => oneAst is HashtableAst, searchNestedScriptBlocks: true);
}
return _hashtableAsts;
}
}
private IEnumerable<Ast> _hashtableAsts;

public Ast Ast { get { return ast; } }

Expand Down