aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Format/Format.cpp
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2015-05-08 07:55:13 +0000
committerDaniel Jasper <djasper@google.com>2015-05-08 07:55:13 +0000
commit69694b069193fdb446dffa84043b218f84e93957 (patch)
treef03bad670a1b8ede43f683e0a17ac854ab50fbe3 /clang/lib/Format/Format.cpp
parent8eb9d1bf124c8344663aca5e45323913be7ff292 (diff)
downloadllvm-69694b069193fdb446dffa84043b218f84e93957.zip
llvm-69694b069193fdb446dffa84043b218f84e93957.tar.gz
llvm-69694b069193fdb446dffa84043b218f84e93957.tar.bz2
clang-format: [JS] Fix regex literal detection.
Before: var regex = /= / ; After: var regex = /=/; llvm-svn: 236811
Diffstat (limited to 'clang/lib/Format/Format.cpp')
-rw-r--r--clang/lib/Format/Format.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index bb10c60..aa24891 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -752,7 +752,7 @@ private:
unsigned LastColumn = Tokens.back()->OriginalColumn;
for (auto I = Tokens.rbegin() + 1, E = Tokens.rend(); I != E; ++I) {
++TokenCount;
- if (I[0]->is(tok::slash) && I + 1 != E &&
+ if (I[0]->isOneOf(tok::slash, tok::slashequal) && I + 1 != E &&
(I[1]->isOneOf(tok::l_paren, tok::semi, tok::l_brace, tok::r_brace,
tok::exclaim, tok::l_square, tok::colon, tok::comma,
tok::question, tok::kw_return) ||