[Lexer] Don't lex trailing trivia for eof (including artificial eof)

rintaro · Jan Svoboda · commit ad5b8253e3f1 · 2019-08-26T22:37:20.000+02:00
diff --git a/lib/Parse/Lexer.cpp b/lib/Parse/Lexer.cpp
@@ -299,7 +299,7 @@ void Lexer::formToken(tok Kind, const char *TokStart) {
 
   StringRef TokenText { TokStart, static_cast<size_t>(CurPtr - TokStart) };
 
-  if (TriviaRetention == TriviaRetentionMode::WithTrivia) {
+  if (TriviaRetention == TriviaRetentionMode::WithTrivia && Kind != tok::eof) {
     lexTrivia(TrailingTrivia, /* IsForTrailingTrivia */ true);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ void Lexer::formToken(tok Kind, const char *TokStart) {`
`299`	`299`
`300`	`300`	`StringRef TokenText { TokStart, static_cast<size_t>(CurPtr - TokStart) };`
`301`	`301`
`302`		`- if (TriviaRetention == TriviaRetentionMode::WithTrivia) {`
	`302`	`+ if (TriviaRetention == TriviaRetentionMode::WithTrivia && Kind != tok::eof) {`
`303`	`303`	`lexTrivia(TrailingTrivia, /* IsForTrailingTrivia */ true);`
`304`	`304`	`}`
`305`	`305`