@@ -289,37 +289,36 @@ private IEnumerable<DiagnosticRecord> FindKeywordAfterBraceViolations(TokenOpera
289
289
{
290
290
var keyword = keywordNode . Value ;
291
291
292
- if ( keywordNode . Previous != null )
292
+ if ( keywordNode . Previous == null || keywordNode . Previous . Value . Kind != TokenKind . RCurly )
293
293
{
294
- if ( keywordNode . Previous . Value . Kind == TokenKind . RCurly &&
295
- IsPreviousTokenOnSameLine ( keywordNode ) )
296
- {
297
- var hasWhitespace = IsPreviousTokenApartByWhitespace ( keywordNode ) ;
294
+ continue ;
295
+ }
298
296
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 ;
322
300
}
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 ) ;
323
322
}
324
323
}
325
324
0 commit comments