Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-12-14 03:29:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[clangd] Delete default arguments while moving functions out-of-line

Browse Source 
Summary:
Only function declarations should have the default arguments.

This patch makes sure we don't propogate those arguments to out-of-line
definitions.

Fixes https://github.com/clangd/clangd/issues/221

Reviewers: hokein

Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, usaxena95, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D71187
This commit is contained in:
Kadir Cetinkaya 2019-12-09 10:38:36 +01:00
parent fc3417cb5a
commit 898d7a0695
No known key found for this signature in database
GPG Key ID: E39E36B8D2057ED6
2 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
clang-tools-extra/clangd/refactor/tweaks/DefineOutline.cpp
View File

@ -10,6 +10,7 @@
#include "FindTarget.h"
#include "HeaderSourceSwitch.h"
#include "Logger.h"
#include "ParsedAST.h"
#include "Path.h"
#include "Selection.h"
#include "SourceCode.h"
@ -21,11 +22,15 @@
#include "clang/AST/Stmt.h"
#include "clang/Basic/SourceLocation.h"
#include "clang/Basic/SourceManager.h"
#include "clang/Basic/TokenKinds.h"
#include "clang/Driver/Types.h"
#include "clang/Format/Format.h"
#include "clang/Lex/Lexer.h"
#include "clang/Tooling/Core/Replacement.h"
#include "clang/Tooling/Syntax/Tokens.h"
#include "llvm/ADT/None.h"
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Casting.h"
#include "llvm/Support/Error.h"
@ -133,12 +138,14 @@ getFunctionSourceAfterReplacements(const FunctionDecl *FD,
// Creates a modified version of function definition that can be inserted at a
// different location, qualifies return value and function name to achieve that.
// Contains function signature, body and template parameters if applicable.
// No need to qualify parameters, as they are looked up in the context
// containing the function/method.
// Contains function signature, except defaulted parameter arguments, body and
// template parameters if applicable. No need to qualify parameters, as they are
// looked up in the context containing the function/method.
llvm::Expected<std::string>
getFunctionSourceCode(const FunctionDecl *FD, llvm::StringRef TargetNamespace) {
auto &SM = FD->getASTContext().getSourceManager();
getFunctionSourceCode(const FunctionDecl *FD, llvm::StringRef TargetNamespace,
const syntax::TokenBuffer &TokBuf) {
auto &AST = FD->getASTContext();
auto &SM = AST.getSourceManager();
auto TargetContext = findContextForNS(TargetNamespace, FD->getDeclContext());
if (!TargetContext)
return llvm::createStringError(
@ -169,14 +176,38 @@ getFunctionSourceCode(const FunctionDecl *FD, llvm::StringRef TargetNamespace) {
}
}
const NamedDecl *ND = Ref.Targets.front();
const std::string Qualifier =
getQualification(FD->getASTContext(), *TargetContext,
SM.getLocForStartOfFile(SM.getMainFileID()), ND);
const std::string Qualifier = getQualification(
AST, *TargetContext, SM.getLocForStartOfFile(SM.getMainFileID()), ND);
if (auto Err = QualifierInsertions.add(
tooling::Replacement(SM, Ref.NameLoc, 0, Qualifier)))
Errors = llvm::joinErrors(std::move(Errors), std::move(Err));
});
// 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.
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 =
QualifierInsertions.add(tooling::Replacement(SM, DelRange, "")))
Errors = llvm::joinErrors(std::move(Errors), std::move(Err));
}
}
if (Errors)
return std::move(Errors);
return getFunctionSourceAfterReplacements(FD, QualifierInsertions);
@ -290,8 +321,8 @@ public:
if (!InsertionPoint)
return InsertionPoint.takeError();
auto FuncDef =
getFunctionSourceCode(Source, InsertionPoint->EnclosingNamespace);
auto FuncDef = getFunctionSourceCode(
Source, InsertionPoint->EnclosingNamespace, Sel.AST.getTokens());
if (!FuncDef)
return FuncDef.takeError();

6
clang-tools-extra/clangd/unittests/TweakTests.cpp
View File

@ -1973,6 +1973,12 @@ TEST_F(DefineOutlineTest, ApplyTest) {
template <> void foo<int>() ;)cpp",
"template <> void foo<int>() { 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) ) {}",
},
};
for (const auto &Case : Cases) {
SCOPED_TRACE(Case.Test);