diff options
| author | Daniel Jasper <djasper@google.com> | 2014-12-17 09:11:08 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-12-17 09:11:08 +0000 |
| commit | 0580ff0ec6d0a37cea6edfde82391d1bb85470a8 (patch) | |
| tree | 91db9877302e2592f05795905542b0bae6f9ac79 /clang | |
| parent | 028e966a54ecf79e8369970f034ce42e748523f3 (diff) | |
| download | bcm5719-llvm-0580ff0ec6d0a37cea6edfde82391d1bb85470a8.tar.gz bcm5719-llvm-0580ff0ec6d0a37cea6edfde82391d1bb85470a8.zip | |
clang-format: Fix incorrect calculation of token lenghts.
This led, e.g. to break JavaScript regex literals too early.
llvm-svn: 224419
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Format/Format.cpp | 1 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTestJS.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index ca0cce40853..81c9e130d5a 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -889,7 +889,6 @@ private: Column += Style.TabWidth - Column % Style.TabWidth; break; case '\\': - ++Column; if (i + 1 == e || (FormatTok->TokenText[i + 1] != '\r' && FormatTok->TokenText[i + 1] != '\n')) FormatTok->Type = TT_ImplicitStringLiteral; diff --git a/clang/unittests/Format/FormatTestJS.cpp b/clang/unittests/Format/FormatTestJS.cpp index 1d12d32044a..780b02f746e 100644 --- a/clang/unittests/Format/FormatTestJS.cpp +++ b/clang/unittests/Format/FormatTestJS.cpp @@ -482,6 +482,8 @@ TEST_F(FormatTestJS, RegexLiteralLength) { verifyFormat("var regex =\n" " /aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/;", getGoogleJSStyleWithColumns(60)); + verifyFormat("var regex = /\\xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/;", + getGoogleJSStyleWithColumns(50)); } TEST_F(FormatTestJS, RegexLiteralExamples) { |
