maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

clang-format: [JS/TS] Properly understand cast expressions. 

Many things were wrong:
- We didn't always allow wrapping after "as", which can be necessary.
- We used to Undestand the identifier after "as" as a start of a name.
- We didn't properly parse the structure of the expression with "as"
  having the precedence of relational operators

llvm-svn: 296659
This commit is contained in:
Daniel Jasper 2017-03-01 19:26:12 +00:00
parent f947d8d163
commit 01b8783a05
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/Format/TokenAnnotator.cpp
View File

@ -1158,7 +1158,8 @@ private:
if (Tok.isNot(tok::identifier) || !Tok.Previous) if (Tok.isNot(tok::identifier) || !Tok.Previous)
return false; return false;
if (Tok.Previous->isOneOf(TT_LeadingJavaAnnotation, Keywords.kw_instanceof)) if (Tok.Previous->isOneOf(TT_LeadingJavaAnnotation, Keywords.kw_instanceof,
Keywords.kw_as))
return false; return false;
if (Style.Language == FormatStyle::LK_JavaScript && if (Style.Language == FormatStyle::LK_JavaScript &&
Tok.Previous->is(Keywords.kw_in)) Tok.Previous->is(Keywords.kw_in))
@ -1533,7 +1534,7 @@ private:
Current->is(Keywords.kw_instanceof)) Current->is(Keywords.kw_instanceof))
return prec::Relational; return prec::Relational;
if (Style.Language == FormatStyle::LK_JavaScript && if (Style.Language == FormatStyle::LK_JavaScript &&
Current->is(Keywords.kw_in)) Current->isOneOf(Keywords.kw_in, Keywords.kw_as))
return prec::Relational; return prec::Relational;
if (Current->is(TT_BinaryOperator) || Current->is(tok::comma)) if (Current->is(TT_BinaryOperator) || Current->is(tok::comma))
return Current->getPrecedence(); return Current->getPrecedence();
@ -2531,6 +2532,8 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line,
return Style.BreakBeforeBinaryOperators != FormatStyle::BOS_None; return Style.BreakBeforeBinaryOperators != FormatStyle::BOS_None;
if (Right.is(Keywords.kw_as)) if (Right.is(Keywords.kw_as))
return false; // must not break before as in 'x as type' casts return false; // must not break before as in 'x as type' casts
if (Left.is(Keywords.kw_as))
return true;
if (Left.is(Keywords.kw_declare) && if (Left.is(Keywords.kw_declare) &&
Right.isOneOf(Keywords.kw_module, tok::kw_namespace, Right.isOneOf(Keywords.kw_module, tok::kw_namespace,
Keywords.kw_function, tok::kw_class, tok::kw_enum, Keywords.kw_function, tok::kw_class, tok::kw_enum,

3
clang/unittests/Format/FormatTestJS.cpp
View File

@ -1502,6 +1502,9 @@ TEST_F(FormatTestJS, CastSyntax) {
verifyFormat("x = x as {a: string};"); verifyFormat("x = x as {a: string};");
verifyFormat("x = x as (string);"); verifyFormat("x = x as (string);");
verifyFormat("x = x! as (string);"); verifyFormat("x = x! as (string);");
verifyFormat("var x = something.someFunction() as\n"
" something;",
getGoogleJSStyleWithColumns(40));
} }
TEST_F(FormatTestJS, TypeArguments) { TEST_F(FormatTestJS, TypeArguments) {