averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Sema] Maintain the implicitness of call argument tuple/parens in coerceCallArguments

Browse Source 
If any arguments were defaulted the tuple/paren was made implicit, even though
the original tuple/paren was present in the source.

This prevented some sourcekit ASTWalkers from considering them, making
refactorings, documentation info, jump-to-definition and other features
unavailable when queried via their argument labels.

Resolves rdar://problem/62118957
This commit is contained in:
Nathan Hawes
2020-04-21 11:47:12 -07:00
parent 82d73b531b
commit 7c0a17803d
5 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/swift/AST/Expr.h
View File

@@ -4133,9 +4133,9 @@ public:
DefaultArgsOwner(defaultArgsOwner), ParamIndex(paramIndex), Loc(loc),
ContextOrCallerSideExpr(dc) { }
SourceRange getSourceRange() const {
return Loc;
}
SourceRange getSourceRange() const { return {}; }
SourceLoc getArgumentListLoc() const { return Loc; }
ConcreteDeclRef getDefaultArgsOwner() const {
return DefaultArgsOwner;

6
lib/IDE/SyntaxModel.cpp
View File

@@ -547,7 +547,10 @@ std::pair<bool, Expr *> ModelASTWalker::walkToExprPre(Expr *E) {
return {false, E};
auto addCallArgExpr = [&](Expr *Elem, TupleExpr *ParentTupleExpr) {
if (isCurrentCallArgExpr(ParentTupleExpr)) {
if (isa<DefaultArgumentExpr>(Elem) ||
!isCurrentCallArgExpr(ParentTupleExpr))
return;
CharSourceRange NR = parameterNameRangeOfCallArg(ParentTupleExpr, Elem);
SyntaxStructureNode SN;
SN.Kind = SyntaxStructureKind::Argument;
@@ -562,7 +565,6 @@ std::pair<bool, Expr *> ModelASTWalker::walkToExprPre(Expr *E) {
SN.Range = SN.BodyRange;
pushStructureNode(SN, Elem);
}
};
if (auto *ParentTupleExpr = dyn_cast_or_null<TupleExpr>(Parent.getAsExpr())) {

5
lib/Sema/CSApply.cpp
View File

@@ -5759,9 +5759,10 @@ Expr *ExprRewriter::coerceCallArguments(Expr *arg, AnyFunctionType *funcType,
// We already had a ParenExpr, so replace it's sub-expression.
argParen->setSubExpr(newArgs[0]);
} else {
bool isImplicit = arg->isImplicit();
arg = new (ctx)
ParenExpr(lParenLoc, newArgs[0], rParenLoc, hasTrailingClosure);
arg->setImplicit();
arg->setImplicit(isImplicit);
}
} else {
assert(isa<TupleType>(paramType.getPointer()));
@@ -5776,7 +5777,7 @@ Expr *ExprRewriter::coerceCallArguments(Expr *arg, AnyFunctionType *funcType,
// Build a new TupleExpr, re-using source location information.
arg = TupleExpr::create(ctx, lParenLoc, newArgs, newLabels, newLabelLocs,
rParenLoc, hasTrailingClosure,
/*implicit=*/true);
/*implicit=*/arg->isImplicit());
}
}

3
lib/Sema/TypeCheckExpr.cpp
View File

@@ -788,7 +788,8 @@ Expr *CallerSideDefaultArgExprRequest::evaluate(
auto paramTy = defaultExpr->getType();
// Re-create the default argument using the location info of the call site.
auto *initExpr = synthesizeCallerSideDefault(param, defaultExpr->getLoc());
auto *initExpr =
synthesizeCallerSideDefault(param, defaultExpr->getArgumentListLoc());
auto *dc = defaultExpr->ContextOrCallerSideExpr.get<DeclContext *>();
assert(dc && "Expected a DeclContext before type-checking caller-side arg");

12
test/SourceKit/Refactoring/basic.swift
View File

@@ -106,6 +106,13 @@ struct TestDefaultedParen {
TestDefaultedParen.init()
struct HasInitWithDefaultArgs {
init(x: Int = 10, y: Int = 20, z: Int = 10)
}
HasInitWithDefaultArgs(z: 45)
HasInitWithDefaultArgs(y: 45, z: 89)
// RUN: %sourcekitd-test -req=cursor -pos=3:1 -end-pos=5:13 -cursor-action %s -- %s | %FileCheck %s -check-prefix=CHECK1
// CHECK1: ACTIONS BEGIN
@@ -139,6 +146,11 @@ TestDefaultedParen.init()
// RUN: %sourcekitd-test -req=cursor -pos=107:20 -cursor-action %s -- %s | %FileCheck %s -check-prefix=CHECK-NORENAME
// RUN: %sourcekitd-test -req=cursor -pos=113:24 -cursor-action %s -- %s | %FileCheck %s -check-prefix=CHECK-GLOBAL
// RUN: %sourcekitd-test -req=cursor -pos=114:24 -cursor-action %s -- %s | %FileCheck %s -check-prefix=CHECK-GLOBAL
// RUN: %sourcekitd-test -req=cursor -pos=114:31 -cursor-action %s -- %s | %FileCheck %s -check-prefix=CHECK-GLOBAL
// RUN: %sourcekitd-test -req=cursor -pos=114:31 -cursor-action %s -- %s | %FileCheck %s -check-prefix=CHECK-GLOBAL
// RUN: %sourcekitd-test -req=cursor -pos=35:10 -end-pos=35:16 -cursor-action %s -- %s | %FileCheck %s -check-prefix=CHECK-RENAME-EXTRACT
// RUN: %sourcekitd-test -req=cursor -pos=35:10 -end-pos=35:16 -cursor-action %s -- %s | %FileCheck %s -check-prefix=CHECK-RENAME-EXTRACT