Skip to content

Commit 42d3cd0

Browse files
committed
chore: aesthetic changes
1 parent e27fb2b commit 42d3cd0

File tree

1 file changed

+27
-28
lines changed

1 file changed

+27
-28
lines changed

Rules/UseConsistentWhitespace.cs

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -289,37 +289,36 @@ private IEnumerable<DiagnosticRecord> FindKeywordAfterBraceViolations(TokenOpera
289289
{
290290
var keyword = keywordNode.Value;
291291

292-
if (keywordNode.Previous != null)
292+
if (keywordNode.Previous == null || keywordNode.Previous.Value.Kind != TokenKind.RCurly)
293293
{
294-
if (keywordNode.Previous.Value.Kind == TokenKind.RCurly &&
295-
IsPreviousTokenOnSameLine(keywordNode))
296-
{
297-
var hasWhitespace = IsPreviousTokenApartByWhitespace(keywordNode);
294+
continue;
295+
}
298296

299-
if (!hasWhitespace)
300-
{
301-
var corrections = new List<CorrectionExtent>
302-
{
303-
new CorrectionExtent(
304-
keywordNode.Previous.Value.Extent.EndLineNumber,
305-
keyword.Extent.StartLineNumber,
306-
keywordNode.Previous.Value.Extent.EndColumnNumber,
307-
keyword.Extent.StartColumnNumber,
308-
whiteSpace,
309-
keyword.Extent.File)
310-
};
311-
312-
yield return new DiagnosticRecord(
313-
GetError(ErrorKind.BeforeOpeningBrace),
314-
keyword.Extent,
315-
GetName(),
316-
GetDiagnosticSeverity(),
317-
tokenOperations.Ast.Extent.File,
318-
null,
319-
corrections);
320-
}
321-
}
297+
if (!IsPreviousTokenOnSameLine(keywordNode) || IsPreviousTokenApartByWhitespace(keywordNode))
298+
{
299+
continue;
322300
}
301+
302+
// Whitespace required
303+
var corrections = new List<CorrectionExtent>
304+
{
305+
new CorrectionExtent(
306+
keywordNode.Previous.Value.Extent.EndLineNumber,
307+
keyword.Extent.StartLineNumber,
308+
keywordNode.Previous.Value.Extent.EndColumnNumber,
309+
keyword.Extent.StartColumnNumber,
310+
whiteSpace,
311+
keyword.Extent.File)
312+
};
313+
314+
yield return new DiagnosticRecord(
315+
GetError(ErrorKind.BeforeOpeningBrace),
316+
keyword.Extent,
317+
GetName(),
318+
GetDiagnosticSeverity(),
319+
tokenOperations.Ast.Extent.File,
320+
null,
321+
corrections);
323322
}
324323
}
325324

0 commit comments

Comments
 (0)