added support for the .yml file extension

Author: Sukhmani

clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp

@@ -39,6 +39,9 @@ namespace clang {
 namespace replace {
 
 namespace detail {
+
+static constexpr std::array<StringRef, 3> AllowedExtensions = {".yaml", ".yml", ""};
+
 template <typename TranslationUnits>
 static std::error_code collectReplacementsFromDirectory(
     const llvm::StringRef Directory, TranslationUnits &TUs,
@@ -56,9 +59,9 @@ static std::error_code collectReplacementsFromDirectory(
       continue;
     }
 
-    if (extension(I->path()) != ".yaml")
+     if (!is_contained(AllowedExtensions, extension(I->path())))
       continue;
-
+    
     TUFiles.push_back(I->path());
 
     ErrorOr<std::unique_ptr<MemoryBuffer>> Out =
@@ -268,4 +271,4 @@ bool deleteReplacementFiles(const TUReplacementFiles &Files,
 }
 
 } // end namespace replace
-} // end namespace clang
+} // end namespace clang

clang-tools-extra/clangd/unittests/tweaks/AddUsingTests.cpp

@@ -44,8 +44,7 @@ class cc {
 };
 }
 })cpp";
-
-  EXPECT_AVAILABLE(Header + "void fun() { o^n^e^:^:^t^w^o^:^:^f^f(); }");
+EXPECT_AVAILABLE(Header + "void fun() { o^n^e^:^:^t^w^o^:^:^f^f(); }");
   EXPECT_AVAILABLE(Header + "void fun() { o^n^e^::^o^o(); }");
   EXPECT_AVAILABLE(Header + "void fun() { o^n^e^:^:^t^w^o^:^:^e^e E; }");
   EXPECT_AVAILABLE(Header + "void fun() { o^n^e^:^:^t^w^o:^:^c^c C; }");
@@ -127,24 +126,6 @@ void fun() {
       {
           R"cpp(
 #include "test.hpp"
-namespace {
-void fun() {
-  ::one::t^wo::cc inst;
-}
-})cpp",
-          R"cpp(
-#include "test.hpp"
-namespace {using ::one::two::cc;
-
-void fun() {
-  cc inst;
-}
-})cpp",
-      },
-      // Type, no other using, no namespace.
-      {
-          R"cpp(
-#include "test.hpp"
 
 void fun() {
   one::two::e^e inst;
@@ -311,7 +292,7 @@ void foo::fun() {
 })cpp"},
       // Inside a lambda.
       {
-          R"cpp(
+    R"cpp(
 namespace NS {
 void unrelated();
 void foo();
@@ -321,7 +302,7 @@ auto L = [] {
   using NS::unrelated;
   NS::f^oo();
 };)cpp",
-          R"cpp(
+    R"cpp(
 namespace NS {
 void unrelated();
 void foo();
@@ -331,7 +312,7 @@ auto L = [] {
   using NS::foo;using NS::unrelated;
   foo();
 };)cpp",
-      },
+},
       // If all other using are fully qualified, add ::
       {R"cpp(
 #include "test.hpp"