diff options
Diffstat (limited to 'clang/lib/Format')
| -rw-r--r-- | clang/lib/Format/ContinuationIndenter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index b0bd13b69a3..0cf9e32ea84 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -133,8 +133,8 @@ bool ContinuationIndenter::mustBreak(const LineState &State) { return true; if (Style.AlwaysBreakBeforeMultilineStrings && State.Column > State.Stack.back().Indent && // Breaking saves columns. - Previous.isNot(tok::lessless) && Previous.Type != TT_InlineASMColon && - NextIsMultilineString(State)) + !Previous.isOneOf(tok::kw_return, tok::lessless) && + Previous.Type != TT_InlineASMColon && NextIsMultilineString(State)) return true; if (!Style.BreakBeforeBinaryOperators) { |
