File tree Expand file tree Collapse file tree 1 file changed +8
-6
lines changed Expand file tree Collapse file tree 1 file changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -1414,10 +1414,6 @@ class AnnotatingParser {
14141414 Tok->setType (TT_TrailingReturnArrow);
14151415 }
14161416 break ;
1417- case tok::eof:
1418- if (Style.InsertNewlineAtEOF && Tok->NewlinesBefore == 0 )
1419- Tok->NewlinesBefore = 1 ;
1420- break ;
14211417 default :
14221418 break ;
14231419 }
@@ -3244,8 +3240,14 @@ void TokenAnnotator::annotate(AnnotatedLine &Line) {
32443240 else if (Line.startsWith (TT_ObjCProperty))
32453241 Line.Type = LT_ObjCProperty;
32463242
3247- Line.First ->SpacesRequiredBefore = 1 ;
3248- Line.First ->CanBreakBefore = Line.First ->MustBreakBefore ;
3243+ auto *First = Line.First ;
3244+ First->SpacesRequiredBefore = 1 ;
3245+ First->CanBreakBefore = First->MustBreakBefore ;
3246+
3247+ if (First->is (tok::eof) && First->NewlinesBefore == 0 &&
3248+ Style.InsertNewlineAtEOF ) {
3249+ First->NewlinesBefore = 1 ;
3250+ }
32493251}
32503252
32513253// This function heuristically determines whether 'Current' starts the name of a
You can’t perform that action at this time.
0 commit comments