Index: lib/Format/UsingDeclarationsSorter.cpp =================================================================== --- lib/Format/UsingDeclarationsSorter.cpp +++ lib/Format/UsingDeclarationsSorter.cpp @@ -112,6 +112,11 @@ return ""; } +bool usingDeclarationsEqual(const UsingDeclaration &a, + const UsingDeclaration &b) { + return a.Label == b.Label; +} + void endUsingDeclarationBlock( SmallVectorImpl *UsingDeclarations, const SourceManager &SourceMgr, tooling::Replacements *Fixes) { @@ -130,7 +135,24 @@ UsingDeclarations->begin(), UsingDeclarations->end()); std::stable_sort(SortedUsingDeclarations.begin(), SortedUsingDeclarations.end()); + SortedUsingDeclarations.erase(std::unique(SortedUsingDeclarations.begin(), + SortedUsingDeclarations.end(), + usingDeclarationsEqual), + SortedUsingDeclarations.end()); for (size_t I = 0, E = UsingDeclarations->size(); I < E; ++I) { + if (I >= SortedUsingDeclarations.size()) { + // This using declaration has been deduplicated, delete it. + auto Begin = + (*UsingDeclarations)[I].Line->First->WhitespaceRange.getBegin(); + auto End = (*UsingDeclarations)[I].Line->Last->Tok.getEndLoc(); + auto Range = CharSourceRange::getCharRange(Begin, End); + auto Err = Fixes->add(tooling::Replacement(SourceMgr, Range, "")); + if (Err) { + llvm::errs() << "Error while sorting using declarations: " + << llvm::toString(std::move(Err)) << "\n"; + } + continue; + } if ((*UsingDeclarations)[I].Line == SortedUsingDeclarations[I].Line) continue; auto Begin = (*UsingDeclarations)[I].Line->First->Tok.getLocation(); Index: unittests/Format/UsingDeclarationsSorterTest.cpp =================================================================== --- unittests/Format/UsingDeclarationsSorterTest.cpp +++ unittests/Format/UsingDeclarationsSorterTest.cpp @@ -142,7 +142,6 @@ TEST_F(UsingDeclarationsSorterTest, SortsStably) { EXPECT_EQ("using a;\n" - "using a;\n" "using A;\n" "using a;\n" "using A;\n" @@ -151,11 +150,8 @@ "using a;\n" "using B;\n" "using b;\n" - "using b;\n" "using B;\n" "using b;\n" - "using b;\n" - "using b;\n" "using B;\n" "using b;", sortUsingDeclarations("using a;\n" @@ -355,6 +351,25 @@ "/* comment */ using a;")); } +TEST_F(UsingDeclarationsSorterTest, DeduplicatesUsingDeclarations) { + EXPECT_EQ("using a;\n" + "using b;\n" + "using c;\n" + "\n" + "using a;\n" + "using e;", + sortUsingDeclarations("using c;\n" + "using a;\n" + "using b;\n" + "using a;\n" + "using b;\n" + "\n" + "using e;\n" + "using a;\n" + "using e;")); + +} + } // end namespace } // end namespace format } // end namespace clang