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/SortJavaScriptImports.cpp | |
| parent | 6918dcafe8ea256ae1ff0b51a95d4a5d076cd380 (diff) | |
| download | bcm5719-llvm-a9855afedfe65a797cf98b51171d6bee513e28b9.tar.gz bcm5719-llvm-a9855afedfe65a797cf98b51171d6bee513e28b9.zip | |
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/SortJavaScriptImports.cpp')
| -rw-r--r-- | clang/lib/Format/SortJavaScriptImports.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/clang/lib/Format/SortJavaScriptImports.cpp b/clang/lib/Format/SortJavaScriptImports.cpp index 2a90e9ab760..42089c522ec 100644 --- a/clang/lib/Format/SortJavaScriptImports.cpp +++ b/clang/lib/Format/SortJavaScriptImports.cpp @@ -127,7 +127,7 @@ public: tooling::Replacements analyze(TokenAnnotator &Annotator, SmallVectorImpl<AnnotatedLine *> &AnnotatedLines, - FormatTokenLexer &Tokens, tooling::Replacements &) override { + FormatTokenLexer &Tokens) override { tooling::Replacements Result; AffectedRangeMgr.computeAffectedLines(AnnotatedLines.begin(), AnnotatedLines.end()); @@ -282,7 +282,6 @@ private: SmallVectorImpl<AnnotatedLine *> &AnnotatedLines) { SmallVector<JsModuleReference, 16> References; SourceLocation Start; - bool FoundLines = false; AnnotatedLine *FirstNonImportLine = nullptr; bool AnyImportAffected = false; for (auto Line : AnnotatedLines) { @@ -296,7 +295,6 @@ private: Start = Line->First->Tok.getLocation(); if (!Current) continue; // Only comments on this line. - FoundLines = true; JsModuleReference Reference; Reference.Range.setBegin(Start); if (!parseModuleReference(Keywords, Reference)) { |
