llvm-project/clang/lib/Format
Krasimir Georgiev 06451fa1a2 [clang-format] Fix comment levels between '}' and PPDirective
Summary:
This fixes a regression exposed by r307795 in which the level of a comment line
between '}' and a preprocessor directive is incorrectly set as the level of the
line before the '}'. In effect, this:
```
int f(int i) {
  int j = i;
  return i + j;
}
// comment

#ifdef A
#endif
```
was formatted as:
```
int f(int i) {
  int j = i;
  return i + j;
}
  // comment

#ifdef A
#endif
```

Reviewers: djasper

Reviewed By: djasper

Subscribers: cfe-commits, klimek

Differential Revision: https://reviews.llvm.org/D35485

llvm-svn: 308725
2017-07-21 10:26:13 +00:00
..
AffectedRangeManager.cpp Added Fixer implementation and fix() interface in clang-format for removing redundant code. 2016-04-25 15:09:22 +00:00
AffectedRangeManager.h removed redundant '#' 2016-04-28 07:52:06 +00:00
BreakableToken.cpp [clang-format] Put '/**' and '*/' on own lines in multiline jsdocs 2017-07-20 22:29:39 +00:00
BreakableToken.h [clang-format] Put '/**' and '*/' on own lines in multiline jsdocs 2017-07-20 22:29:39 +00:00
CMakeLists.txt [clang-format] Support sorting using declarations 2017-06-21 12:03:12 +00:00
ContinuationIndenter.cpp [clang-format] Put '/**' and '*/' on own lines in multiline jsdocs 2017-07-20 22:29:39 +00:00
ContinuationIndenter.h [clang-format] Refactor WhitespaceManager and friends 2017-01-31 11:25:01 +00:00
Encoding.h [Format] Remove dead code. 2016-12-19 21:10:50 +00:00
Format.cpp [clang-format] Support text proto messages 2017-07-03 15:05:14 +00:00
FormatToken.cpp clang-format: Fix bug in handling of single-column lists. 2016-12-21 17:02:06 +00:00
FormatToken.h clang-format: [JS] do not wrap after "readonly". 2017-07-07 13:17:10 +00:00
FormatTokenLexer.cpp clang-format: [JS] exponentiation operator 2017-05-04 15:04:04 +00:00
FormatTokenLexer.h [clang-format] Handle NSString literals by merging tokens. 2017-04-11 09:55:00 +00:00
NamespaceEndCommentsFixer.cpp [clang-format] Fix a clang-tidy warning, NFC 2017-06-27 14:07:45 +00:00
NamespaceEndCommentsFixer.h [clang-format] Add a NamespaceEndCommentsFixer 2017-02-27 13:28:36 +00:00
SortJavaScriptImports.cpp Use after move bug fixes 2016-12-23 11:40:44 +00:00
SortJavaScriptImports.h clang-format: [JS] sort ES6 imports. 2016-05-20 11:24:24 +00:00
TokenAnalyzer.cpp Don't copy replacements in for-range loop. NFC. 2016-10-19 13:50:17 +00:00
TokenAnalyzer.h [Format] Remove dead code. 2016-12-19 21:10:50 +00:00
TokenAnnotator.cpp Fix dereference of pointers in throw statements. 2017-07-17 15:27:53 +00:00
TokenAnnotator.h [clang-format] Add a NamespaceEndCommentsFixer 2017-02-27 13:28:36 +00:00
UnwrappedLineFormatter.cpp clang-format: add options to merge empty record body 2017-06-30 20:25:55 +00:00
UnwrappedLineFormatter.h [clang-format] Replace IncompleteFormat by a struct with Line 2017-04-21 14:35:20 +00:00
UnwrappedLineParser.cpp [clang-format] Fix comment levels between '}' and PPDirective 2017-07-21 10:26:13 +00:00
UnwrappedLineParser.h [clang-format] Support <>-style proto message fields 2017-06-27 13:43:07 +00:00
UsingDeclarationsSorter.cpp [clang-format] Support sorting using declarations 2017-06-21 12:03:12 +00:00
UsingDeclarationsSorter.h [clang-format] Support sorting using declarations 2017-06-21 12:03:12 +00:00
WhitespaceManager.cpp [clang-format] Fix alignment of preprocessor trailing comments 2017-06-07 14:05:06 +00:00
WhitespaceManager.h [clang-format] Document the StartOfTokenColumn parameter, NFC 2017-06-13 14:58:55 +00:00