diff options
Diffstat (limited to 'clang-tools-extra/clangd/refactor')
4 files changed, 8 insertions, 10 deletions
diff --git a/clang-tools-extra/clangd/refactor/Rename.cpp b/clang-tools-extra/clangd/refactor/Rename.cpp index ec4849aa024..3f3c216c590 100644 --- a/clang-tools-extra/clangd/refactor/Rename.cpp +++ b/clang-tools-extra/clangd/refactor/Rename.cpp @@ -397,9 +397,8 @@ llvm::Expected<FileEdits> rename(const RenameInputs &RInputs) { return (*Content)->getBuffer().str(); }; - SourceLocation SourceLocationBeg = - SM.getMacroArgExpandedLocation(getBeginningOfIdentifier( - RInputs.Pos, SM, AST.getASTContext().getLangOpts())); + SourceLocation SourceLocationBeg = SM.getMacroArgExpandedLocation( + getBeginningOfIdentifier(RInputs.Pos, SM, AST.getLangOpts())); // FIXME: Renaming macros is not supported yet, the macro-handling code should // be moved to rename tooling library. if (locateMacroAt(SourceLocationBeg, AST.getPreprocessor())) diff --git a/clang-tools-extra/clangd/refactor/tweaks/DefineOutline.cpp b/clang-tools-extra/clangd/refactor/tweaks/DefineOutline.cpp index 6b44edb8cd7..f6bed9727cf 100644 --- a/clang-tools-extra/clangd/refactor/tweaks/DefineOutline.cpp +++ b/clang-tools-extra/clangd/refactor/tweaks/DefineOutline.cpp @@ -238,7 +238,7 @@ public: // FIXME: We might want to consider moving method definitions below class // definition even if we are inside a source file. if (!isHeaderFile(Sel.AST.getSourceManager().getFilename(Sel.Cursor), - Sel.AST.getASTContext().getLangOpts())) + Sel.AST.getLangOpts())) return false; Source = getSelectedFunction(Sel.ASTSelection.commonAncestor()); @@ -306,9 +306,8 @@ public: // FIXME: We should also get rid of inline qualifier. const tooling::Replacement DeleteFuncBody( Sel.AST.getSourceManager(), - CharSourceRange::getTokenRange( - *toHalfOpenFileRange(SM, Sel.AST.getASTContext().getLangOpts(), - Source->getBody()->getSourceRange())), + CharSourceRange::getTokenRange(*toHalfOpenFileRange( + SM, Sel.AST.getLangOpts(), Source->getBody()->getSourceRange())), ";"); auto HeaderFE = Effect::fileEdit(SM, SM.getMainFileID(), tooling::Replacements(DeleteFuncBody)); diff --git a/clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp b/clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp index 1551f41a131..ce9addb293b 100644 --- a/clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp +++ b/clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp @@ -645,7 +645,7 @@ tooling::Replacement createFunctionDefinition(const NewFunction &ExtractedFunc, bool ExtractFunction::prepare(const Selection &Inputs) { const Node *CommonAnc = Inputs.ASTSelection.commonAncestor(); const SourceManager &SM = Inputs.AST.getSourceManager(); - const LangOptions &LangOpts = Inputs.AST.getASTContext().getLangOpts(); + const LangOptions &LangOpts = Inputs.AST.getLangOpts(); if (auto MaybeExtZone = findExtractionZone(CommonAnc, SM, LangOpts)) { ExtZone = std::move(*MaybeExtZone); return true; @@ -655,7 +655,7 @@ bool ExtractFunction::prepare(const Selection &Inputs) { Expected<Tweak::Effect> ExtractFunction::apply(const Selection &Inputs) { const SourceManager &SM = Inputs.AST.getSourceManager(); - const LangOptions &LangOpts = Inputs.AST.getASTContext().getLangOpts(); + const LangOptions &LangOpts = Inputs.AST.getLangOpts(); auto ExtractedFunc = getExtractedFunction(ExtZone, SM, LangOpts); // FIXME: Add more types of errors. if (!ExtractedFunc) diff --git a/clang-tools-extra/clangd/refactor/tweaks/RawStringLiteral.cpp b/clang-tools-extra/clangd/refactor/tweaks/RawStringLiteral.cpp index 42d0122b338..2d4bf755f64 100644 --- a/clang-tools-extra/clangd/refactor/tweaks/RawStringLiteral.cpp +++ b/clang-tools-extra/clangd/refactor/tweaks/RawStringLiteral.cpp @@ -91,7 +91,7 @@ Expected<Tweak::Effect> RawStringLiteral::apply(const Selection &Inputs) { auto &SM = Inputs.AST.getSourceManager(); auto Reps = tooling::Replacements( tooling::Replacement(SM, Str, ("R\"(" + Str->getBytes() + ")\"").str(), - Inputs.AST.getASTContext().getLangOpts())); + Inputs.AST.getLangOpts())); return Effect::mainFileEdit(SM, std::move(Reps)); } |
