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

Revert "clang-format: [JS] space between pseudo keywords and template literals." 

This reverts commit 71d3b5cd916106005ef23467e3f6c7fbca7bc499.

llvm-svn: 307034
This commit is contained in:
Martin Probst 2017-07-03 15:31:28 +00:00
parent e9b1d16a8c
commit 29e0a99297
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2319,11 +2319,7 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
if ((Left.is(TT_TemplateString) && Left.TokenText.endswith("${")) ||
(Right.is(TT_TemplateString) && Right.TokenText.startswith("}")))
return false;
// In tagged template literals ("html`bar baz`"), there is no space between
// the tag identifier and the template string. getIdentifierInfo makes sure
// that the identifier is not a pseudo keyword like `yield`, either.
if (Left.is(tok::identifier) && Left.Tok.getIdentifierInfo() == nullptr &&
Right.is(TT_TemplateString))
if (Left.is(tok::identifier) && Right.is(TT_TemplateString))
return false;
if (Right.is(tok::star) &&
Left.isOneOf(Keywords.kw_function, Keywords.kw_yield))

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

@ -1564,7 +1564,6 @@ TEST_F(FormatTestJS, TemplateStrings) {
" aaaaa( //\n"
" aaaaa)\n"
" })`);");
verifyFormat("yield `hello`;");
}
TEST_F(FormatTestJS, TemplateStringMultiLineExpression) {