This is an archive of the discontinued LLVM Phabricator instance.

Differential D36132

clang-format: [JS] support default imports.
ClosedPublic

Authored by mprobst on Aug 1 2017, 1:26 AM.

Details

Reviewers
djasper
Commits
rG4bf1d7ad81df: clang-format: [JS] support default imports.
rC309697: clang-format: [JS] support default imports.
rL309697: clang-format: [JS] support default imports.
Summary

Formerly, import {default as X} from y; would not be recognized as an import.

Diff Detail

Event Timeline

mprobst created this revision.Aug 1 2017, 1:26 AM
Herald added a subscriber: klimek. · View Herald TranscriptAug 1 2017, 1:26 AM
djasper accepted this revision.Aug 1 2017, 4:37 AM
djasper added inline comments.
lib/Format/SortJavaScriptImports.cpp
416

Change to

!Current->isOneOf(tok::identifier, tok::kw_default)

Same below.

This revision is now accepted and ready to land.Aug 1 2017, 4:37 AM
Closed by commit rL309697: clang-format: [JS] support default imports. (authored by mprobst). · Explain WhyAug 1 2017, 9:05 AM
This revision was automatically updated to reflect the committed changes.
mprobst marked an inline comment as done.Aug 1 2017, 10:03 AM

Revision Contents

PathSize
lib/
Format/
4 lines
unittests/
Format/
8 lines

Diff 109059

lib/Format/SortJavaScriptImports.cpp

Show First 20 Lines • Show All 407 Lines • ▼ Show 20 Lines bool parseNamedBindings(const AdditionalKeywords &Keywords,
if (Current->isNot(tok::l_brace)) if (Current->isNot(tok::l_brace))
return false; return false;
// {sym as alias, sym2 as ...} from '...'; // {sym as alias, sym2 as ...} from '...';
while (Current->isNot(tok::r_brace)) { while (Current->isNot(tok::r_brace)) {
nextToken(); nextToken();
if (Current->is(tok::r_brace)) if (Current->is(tok::r_brace))
break; break;
if (Current->isNot(tok::identifier)) if (Current->isNot(tok::identifier) && Current->isNot(tok::kw_default))
djasperUnsubmitted
Done
ReplyInline Actions

Change to

!Current->isOneOf(tok::identifier, tok::kw_default)

Same below.

djasper: Change to !Current->isOneOf(tok::identifier, tok::kw_default) Same below.
return false; return false;
JsImportedSymbol Symbol; JsImportedSymbol Symbol;
Symbol.Symbol = Current->TokenText; Symbol.Symbol = Current->TokenText;
// Make sure to include any preceding comments. // Make sure to include any preceding comments.
Symbol.Range.setBegin( Symbol.Range.setBegin(
Current->getPreviousNonComment()->Next->WhitespaceRange.getBegin()); Current->getPreviousNonComment()->Next->WhitespaceRange.getBegin());
nextToken(); nextToken();
if (Current->is(Keywords.kw_as)) { if (Current->is(Keywords.kw_as)) {
nextToken(); nextToken();
if (Current->isNot(tok::identifier)) if (Current->isNot(tok::identifier) && Current->isNot(tok::kw_default))
return false; return false;
Symbol.Alias = Current->TokenText; Symbol.Alias = Current->TokenText;
nextToken(); nextToken();
} }
Symbol.Range.setEnd(Current->Tok.getLocation()); Symbol.Range.setEnd(Current->Tok.getLocation());
Reference.Symbols.push_back(Symbol); Reference.Symbols.push_back(Symbol);
if (!Current->isOneOf(tok::r_brace, tok::comma)) if (!Current->isOneOf(tok::r_brace, tok::comma))
Show All 20 Lines

unittests/Format/SortImportsTestJS.cpp

Show First 20 Lines • Show All 294 Lines • ▼ Show 20 Lines verifySort("import {A} from 'a';\n"
"}\n" "}\n"
"from\n" "from\n"
"'b';\n" "'b';\n"
"import {A} from 'a';\n" "import {A} from 'a';\n"
"\n" "\n"
"1;"); "1;");
} }
TEST_F(SortImportsTestJS, SortDefaultImports) {
// Reproduces issue where multi-line import was not parsed correctly.
verifySort("import {A} from 'a';\n"
"import {default as B} from 'b';\n",
"import {default as B} from 'b';\n"
"import {A} from 'a';\n");
}
} // end namespace } // end namespace
} // end namespace format } // end namespace format
} // end namespace clang } // end namespace clang