diff options
author | Daniel Jasper <djasper@google.com> | 2016-03-22 14:32:20 +0000 |
---|---|---|
committer | Daniel Jasper <djasper@google.com> | 2016-03-22 14:32:20 +0000 |
commit | 8fc7a1e9920668acca038eeee3afdcd682bba352 (patch) | |
tree | dd8827c618415c17baaf99782f5c7de09b871352 /clang/lib/Format/FormatToken.h | |
parent | 0f17d0da4a9c3da0e2488eab1aee63adfaf8504f (diff) | |
download | bcm5719-llvm-8fc7a1e9920668acca038eeee3afdcd682bba352.tar.gz bcm5719-llvm-8fc7a1e9920668acca038eeee3afdcd682bba352.zip |
clang-format: [JS] do not wrap ES6 imports/exports.
"import ... from '...';" and "export ... from '...';" should be treated
the same as goog.require/provide/module/forwardDeclare calls.
Patch by Martin Probst.
llvm-svn: 264055
Diffstat (limited to 'clang/lib/Format/FormatToken.h')
-rw-r--r-- | clang/lib/Format/FormatToken.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/clang/lib/Format/FormatToken.h b/clang/lib/Format/FormatToken.h index 64d236bfb37..f15c9e998e6 100644 --- a/clang/lib/Format/FormatToken.h +++ b/clang/lib/Format/FormatToken.h @@ -537,6 +537,7 @@ struct AdditionalKeywords { kw_finally = &IdentTable.get("finally"); kw_function = &IdentTable.get("function"); + kw_from = &IdentTable.get("from"); kw_import = &IdentTable.get("import"); kw_is = &IdentTable.get("is"); kw_let = &IdentTable.get("let"); @@ -583,6 +584,7 @@ struct AdditionalKeywords { // JavaScript keywords. IdentifierInfo *kw_finally; IdentifierInfo *kw_function; + IdentifierInfo *kw_from; IdentifierInfo *kw_import; IdentifierInfo *kw_is; IdentifierInfo *kw_let; |