Index: lib/Format/UnwrappedLineParser.cpp =================================================================== --- lib/Format/UnwrappedLineParser.cpp +++ lib/Format/UnwrappedLineParser.cpp @@ -668,11 +668,11 @@ // 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)); Index: unittests/Format/FormatTestJS.cpp =================================================================== --- unittests/Format/FormatTestJS.cpp +++ unittests/Format/FormatTestJS.cpp @@ -1010,6 +1010,9 @@ "} 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;");