[PATCH] D40435: [clang-format] Deduplicate using declarations

[Krasimir Georgiev via Phabricator via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL318960: [clang-format] Deduplicate using declarations 
(authored by krasimir).

Repository:
  rL LLVM

https://reviews.llvm.org/D40435

Files:
  cfe/trunk/lib/Format/UsingDeclarationsSorter.cpp
  cfe/trunk/unittests/Format/UsingDeclarationsSorterTest.cpp


Index: cfe/trunk/lib/Format/UsingDeclarationsSorter.cpp
===
--- cfe/trunk/lib/Format/UsingDeclarationsSorter.cpp
+++ cfe/trunk/lib/Format/UsingDeclarationsSorter.cpp
@@ -130,7 +130,27 @@
   UsingDeclarations->begin(), UsingDeclarations->end());
   std::stable_sort(SortedUsingDeclarations.begin(),
SortedUsingDeclarations.end());
+  SortedUsingDeclarations.erase(
+  std::unique(SortedUsingDeclarations.begin(),
+  SortedUsingDeclarations.end(),
+  [](const UsingDeclaration , const UsingDeclaration ) {
+return a.Label == b.Label;
+  }),
+  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: cfe/trunk/unittests/Format/UsingDeclarationsSorterTest.cpp
===
--- cfe/trunk/unittests/Format/UsingDeclarationsSorterTest.cpp
+++ cfe/trunk/unittests/Format/UsingDeclarationsSorterTest.cpp
@@ -142,20 +142,16 @@
 
 TEST_F(UsingDeclarationsSorterTest, SortsStably) {
   EXPECT_EQ("using a;\n"
-"using a;\n"
 "using A;\n"
 "using a;\n"
 "using A;\n"
 "using a;\n"
 "using A;\n"
 "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


Index: cfe/trunk/lib/Format/UsingDeclarationsSorter.cpp
===
--- cfe/trunk/lib/Format/UsingDeclarationsSorter.cpp
+++ cfe/trunk/lib/Format/UsingDeclarationsSorter.cpp
@@ -130,7 +130,27 @@
   UsingDeclarations->begin(), UsingDeclarations->end());
   std::stable_sort(SortedUsingDeclarations.begin(),
SortedUsingDeclarations.end());
+  SortedUsingDeclarations.erase(
+  std::unique(SortedUsingDeclarations.begin(),
+  SortedUsingDeclarations.end(),
+  [](const UsingDeclaration , const UsingDeclaration ) {
+return a.Label == b.Label;
+  }),
+  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 

[PATCH] D40435: [clang-format] Deduplicate using declarations

[Benjamin Kramer via Phabricator via cfe-commits]

bkramer accepted this revision.
bkramer added a comment.
This revision is now accepted and ready to land.

lg


https://reviews.llvm.org/D40435



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D40435: [clang-format] Deduplicate using declarations

[Krasimir Georgiev via Phabricator via cfe-commits]

krasimir updated this revision to Diff 124215.
krasimir added a comment.

- Address review comments


https://reviews.llvm.org/D40435

Files:
  lib/Format/UsingDeclarationsSorter.cpp
  unittests/Format/UsingDeclarationsSorterTest.cpp


Index: unittests/Format/UsingDeclarationsSorterTest.cpp
===
--- unittests/Format/UsingDeclarationsSorterTest.cpp
+++ unittests/Format/UsingDeclarationsSorterTest.cpp
@@ -142,20 +142,16 @@
 
 TEST_F(UsingDeclarationsSorterTest, SortsStably) {
   EXPECT_EQ("using a;\n"
-"using a;\n"
 "using A;\n"
 "using a;\n"
 "using A;\n"
 "using a;\n"
 "using A;\n"
 "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
Index: lib/Format/UsingDeclarationsSorter.cpp
===
--- lib/Format/UsingDeclarationsSorter.cpp
+++ lib/Format/UsingDeclarationsSorter.cpp
@@ -130,7 +130,27 @@
   UsingDeclarations->begin(), UsingDeclarations->end());
   std::stable_sort(SortedUsingDeclarations.begin(),
SortedUsingDeclarations.end());
+  SortedUsingDeclarations.erase(
+  std::unique(SortedUsingDeclarations.begin(),
+  SortedUsingDeclarations.end(),
+  [](const UsingDeclaration , const UsingDeclaration ) {
+return a.Label == b.Label;
+  }),
+  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,20 +142,16 @@
 
 TEST_F(UsingDeclarationsSorterTest, SortsStably) {
   EXPECT_EQ("using a;\n"
-"using a;\n"
 "using A;\n"
 "using a;\n"
 "using A;\n"
 "using a;\n"
 "using A;\n"
 "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

[PATCH] D40435: [clang-format] Deduplicate using declarations

[Benjamin Kramer via Phabricator via cfe-commits]

bkramer added inline comments.



Comment at: lib/Format/UsingDeclarationsSorter.cpp:115
 
+bool usingDeclarationsEqual(const UsingDeclaration ,
+const UsingDeclaration ) {

I'd use a lambda instead.


https://reviews.llvm.org/D40435



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits