diff options
| author | Krasimir Georgiev <krasimir@google.com> | 2017-04-21 14:35:20 +0000 |
|---|---|---|
| committer | Krasimir Georgiev <krasimir@google.com> | 2017-04-21 14:35:20 +0000 |
| commit | bcda54b69d4b6abe75c4c18f155433bfee216d72 (patch) | |
| tree | 0abb4eb7e03f4f26234516d45b715a70711896ec /clang/lib/Format/UnwrappedLineFormatter.cpp | |
| parent | d631b9e500e1cdfba439ea1b05ffbf2f44a11e1b (diff) | |
| download | bcm5719-llvm-bcda54b69d4b6abe75c4c18f155433bfee216d72.tar.gz bcm5719-llvm-bcda54b69d4b6abe75c4c18f155433bfee216d72.zip | |
[clang-format] Replace IncompleteFormat by a struct with Line
Summary: This patch replaces the boolean IncompleteFormat that is used to notify the client if an unrecoverable syntax error occurred by a struct that also contains a line number.
Reviewers: djasper
Reviewed By: djasper
Subscribers: cfe-commits, klimek
Differential Revision: https://reviews.llvm.org/D32298
llvm-svn: 300985
Diffstat (limited to 'clang/lib/Format/UnwrappedLineFormatter.cpp')
| -rw-r--r-- | clang/lib/Format/UnwrappedLineFormatter.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/clang/lib/Format/UnwrappedLineFormatter.cpp b/clang/lib/Format/UnwrappedLineFormatter.cpp index c3c154afeb8..8ff893426e2 100644 --- a/clang/lib/Format/UnwrappedLineFormatter.cpp +++ b/clang/lib/Format/UnwrappedLineFormatter.cpp @@ -835,8 +835,11 @@ UnwrappedLineFormatter::format(const SmallVectorImpl<AnnotatedLine *> &Lines, bool ShouldFormat = TheLine.Affected || FixIndentation; // We cannot format this line; if the reason is that the line had a // parsing error, remember that. - if (ShouldFormat && TheLine.Type == LT_Invalid && IncompleteFormat) - *IncompleteFormat = true; + if (ShouldFormat && TheLine.Type == LT_Invalid && Status) { + Status->FormatComplete = false; + Status->Line = + SourceMgr.getSpellingLineNumber(TheLine.First->Tok.getLocation()); + } if (ShouldFormat && TheLine.Type != LT_Invalid) { if (!DryRun) |
