[clangd] Handle initializers that contain =

[sammccall]

clang-tools-extra/clangd/refactor/tweaks/DefineOutline.cpp

192

nit: usually excluding the =

clang-tools-extra/clangd/refactor/tweaks/DefineOutline.cpp

findExplicitReferences(
                 tooling::Replacement(SM, Ref.NameLoc, 0, Qualifier)))
           Errors = llvm::joinErrors(std::move(Errors), std::move(Err));
       },
       Resolver);
 
   // Get rid of default arguments, since they should not be specified in
   // out-of-line definition.
   for (const auto *PVD : FD->parameters()) {
-    if (PVD->hasDefaultArg()) {
-      // Deletion range initially spans the initializer, excluding the `=`.
-      auto DelRange = CharSourceRange::getTokenRange(PVD->getDefaultArgRange());
-      // Get all tokens before the default argument.
-      auto Tokens = TokBuf.expandedTokens(PVD->getSourceRange())
-                        .take_while([&SM, &DelRange](const syntax::Token &Tok) {
-                          return SM.isBeforeInTranslationUnit(
-                              Tok.location(), DelRange.getBegin());
-                        });
-      // Find the last `=` before the default arg.
+    if (!PVD->hasDefaultArg())
+      continue;
+    // Deletion range spans the initializer, usually excluding the `=`.
+    if (TokBuf.expandedTokens(DelRange.getAsRange()).front().kind() !=
+        tok::equal) {
+      // Find the last `=` if it isn't included in the initializer, and update
+      // the DelRange to include it.
       auto Tok =
           llvm::find_if(llvm::reverse(Tokens), [](const syntax::Token &Tok) {
             return Tok.kind() == tok::equal;
           });
       assert(Tok != Tokens.rend());
       DelRange.setBegin(Tok->location());
-      if (auto Err =
-              DeclarationCleanups.add(tooling::Replacement(SM, DelRange, "")))
-        Errors = llvm::joinErrors(std::move(Errors), std::move(Err));
-    }
-  }
+    }
 
   auto DelAttr = [&](const Attr *A) {
     if (!A)
       return;
     auto AttrTokens =
         TokBuf.spelledForExpanded(TokBuf.expandedTokens(A->getRange()));
     assert(A->getLocation().isValid());
     if (!AttrTokens || AttrTokens->empty()) {

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

llvm::StringRef ExpectedSource;
           "void foo() { return; }",
       },
       // Default args.
       {
           "void fo^o(int x, int y = 5, int = 2, int (*foo)(int) = nullptr) {}",
           "void foo(int x, int y = 5, int = 2, int (*foo)(int) = nullptr) ;",
           "void foo(int x, int y , int , int (*foo)(int) ) {}",
       },
+      {
+          "struct Bar{Bar();}; void fo^o(Bar x = {}) {}",
+          "struct Bar{Bar();}; void foo(Bar x = {}) ;",
+          "void foo(Bar x ) {}",
+      },
       // Constructors
       {
           R"cpp(
             class Foo {public: Foo(); Foo(int);};
             class Bar {
               Ba^r() {}
               Bar(int x) : f1(x) {}
               Foo f1;