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

clang-format: [JS] add space before operator 'in'. 

Before:
  return ('aaa')in bbbb;

After:
  return ('aaa') in bbbb;

llvm-svn: 218119
This commit is contained in:
Daniel Jasper 2014-09-19 10:48:15 +00:00
parent 2c589bcc5e
commit 3549ea1a73
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -868,6 +868,9 @@ private:
Tok.Previous->Type == TT_PointerOrReference || Tok.Previous->Type == TT_PointerOrReference ||
Tok.Previous->Type == TT_TemplateCloser || Tok.Previous->Type == TT_TemplateCloser ||
Tok.Previous->isSimpleTypeSpecifier(); Tok.Previous->isSimpleTypeSpecifier();
if (Style.Language == FormatStyle::LK_JavaScript && Tok.Next &&
Tok.Next->TokenText == "in")
return false;
bool ParensCouldEndDecl = bool ParensCouldEndDecl =
Tok.Next && Tok.Next->isOneOf(tok::equal, tok::semi, tok::l_brace); Tok.Next && Tok.Next->isOneOf(tok::equal, tok::semi, tok::l_brace);
bool IsSizeOfOrAlignOf = bool IsSizeOfOrAlignOf =

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

@ -81,6 +81,7 @@ TEST_F(FormatTestJS, UnderstandsJavaScriptOperators) {
getGoogleJSStyleWithColumns(20)); getGoogleJSStyleWithColumns(20));
verifyFormat("var b = a.map((x) => x + 1);"); verifyFormat("var b = a.map((x) => x + 1);");
verifyFormat("return ('aaa') in bbbb;");
} }
TEST_F(FormatTestJS, UnderstandsAmpAmp) { TEST_F(FormatTestJS, UnderstandsAmpAmp) {