Skip to content

[CodeCompletion] Infer keypath root type from the context type #23542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 26, 2019
Merged

[CodeCompletion] Infer keypath root type from the context type #23542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions lib/IDE/CodeCompletion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5004,19 +5004,30 @@ void CodeCompletionCallbacksImpl::doneParsing() {
bool OnRoot = !KPE->getComponents().front().isValid();
Lookup.setIsSwiftKeyPathExpr(OnRoot);

auto ParsedType = BGT->getGenericArgs()[1];
auto Components = KPE->getComponents();
if (Components.back().getKind() ==
KeyPathExpr::Component::Kind::OptionalWrap) {
Type baseType = BGT->getGenericArgs()[OnRoot ? 0 : 1];
if (OnRoot && baseType->is<UnresolvedType>()) {
// Infer the root type of the keypath from the context type.
ExprContextInfo ContextInfo(CurDeclContext, ParsedExpr);
for (auto T : ContextInfo.getPossibleTypes()) {
if (auto unwrapped = T->getOptionalObjectType())
T = unwrapped;
if (!T->getAnyNominal() || !T->getAnyNominal()->getKeyPathTypeKind() ||
T->hasUnresolvedType() || !T->is<BoundGenericType>())
continue;
// Use the first KeyPath context type found.
baseType = T->castTo<BoundGenericType>()->getGenericArgs()[0];
break;
}
}
if (!OnRoot && KPE->getComponents().back().getKind() ==
KeyPathExpr::Component::Kind::OptionalWrap) {
// KeyPath expr with '?' (e.g. '\Ty.[0].prop?.another').
// Althogh expected type is optional, we should unwrap it because it's
// unwrapped.
ParsedType = ParsedType->getOptionalObjectType();
baseType = baseType->getOptionalObjectType();
}

// The second generic type argument of KeyPath<Root, Value> should be
// the value we pull code completion results from.
Lookup.getValueExprCompletions(ParsedType);
Lookup.getValueExprCompletions(baseType);
break;
}

Expand Down
26 changes: 19 additions & 7 deletions test/IDE/complete_swift_key_path.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EMPTY_2 | %FileCheck %s -check-prefix=INVALID

// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONTEXT_BASEONLY | %FileCheck %s -check-prefix=PERSONTYPE-DOT
// FIXME: RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONTEXT_EXPLICIT | %FileCheck %s -check-prefix=INVALID
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONTEXT_EXPLICIT | %FileCheck %s -check-prefix=PERSONTYPE-DOT
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONTEXT_GENERIC_RESULT | %FileCheck %s -check-prefix=PERSONTYPE-DOT
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONTEXT_GENERIC_RESULT_OPTIONAL | %FileCheck %s -check-prefix=PERSONTYPE-DOT

class Person {
var name: String
Expand Down Expand Up @@ -131,9 +133,19 @@ let _ = \.#^EMPTY_1^#
let _ = \.friends.#^EMPTY_2^#
// INVALID-NOT: Begin completions

let _: PartialKeyPath<Person> = \.#^CONTEXT_BASEONLY^#
// Same as TYPE_DOT.

let _: KeyPath<Person, String> = \.#^CONTEXT_EXPLICIT^#
// FIXME: Currently, it's suggest nothing. Since we know the base type is
// 'Person', we should suggest at least '.name'.
func recvPartialKP(_ kp: PartialKeyPath<Person>) {
recvPartialKP(\.#^CONTEXT_BASEONLY^#)
// Same as TYPE_DOT.
}
func recvExplicitKP(_ kp: KeyPath<Person, String>) {
recvExplicitKP(\.#^CONTEXT_EXPLICIT^#)
// Same as TYPE_DOT.
}
func recvExplicitKPWithGenericResult<Result>(_ kp: KeyPath<Person, Result>) {
recvExplicitKPWithGenericResult(\.#^CONTEXT_GENERIC_RESULT^#)
// Same as TYPE_DOT.
}
func recvExplicitKPWithGenericResultOpt<Result>(_ kp: KeyPath<Person, Result>?) {
recvExplicitKPWithGenericResult(\.#^CONTEXT_GENERIC_RESULT_OPTIONAL^#
// Same as TYPE_DOT.
}