diff options
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.cpp')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 21cec905a8e..2f8457c61b3 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -609,6 +609,7 @@ private: if (CurrentToken->Type != TT_LambdaLSquare && CurrentToken->Type != TT_FunctionLBrace && CurrentToken->Type != TT_ImplicitStringLiteral && + CurrentToken->Type != TT_RegexLiteral && CurrentToken->Type != TT_TrailingReturnArrow) CurrentToken->Type = TT_Unknown; if (CurrentToken->Role) @@ -622,10 +623,8 @@ private: determineTokenType(*CurrentToken); CurrentToken->BindingStrength = Contexts.back().BindingStrength; CurrentToken->NestingLevel = Contexts.size() - 1; - } - - if (CurrentToken != NULL) CurrentToken = CurrentToken->Next; + } resetTokenMetadata(CurrentToken); } @@ -1555,6 +1554,8 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line, return true; if (Tok.Type == TT_TrailingUnaryOperator) return false; + if (Tok.Previous->Type == TT_RegexLiteral) + return false; return spaceRequiredBetween(Line, *Tok.Previous, Tok); } |
