Skip to content

WIP: Fix: PSUseConsistentWhitespace formatting for do-while, unary operators, and native commands #2114

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

Draft
DrSkillIssue wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

WIP: Fix: PSUseConsistentWhitespace formatting for do-while, unary operators, and native commands #2114

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e60fb3
fix: Formatting misses certain keywords (unary operators, 'until')
DrSkillIssue Jun 17, 2025
deb3512
wip: Before-Optimized UseConsistentWhitespace
DrSkillIssue Jun 17, 2025
ac68598
fix: #1561
DrSkillIssue Jun 17, 2025
e27fb2b
fix: Unary Postfix Operations require whitespace skips
DrSkillIssue Jul 19, 2025
42d3cd0
chore: aesthetic changes
DrSkillIssue Jul 19, 2025
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
chore: aesthetic changes
  • Loading branch information
@DrSkillIssue
DrSkillIssue committed Jul 19, 2025
commit 42d3cd075bd03ca55cbb2c3767e76fca71c34703
55 changes: 27 additions & 28 deletions Rules/UseConsistentWhitespace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,37 +289,36 @@ private IEnumerable<DiagnosticRecord> FindKeywordAfterBraceViolations(TokenOpera
{
var keyword = keywordNode.Value;

if (keywordNode.Previous != null)
if (keywordNode.Previous == null || keywordNode.Previous.Value.Kind != TokenKind.RCurly)
{
if (keywordNode.Previous.Value.Kind == TokenKind.RCurly &&
IsPreviousTokenOnSameLine(keywordNode))
{
var hasWhitespace = IsPreviousTokenApartByWhitespace(keywordNode);
continue;
}

if (!hasWhitespace)
{
var corrections = new List<CorrectionExtent>
{
new CorrectionExtent(
keywordNode.Previous.Value.Extent.EndLineNumber,
keyword.Extent.StartLineNumber,
keywordNode.Previous.Value.Extent.EndColumnNumber,
keyword.Extent.StartColumnNumber,
whiteSpace,
keyword.Extent.File)
};

yield return new DiagnosticRecord(
GetError(ErrorKind.BeforeOpeningBrace),
keyword.Extent,
GetName(),
GetDiagnosticSeverity(),
tokenOperations.Ast.Extent.File,
null,
corrections);
}
}
if (!IsPreviousTokenOnSameLine(keywordNode) || IsPreviousTokenApartByWhitespace(keywordNode))
{
continue;
}

// Whitespace required
var corrections = new List<CorrectionExtent>
{
new CorrectionExtent(
keywordNode.Previous.Value.Extent.EndLineNumber,
keyword.Extent.StartLineNumber,
keywordNode.Previous.Value.Extent.EndColumnNumber,
keyword.Extent.StartColumnNumber,
whiteSpace,
keyword.Extent.File)
};

yield return new DiagnosticRecord(
GetError(ErrorKind.BeforeOpeningBrace),
keyword.Extent,
GetName(),
GetDiagnosticSeverity(),
tokenOperations.Ast.Extent.File,
null,
corrections);
}
}

Expand Down