From ffd5a34cf44abdf5f4bba81fcd38ffe49428dd3c Mon Sep 17 00:00:00 2001
From: Martin Probst <martin@probst.io>
Date: Wed, 1 Jun 2016 15:22:47 +0000
Subject: [PATCH] clang-format: [JS] no ASI on `import {x as\n y}`.
Summary: ASI did not handle the ES6 `as` operator correctly.
Reviewers: djasper
Subscribers: klimek, cfe-commits
Differential Revision: http://reviews.llvm.org/D20817
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@271401 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/Format/SortJavaScriptImports.cpp | 2 +-
lib/Format/UnwrappedLineParser.cpp | 10 +++++-----
unittests/Format/FormatTestJS.cpp | 3 +++
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/lib/Format/SortJavaScriptImports.cpp b/lib/Format/SortJavaScriptImports.cpp
index a0484c862e9..28c3ae9f6a8 100644
--- a/lib/Format/SortJavaScriptImports.cpp
+++ b/lib/Format/SortJavaScriptImports.cpp
@@ -245,7 +245,7 @@ private:
SourceLocation SymbolsEnd = Reference.Symbols.back().Range.getEnd();
Buffer += getSourceText(Reference.Range.getBegin(), SymbolsStart);
// ... then the references in order ...
- for (auto *I = Symbols.begin(), *E = Symbols.end(); I != E; ++I) {
+ for (auto I = Symbols.begin(), E = Symbols.end(); I != E; ++I) {
if (I != Symbols.begin())
Buffer += ",";
Buffer += getSourceText(I->Range);
diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
index 194a40e63fa..18df7576ca2 100644
--- a/lib/Format/UnwrappedLineParser.cpp
+++ b/lib/Format/UnwrappedLineParser.cpp
@@ -668,11 +668,11 @@ static bool mustBeJSIdent(const AdditionalKeywords &Keywords,
// FIXME: This returns true for C/C++ keywords like 'struct'.
return FormatTok->is(tok::identifier) &&
(FormatTok->Tok.getIdentifierInfo() == nullptr ||
- !FormatTok->isOneOf(Keywords.kw_in, Keywords.kw_of, Keywords.kw_async,
- Keywords.kw_await, Keywords.kw_yield,
- Keywords.kw_finally, Keywords.kw_function,
- Keywords.kw_import, Keywords.kw_is,
- Keywords.kw_let, Keywords.kw_var,
+ !FormatTok->isOneOf(Keywords.kw_in, Keywords.kw_of, Keywords.kw_as,
+ Keywords.kw_async, Keywords.kw_await,
+ Keywords.kw_yield, Keywords.kw_finally,
+ Keywords.kw_function, Keywords.kw_import,
+ Keywords.kw_is, Keywords.kw_let, Keywords.kw_var,
Keywords.kw_abstract, Keywords.kw_extends,
Keywords.kw_implements, Keywords.kw_instanceof,
Keywords.kw_interface, Keywords.kw_throws));
diff --git a/unittests/Format/FormatTestJS.cpp b/unittests/Format/FormatTestJS.cpp
index be6f9602545..f646b82c213 100644
--- a/unittests/Format/FormatTestJS.cpp
+++ b/unittests/Format/FormatTestJS.cpp
@@ -1010,6 +1010,9 @@ TEST_F(FormatTestJS, Modules) {
"} from 'some/module.js';");
verifyFormat("import {X, Y,} from 'some/module.js';");
verifyFormat("import {X as myLocalX, Y as myLocalY} from 'some/module.js';");
+ // Ensure Automatic Semicolon Insertion does not break on "as\n".
+ verifyFormat("import {X as myX} from 'm';", "import {X as\n"
+ " myX} from 'm';");
verifyFormat("import * as lib from 'some/module.js';");
verifyFormat("var x = {import: 1};\nx.import = 2;");
--
GitLab