diff options
| -rw-r--r-- | clang/lib/Format/Format.cpp | 3 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTestJS.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index dea2386e0ac..ae8c75ff6dc 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -1244,6 +1244,7 @@ private: static tok::TokenKind JSNotIdentity[] = { tok::exclaimequal, tok::equal }; static tok::TokenKind JSShiftEqual[] = { tok::greater, tok::greater, tok::greaterequal }; + static tok::TokenKind JSRightArrow[] = { tok::equal, tok::greater }; // FIXME: We probably need to change token type to mimic operator with the // correct priority. if (tryMergeTokens(JSIdentity)) @@ -1252,6 +1253,8 @@ private: return; if (tryMergeTokens(JSShiftEqual)) return; + if (tryMergeTokens(JSRightArrow)) + return; } } diff --git a/clang/unittests/Format/FormatTestJS.cpp b/clang/unittests/Format/FormatTestJS.cpp index 7a853b03781..c10dc9675f4 100644 --- a/clang/unittests/Format/FormatTestJS.cpp +++ b/clang/unittests/Format/FormatTestJS.cpp @@ -77,6 +77,8 @@ TEST_F(FormatTestJS, UnderstandsJavaScriptOperators) { " bbbbbb :\n" " ccc;", getGoogleJSStyleWithColumns(20)); + + verifyFormat("var b = a.map((x) => x + 1);"); } TEST_F(FormatTestJS, SpacesInContainerLiterals) { |
