diff options
| author | Krasimir Georgiev <krasimir@google.com> | 2018-06-07 09:46:24 +0000 |
|---|---|---|
| committer | Krasimir Georgiev <krasimir@google.com> | 2018-06-07 09:46:24 +0000 |
| commit | 45dde418a9c4e075934ef124a31f5491a1082421 (patch) | |
| tree | 16887a2a750ea1c65c7a8670e79330aa7e562cc8 /clang/lib/Format | |
| parent | 4281b1d3b57375f30ab77aac45f884e93e30e952 (diff) | |
| download | bcm5719-llvm-45dde418a9c4e075934ef124a31f5491a1082421.tar.gz bcm5719-llvm-45dde418a9c4e075934ef124a31f5491a1082421.zip | |
[clang-format] Consider tok::hashhash in python-style comments
Summary: We were missing the case when python-style comments in text protos start with `##`.
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D47870
llvm-svn: 334179
Diffstat (limited to 'clang/lib/Format')
| -rw-r--r-- | clang/lib/Format/BreakableToken.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/Format/FormatTokenLexer.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Format/BreakableToken.cpp b/clang/lib/Format/BreakableToken.cpp index 933dce35403..f727f8ddf89 100644 --- a/clang/lib/Format/BreakableToken.cpp +++ b/clang/lib/Format/BreakableToken.cpp @@ -44,7 +44,8 @@ static StringRef getLineCommentIndentPrefix(StringRef Comment, const FormatStyle &Style) { static const char *const KnownCStylePrefixes[] = {"///<", "//!<", "///", "//", "//!"}; - static const char *const KnownTextProtoPrefixes[] = {"//", "#"}; + static const char *const KnownTextProtoPrefixes[] = {"//", "#", "##", "###", + "####"}; ArrayRef<const char *> KnownPrefixes(KnownCStylePrefixes); if (Style.Language == FormatStyle::LK_TextProto) KnownPrefixes = KnownTextProtoPrefixes; diff --git a/clang/lib/Format/FormatTokenLexer.cpp b/clang/lib/Format/FormatTokenLexer.cpp index fbd26965a6e..c7f720a443d 100644 --- a/clang/lib/Format/FormatTokenLexer.cpp +++ b/clang/lib/Format/FormatTokenLexer.cpp @@ -334,7 +334,7 @@ void FormatTokenLexer::handleTemplateStrings() { void FormatTokenLexer::tryParsePythonComment() { FormatToken *HashToken = Tokens.back(); - if (HashToken->isNot(tok::hash)) + if (!HashToken->isOneOf(tok::hash, tok::hashhash)) return; // Turn the remainder of this line into a comment. const char *CommentBegin = |
