diff options
| author | Paul Hoad <mydeveloperday@gmail.com> | 2019-03-23 14:24:30 +0000 |
|---|---|---|
| committer | Paul Hoad <mydeveloperday@gmail.com> | 2019-03-23 14:24:30 +0000 |
| commit | a87ba1c59cb9f3381216cfe4e1a6a1e5425225ca (patch) | |
| tree | c5eed4ec27b42d9047c632fd1da440aff69240c1 /clang/lib/Format/UnwrappedLineParser.cpp | |
| parent | c7ba9555cf1f4eb49e03428f60f1dd2cdb5b78c4 (diff) | |
| download | bcm5719-llvm-a87ba1c59cb9f3381216cfe4e1a6a1e5425225ca.tar.gz bcm5719-llvm-a87ba1c59cb9f3381216cfe4e1a6a1e5425225ca.zip | |
[clang-format] correctly format protobuf fields named "enum".
Summary: Similar to TypeScript, "enum" is not a reserved word.
Reviewers: krasimir, MyDeveloperDay
Reviewed By: MyDeveloperDay
Subscribers: MyDeveloperDay, cfe-commits
Tags: #clang, #clang-tools-extra
Differential Revision: https://reviews.llvm.org/D59629
Patch by: dchai (Donald Chai)
llvm-svn: 356833
Diffstat (limited to 'clang/lib/Format/UnwrappedLineParser.cpp')
| -rw-r--r-- | clang/lib/Format/UnwrappedLineParser.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index 814e8143e17..5c7ab1240c4 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -2018,6 +2018,10 @@ bool UnwrappedLineParser::parseEnum() { FormatTok->isOneOf(tok::colon, tok::question)) return false; + // In protobuf, "enum" can be used as a field name. + if (Style.Language == FormatStyle::LK_Proto && FormatTok->is(tok::equal)) + return false; + // Eat up enum class ... if (FormatTok->Tok.is(tok::kw_class) || FormatTok->Tok.is(tok::kw_struct)) nextToken(); |
