This is an archive of the discontinued LLVM Phabricator instance.

Differential D8988

clang-format: support JS index signature types.
ClosedPublic

Authored by mprobst on Apr 11 2015, 11:34 AM.

Details

Reviewers
djasper

Diff Detail

Event Timeline

mprobst updated this revision to Diff 23642.Apr 11 2015, 11:34 AM
mprobst retitled this revision from to clang-format: support JS index signature types..
mprobst updated this object.
mprobst edited the test plan for this revision. (Show Details)
mprobst added a reviewer: djasper.
mprobst added subscribers: Unknown Object (MLST), klimek.
djasper accepted this revision.Apr 13 2015, 8:06 AM
djasper edited edge metadata.

Submitted as r234754.

This revision is now accepted and ready to land.Apr 13 2015, 8:06 AM
djasper closed this revision.Apr 13 2015, 8:06 AM

Revision Contents

PathSize
lib/
Format/
3 lines
unittests/
Format/
4 lines

Diff 23642

lib/Format/TokenAnnotator.cpp

Show First 20 Lines • Show All 407 Lines • ▼ Show 20 Lines bool consumeToken() {
case tok::colon: case tok::colon:
if (!Tok->Previous) if (!Tok->Previous)
return false; return false;
// Colons from ?: are handled in parseConditional(). // Colons from ?: are handled in parseConditional().
if (Style.Language == FormatStyle::LK_JavaScript) { if (Style.Language == FormatStyle::LK_JavaScript) {
if (Contexts.back().ColonIsForRangeExpr || if (Contexts.back().ColonIsForRangeExpr ||
(Contexts.size() == 1 && (Contexts.size() == 1 &&
!Line.First->isOneOf(tok::kw_enum, tok::kw_case)) || !Line.First->isOneOf(tok::kw_enum, tok::kw_case)) ||
Contexts.back().ContextKind == tok::l_paren) { Contexts.back().ContextKind == tok::l_paren ||
Contexts.back().ContextKind == tok::l_square) {
Tok->Type = TT_JsTypeColon; Tok->Type = TT_JsTypeColon;
break; break;
} }
} }
if (Contexts.back().ColonIsDictLiteral) { if (Contexts.back().ColonIsDictLiteral) {
Tok->Type = TT_DictLiteral; Tok->Type = TT_DictLiteral;
} else if (Contexts.back().ColonIsObjCMethodExpr || } else if (Contexts.back().ColonIsObjCMethodExpr ||
Line.First->is(TT_ObjCMethodSpecifier)) { Line.First->is(TT_ObjCMethodSpecifier)) {
▲ Show 20 Lines • Show All 1,719 Lines • Show Last 20 Lines

unittests/Format/FormatTestJS.cpp

Show First 20 Lines • Show All 663 Lines • ▼ Show 20 Lines
TEST_F(FormatTestJS, OptionalTypes) { TEST_F(FormatTestJS, OptionalTypes) {
verifyFormat("function x(a?: b, c?, d?) {\n}"); verifyFormat("function x(a?: b, c?, d?) {\n}");
verifyFormat("class X {\n" verifyFormat("class X {\n"
" y?: z;\n" " y?: z;\n"
" z?;\n" " z?;\n"
"}"); "}");
} }
TEST_F(FormatTestJS, IndexSignature) {
verifyFormat("var x: {[k: string]: v};");
}
} // end namespace tooling } // end namespace tooling
} // end namespace clang } // end namespace clang