diff --git a/clang-tools-extra/clangd/refactor/Rename.h b/clang-tools-extra/clangd/refactor/Rename.h --- a/clang-tools-extra/clangd/refactor/Rename.h +++ b/clang-tools-extra/clangd/refactor/Rename.h @@ -26,6 +26,10 @@ size_t LimitFiles = 50; /// If true, format the rename edits, only meaningful in ClangdServer layer. bool WantFormat = false; + /// Allow rename of virtual method hierarchies. + /// Disable to support broken index implementations with missing relations. + /// FIXME: fix those implementations and remove this option. + bool RenameVirtual = true; }; struct RenameInputs { diff --git a/clang-tools-extra/clangd/refactor/Rename.cpp b/clang-tools-extra/clangd/refactor/Rename.cpp --- a/clang-tools-extra/clangd/refactor/Rename.cpp +++ b/clang-tools-extra/clangd/refactor/Rename.cpp @@ -181,8 +181,15 @@ llvm::Optional renameable(const NamedDecl &RenameDecl, StringRef MainFilePath, - const SymbolIndex *Index) { + const SymbolIndex *Index, + const RenameOptions& Opts) { trace::Span Tracer("Renameable"); + if (!Opts.RenameVirtual) { + if (const auto *S = llvm::dyn_cast(&RenameDecl)) { + if (S->isVirtual()) + return ReasonToReject::UnsupportedSymbol; + } + } // Filter out symbols that are unsupported in both rename modes. if (llvm::isa(&RenameDecl)) return ReasonToReject::UnsupportedSymbol; @@ -746,7 +753,8 @@ if (Invalid) return makeError(std::move(*Invalid)); - auto Reject = renameable(RenameDecl, RInputs.MainFilePath, RInputs.Index); + auto Reject = + renameable(RenameDecl, RInputs.MainFilePath, RInputs.Index, Opts); if (Reject) return makeError(*Reject);