diff options
| author | Daniel Jasper <djasper@google.com> | 2015-05-29 06:19:49 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2015-05-29 06:19:49 +0000 |
| commit | 8c42d445e35bcb5a6ea39972757f298b9cf2f7e2 (patch) | |
| tree | 5dabc09e95ff54c18860ceb809f87a1f1ae51824 /clang/lib/Format | |
| parent | 2af5e6fbf921401f6dc5d71a44cbc1b609c1d30c (diff) | |
| download | bcm5719-llvm-8c42d445e35bcb5a6ea39972757f298b9cf2f7e2.tar.gz bcm5719-llvm-8c42d445e35bcb5a6ea39972757f298b9cf2f7e2.zip | |
clang-format: [JS] Support ES6 computed property names.
Before:
var x = {
[a]: 1,
b: 2
};
After:
var x = {
[a]: 1,
b: 2
};
llvm-svn: 238544
Diffstat (limited to 'clang/lib/Format')
| -rw-r--r-- | clang/lib/Format/FormatToken.h | 1 | ||||
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Format/FormatToken.h b/clang/lib/Format/FormatToken.h index ec0fdf4aa81..dd12969454e 100644 --- a/clang/lib/Format/FormatToken.h +++ b/clang/lib/Format/FormatToken.h @@ -51,6 +51,7 @@ enum TokenType { TT_InlineASMBrace, TT_InlineASMColon, TT_JavaAnnotation, + TT_JsComputedPropertyName, TT_JsFatArrow, TT_JsTypeColon, TT_JsTypeOptionalQuestion, diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 2d8dbdbad50..3b6628ecfbd 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -275,6 +275,9 @@ private: if (Left->is(TT_Unknown)) { if (StartsObjCMethodExpr) { Left->Type = TT_ObjCMethodExpr; + } else if (Style.Language == FormatStyle::LK_JavaScript && Parent && + Parent->isOneOf(tok::l_brace, tok::comma)) { + Left->Type = TT_JsComputedPropertyName; } else if (Parent && Parent->isOneOf(tok::at, tok::equal, tok::comma)) { Left->Type = TT_ArrayInitializerLSquare; } else { |
