This is an archive of the discontinued LLVM Phabricator instance.

Differential D31698

clang-format: [JS] fix whitespace around "of" operator.
ClosedPublic

Authored by mprobst on Apr 4 2017, 9:03 PM.

Details

Reviewers
djasper
Commits
rGc4a3d081a913: clang-format: [JS] fix whitespace around "of" operator.
rC299533: clang-format: [JS] fix whitespace around "of" operator.
rL299533: clang-format: [JS] fix whitespace around "of" operator.
Summary

Previously:

import {of } from 'x';
of (null);

Now:

import {of} from 'x';
of(null);

Diff Detail

Event Timeline

mprobst created this revision.Apr 4 2017, 9:03 PM
Herald added a subscriber: klimek. · View Herald TranscriptApr 4 2017, 9:03 PM
djasper accepted this revision.Apr 5 2017, 1:16 AM
djasper added inline comments.
lib/Format/TokenAnnotator.cpp
2275

Maybe:

// "of" is only a keyword if it appears after another identifier
// (e.g. as "const x of y" in a for loop).
This revision is now accepted and ready to land.Apr 5 2017, 1:16 AM
mprobst updated this revision to Diff 94188.Apr 5 2017, 4:07 AM
  • improve comment
Closed by commit rL299533: clang-format: [JS] fix whitespace around "of" operator. (authored by mprobst). · Explain WhyApr 5 2017, 4:08 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Format/
7 lines
unittests/
Format/
2 lines

Diff 94158

lib/Format/TokenAnnotator.cpp

Show First 20 Lines • Show All 2,264 Lines • ▼ Show 20 Lines if (Right.is(tok::star) &&
return false; return false;
if (Right.isOneOf(tok::l_brace, tok::l_square) && if (Right.isOneOf(tok::l_brace, tok::l_square) &&
Left.isOneOf(Keywords.kw_function, Keywords.kw_yield)) Left.isOneOf(Keywords.kw_function, Keywords.kw_yield))
return true; return true;
// JS methods can use some keywords as names (e.g. `delete()`). // JS methods can use some keywords as names (e.g. `delete()`).
if (Right.is(tok::l_paren) && Line.MustBeDeclaration && if (Right.is(tok::l_paren) && Line.MustBeDeclaration &&
Left.Tok.getIdentifierInfo()) Left.Tok.getIdentifierInfo())
return false; return false;
if (Left.isOneOf(Keywords.kw_let, Keywords.kw_var, Keywords.kw_in, if ((Left.isOneOf(Keywords.kw_let, Keywords.kw_var, Keywords.kw_in,
Keywords.kw_of, tok::kw_const) && tok::kw_const) ||
// "of" can only occur in a for loop, as a "const x of y".
djasperUnsubmitted
Not Done
ReplyInline Actions

Maybe:

// "of" is only a keyword if it appears after another identifier
// (e.g. as "const x of y" in a for loop).
djasper: Maybe: // "of" is only a keyword if it appears after another identifier // (e.g. as "const…
(Left.is(Keywords.kw_of) && Left.Previous &&
Left.Previous->Tok.getIdentifierInfo())) &&
(!Left.Previous || !Left.Previous->is(tok::period))) (!Left.Previous || !Left.Previous->is(tok::period)))
return true; return true;
if (Left.isOneOf(tok::kw_for, Keywords.kw_as) && Left.Previous && if (Left.isOneOf(tok::kw_for, Keywords.kw_as) && Left.Previous &&
Left.Previous->is(tok::period) && Right.is(tok::l_paren)) Left.Previous->is(tok::period) && Right.is(tok::l_paren))
return false; return false;
if (Left.is(Keywords.kw_as) && if (Left.is(Keywords.kw_as) &&
Right.isOneOf(tok::l_square, tok::l_brace, tok::l_paren)) Right.isOneOf(tok::l_square, tok::l_brace, tok::l_paren))
return true; return true;
▲ Show 20 Lines • Show All 457 Lines • Show Last 20 Lines

unittests/Format/FormatTestJS.cpp

Show First 20 Lines • Show All 126 Lines • ▼ Show 20 Lines
TEST_F(FormatTestJS, ReservedWords) { TEST_F(FormatTestJS, ReservedWords) {
// JavaScript reserved words (aka keywords) are only illegal when used as // JavaScript reserved words (aka keywords) are only illegal when used as
// Identifiers, but are legal as IdentifierNames. // Identifiers, but are legal as IdentifierNames.
verifyFormat("x.class.struct = 1;"); verifyFormat("x.class.struct = 1;");
verifyFormat("x.case = 1;"); verifyFormat("x.case = 1;");
verifyFormat("x.interface = 1;"); verifyFormat("x.interface = 1;");
verifyFormat("x.for = 1;"); verifyFormat("x.for = 1;");
verifyFormat("x.of() = 1;"); verifyFormat("x.of() = 1;");
verifyFormat("of(null);");
verifyFormat("import {of} from 'x';");
verifyFormat("x.in() = 1;"); verifyFormat("x.in() = 1;");
verifyFormat("x.let() = 1;"); verifyFormat("x.let() = 1;");
verifyFormat("x.var() = 1;"); verifyFormat("x.var() = 1;");
verifyFormat("x.for() = 1;"); verifyFormat("x.for() = 1;");
verifyFormat("x.as() = 1;"); verifyFormat("x.as() = 1;");
verifyFormat("x = {\n" verifyFormat("x = {\n"
" a: 12,\n" " a: 12,\n"
" interface: 1,\n" " interface: 1,\n"
▲ Show 20 Lines • Show All 1,607 Lines • Show Last 20 Lines