diff options
| -rw-r--r-- | lib/Format/TokenAnnotator.cpp | 3 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index d9368c3649..ac7301eebd 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -592,7 +592,8 @@ private: else Current.Type = TT_BlockComment; } else if (Current.is(tok::r_paren)) { - bool ParensNotExpr = Current.Parent->Type == TT_PointerOrReference || + bool ParensNotExpr = !Current.Parent || + Current.Parent->Type == TT_PointerOrReference || Current.Parent->Type == TT_TemplateCloser; bool ParensCouldEndDecl = !Current.Children.empty() && (Current.Children[0].is(tok::equal) || diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 3a1e9dce95..05e5d37171 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -937,6 +937,8 @@ TEST_F(FormatTest, MacroDefinitionsWithIncompleteCode) { getLLVMStyleWithColumns(20)); verifyFormat("#define A template <typename T>"); + verifyFormat("#define STR(x) #x\n" + "f(STR(this_is_a_string_literal{));"); } TEST_F(FormatTest, IndentPreprocessorDirectivesAtZero) { |