Skip to content

[CodeCompletion] Look through implicit exprs to find the parsed expr #23498

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 23, 2019
Merged

[CodeCompletion] Look through implicit exprs to find the parsed expr #23498

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
4 changes: 2 additions & 2 deletions lib/IDE/ExprContextAnalysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ class ExprFinder : public ASTWalker {
Expr *get() const { return FoundExpr; }

std::pair<bool, Expr *> walkToExprPre(Expr *E) override {
if (TargetRange == E->getSourceRange() && !isa<ImplicitConversionExpr>(E) &&
!isa<AutoClosureExpr>(E) && !isa<ConstructorRefCallExpr>(E)) {
if (TargetRange == E->getSourceRange() && !E->isImplicit() &&
!isa<ConstructorRefCallExpr>(E)) {
assert(!FoundExpr && "non-nullptr for found expr");
FoundExpr = E;
return {false, nullptr};
Expand Down
27 changes: 27 additions & 0 deletions test/IDE/complete_value_expr.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,11 @@
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLOSURE_IN_MEMBERDECLINIT_2 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLOSURE_IN_MEMBERDECLINIT_3 | %FileCheck %s -check-prefix=FOO_OBJECT_DOT

// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_ARRAY_LITERAL_1 | %FileCheck %s -check-prefix=SIMPLE_OBJECT_DOT
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_ARRAY_LITERAL_2 | %FileCheck %s -check-prefix=SIMPLE_OBJECT_DOT
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_DICTIONARY_LITERAL_1 | %FileCheck %s -check-prefix=SIMPLE_OBJECT_DOT
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_DICTIONARY_LITERAL_2 | %FileCheck %s -check-prefix=SIMPLE_OBJECT_DOT

// Test code completion of expressions that produce a value.

struct FooStruct {
Expand Down Expand Up @@ -2143,3 +2148,25 @@ extension String {
obj.#^CLOSURE_IN_MEMBERDECLINIT_3^#
}
}

struct SimpleStruct {
func foo() -> SimpleStruct {}
}
// SIMPLE_OBJECT_DOT: Begin completions
// SIMPLE_OBJECT_DOT-DAG: Keyword[self]/CurrNominal: self[#SimpleStruct#]; name=self
// SIMPLE_OBJECT_DOT-DAG: Decl[InstanceMethod]/CurrNominal{{(/TypeRelation\[Identical\])?}}: foo()[#SimpleStruct#]; name=foo()
// SIMPLE_OBJECT_DOT: End completions
func testInCollectionLiteral(value: SimpleStruct) {
let _ = [
value.#^IN_ARRAY_LITERAL_1^#
]
let _ = [
value.#^IN_ARRAY_LITERAL_2^#,
]
let _: [String: String] = [
value.#^IN_DICTIONARY_LITERAL_1^#
]
let _: [String: String] = [
value.#^IN_DICTIONARY_LITERAL_2^# : "test"
]
}