diff options
author | Daniel Jasper <djasper@google.com> | 2015-07-02 15:00:44 +0000 |
---|---|---|
committer | Daniel Jasper <djasper@google.com> | 2015-07-02 15:00:44 +0000 |
commit | f144620cc19a51268199b2661e7097d9ab0448e4 (patch) | |
tree | 526ec5eb4a5ff8ee90897727ca77aa8316079339 | |
parent | 07d4496ab7c7dbad8e43fe621b09f600ba678b3c (diff) | |
download | bcm5719-llvm-f144620cc19a51268199b2661e7097d9ab0448e4.tar.gz bcm5719-llvm-f144620cc19a51268199b2661e7097d9ab0448e4.zip |
clang-format: [JS] Treat regex literals like string literals.
Using the token type "unknown" can interfere badly with
WhitespaceManager's way of handling multiline comments.
llvm-svn: 241273
-rw-r--r-- | clang/lib/Format/Format.cpp | 2 | ||||
-rw-r--r-- | clang/unittests/Format/FormatTestJS.cpp | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index f97e1fbc6d7..2bbe4c63d15 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -808,6 +808,8 @@ private: Tokens.resize(Tokens.size() - TokenCount); Tokens.back()->Tok.setKind(tok::unknown); Tokens.back()->Type = TT_RegexLiteral; + // Treat regex literals like other string_literals. + Tokens.back()->Tok.setKind(tok::string_literal); Tokens.back()->ColumnWidth += LastColumn - I[0]->OriginalColumn; return true; } diff --git a/clang/unittests/Format/FormatTestJS.cpp b/clang/unittests/Format/FormatTestJS.cpp index ef5901e8d69..b3e0f68ac3b 100644 --- a/clang/unittests/Format/FormatTestJS.cpp +++ b/clang/unittests/Format/FormatTestJS.cpp @@ -638,6 +638,10 @@ TEST_F(FormatTestJS, RegexLiteralSpecialCharacters) { getGoogleJSStyleWithColumns(15)); verifyFormat("var regex = //\n" " /a/;"); + verifyFormat("var regexs = [\n" + " /d/, //\n" + " /aa/, //\n" + "];"); } TEST_F(FormatTestJS, RegexLiteralModifiers) { |