replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clang-format: [JS] Fix incorrect space when "as" is used as identifier. 

Before:
  aaaaa.as ();

After:
  aaaaa.as();

llvm-svn: 285672
This commit is contained in:
Daniel Jasper 2016-11-01 06:23:10 +00:00
parent 3ade3be2a1
commit b559b43802
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2160,7 +2160,7 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
Keywords.kw_of, tok::kw_const) &&
(!Left.Previous || !Left.Previous->is(tok::period)))
return true;
if (Left.is(tok::kw_for) && Left.Previous &&
if (Left.isOneOf(tok::kw_for, Keywords.kw_as) && Left.Previous &&
Left.Previous->is(tok::period) && Right.is(tok::l_paren))
return false;
if (Left.is(Keywords.kw_as) &&

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

@ -136,6 +136,7 @@ TEST_F(FormatTestJS, ReservedWords) {
verifyFormat("x.let() = 1;");
verifyFormat("x.var() = 1;");
verifyFormat("x.for() = 1;");
verifyFormat("x.as() = 1;");
verifyFormat("x = {\n"
" a: 12,\n"
" interface: 1,\n"