diff options
| author | Daniel Jasper <djasper@google.com> | 2015-07-03 10:12:53 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2015-07-03 10:12:53 +0000 |
| commit | 043ac050106dba79177c9808eb07538af57e929b (patch) | |
| tree | 4c8532c14dd985524f0cd36297856d94595ba2a9 /clang/lib/Format/TokenAnnotator.cpp | |
| parent | 81c7ea0ec35494940dfeaabef8f6e3e75f3bd807 (diff) | |
| download | bcm5719-llvm-043ac050106dba79177c9808eb07538af57e929b.tar.gz bcm5719-llvm-043ac050106dba79177c9808eb07538af57e929b.zip | |
clang-format: [Java/JS] Properly support instanceof and its precedence.
llvm-svn: 241337
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.cpp')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index bbe776fcc7e..48dedeaef6b 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1008,7 +1008,7 @@ private: if (Tok.isNot(tok::identifier) || !Tok.Previous) return false; - if (Tok.Previous->is(TT_LeadingJavaAnnotation)) + if (Tok.Previous->isOneOf(TT_LeadingJavaAnnotation, Keywords.kw_instanceof)) return false; // Skip "const" as it does not have an influence on whether this is a name. @@ -1336,6 +1336,10 @@ private: return 0; if (Current->is(TT_RangeBasedForLoopColon)) return prec::Comma; + if ((Style.Language == FormatStyle::LK_Java || + Style.Language == FormatStyle::LK_JavaScript) && + Current->is(Keywords.kw_instanceof)) + return prec::Relational; if (Current->is(TT_BinaryOperator) || Current->is(tok::comma)) return Current->getPrecedence(); if (Current->isOneOf(tok::period, tok::arrow)) @@ -2238,7 +2242,8 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line, return true; if (Right.is(tok::kw_typename) && Left.isNot(tok::kw_const)) return true; - if (Left.isBinaryOperator() && !Left.isOneOf(tok::arrowstar, tok::lessless) && + if ((Left.isBinaryOperator() || Left.is(TT_BinaryOperator)) && + !Left.isOneOf(tok::arrowstar, tok::lessless) && Style.BreakBeforeBinaryOperators != FormatStyle::BOS_All && (Style.BreakBeforeBinaryOperators == FormatStyle::BOS_None || Left.getPrecedence() == prec::Assignment)) |
