forked from OSchip/llvm-project
e151882273
Summary: This patch is a follow-up of https://reviews.llvm.org/rL304687, which fixed an overflow in the comment alignment code in clang-format. The token length of trailing comments of preprocessor directives is calculated incorrectly by including the text between consecutive directives. That causes them to not being aligned. For example, in this code with column limit 20 ``` #if A #else // A int iiii; #endif // B ``` the length of the token `// A` was wrongly calculated as 14 = 5 (the size of `// A\n`) plus 9 (the size of `int iiii;`) and so `// A` wouldn't be aligned with `// B` and this was produced: ``` #if A #else // A int iiii; #endif // B ``` This patch fixes this case. Reviewers: alexfh Reviewed By: alexfh Subscribers: cfe-commits, klimek Differential Revision: https://reviews.llvm.org/D33982 llvm-svn: 304912 |
||
|---|---|---|
| .. | ||
| AffectedRangeManager.cpp | ||
| AffectedRangeManager.h | ||
| BreakableToken.cpp | ||
| BreakableToken.h | ||
| CMakeLists.txt | ||
| ContinuationIndenter.cpp | ||
| ContinuationIndenter.h | ||
| Encoding.h | ||
| Format.cpp | ||
| FormatToken.cpp | ||
| FormatToken.h | ||
| FormatTokenLexer.cpp | ||
| FormatTokenLexer.h | ||
| NamespaceEndCommentsFixer.cpp | ||
| NamespaceEndCommentsFixer.h | ||
| SortJavaScriptImports.cpp | ||
| SortJavaScriptImports.h | ||
| TokenAnalyzer.cpp | ||
| TokenAnalyzer.h | ||
| TokenAnnotator.cpp | ||
| TokenAnnotator.h | ||
| UnwrappedLineFormatter.cpp | ||
| UnwrappedLineFormatter.h | ||
| UnwrappedLineParser.cpp | ||
| UnwrappedLineParser.h | ||
| WhitespaceManager.cpp | ||
| WhitespaceManager.h | ||