diff options
| author | Martin Probst <martin@probst.io> | 2016-09-02 14:29:48 +0000 |
|---|---|---|
| committer | Martin Probst <martin@probst.io> | 2016-09-02 14:29:48 +0000 |
| commit | a9855afedfe65a797cf98b51171d6bee513e28b9 (patch) | |
| tree | 5e998557921db23bc8b9d3ab079180344ab3181c /clang/lib/Format/TokenAnalyzer.cpp | |
| parent | 6918dcafe8ea256ae1ff0b51a95d4a5d076cd380 (diff) | |
| download | llvm-a9855afedfe65a797cf98b51171d6bee513e28b9.zip llvm-a9855afedfe65a797cf98b51171d6bee513e28b9.tar.gz llvm-a9855afedfe65a797cf98b51171d6bee513e28b9.tar.bz2 | |
clang-format: [JS] merge requoting replacements.
Summary:
When formatting source code that needs both requoting and reindentation,
merge the replacements to avoid erroring out for conflicting replacements.
Also removes the misleading Replacements parameter from the
TokenAnalyzer API.
Reviewers: djasper
Subscribers: klimek, cfe-commits
Differential Revision: https://reviews.llvm.org/D24155
llvm-svn: 280487
Diffstat (limited to 'clang/lib/Format/TokenAnalyzer.cpp')
| -rw-r--r-- | clang/lib/Format/TokenAnalyzer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnalyzer.cpp b/clang/lib/Format/TokenAnalyzer.cpp index 7baba62..d3122ca 100644 --- a/clang/lib/Format/TokenAnalyzer.cpp +++ b/clang/lib/Format/TokenAnalyzer.cpp @@ -107,7 +107,7 @@ tooling::Replacements TokenAnalyzer::process() { } tooling::Replacements RunResult = - analyze(Annotator, AnnotatedLines, Tokens, Result); + analyze(Annotator, AnnotatedLines, Tokens); DEBUG({ llvm::dbgs() << "Replacements for run " << Run << ":\n"; |