mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
278ecef284
To compute the expected type of a call pattern (which is the return type of the function if that call pattern is being used), we called `getTypeForCompletion` for the entire call, in the same way that we do for the code completion token. However, this pattern does not generally work. For the code completion token it worked because the code completion expression doesn’t have an inherent type and it inherits the type solely from its context. Calls, however, have an inherent return type and that type gets assigned as the `typeForCompletion`. Implement targeted checks for the two most common cases where an expected type exists: If the call that we suggest call patterns for is itself an argument to another function or if it is used in a place that has a contextual type in the constraint system (eg. a variable binding or a `return` statement). This means that we no longer return `Convertible` for call patterns in some more complex scenarios. But given that this information was computed based on incorrect results and that in those cases all call patterns had a `Convertible` type relation, I think that’s acceptable. Fixing this would require recording more information in the constraints system, which is out-of-scope for now.
155 lines
9.8 KiB
Swift
155 lines
9.8 KiB
Swift
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=METATYPE_UNRESOLVED | %FileCheck %s -check-prefix=METATYPE_UNRESOLVED
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=METATYPE_UNRESOLVED_BRACKET | %FileCheck %s -check-prefix=METATYPE_UNRESOLVED_BRACKET
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=METATYPE_INT | %FileCheck %s -check-prefix=METATYPE_INT
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=METATYPE_INT_BRACKET | %FileCheck %s -check-prefix=METATYPE_INT_BRACKET
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSTANCE_INT | %FileCheck %s -check-prefix=INSTANCE_INT
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSTANCE_INT_BRACKET | %FileCheck %s -check-prefix=INSTANCE_INT_BRACKET
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=METATYPE_ARCHETYPE | %FileCheck %s -check-prefix=METATYPE_ARCHETYPE
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=METATYPE_ARCHETYPE_BRACKET | %FileCheck %s -check-prefix=METATYPE_ARCHETYPE_BRACKET
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSTANCE_ARCHETYPE | %FileCheck %s -check-prefix=INSTANCE_ARCHETYPE
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSTANCE_ARCHETYPE_BRACKET | %FileCheck %s -check-prefix=INSTANCE_ARCHETYPE_BRACKET
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=METATYPE_LABEL | %FileCheck %s -check-prefix=METATYPE_LABEL
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSTANCE_LABEL | %FileCheck %s -check-prefix=INSTANCE_LABEL
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SELF_IN_INSTANCEMETHOD | %FileCheck %s -check-prefix=SELF_IN_INSTANCEMETHOD
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SUPER_IN_INSTANCEMETHOD | %FileCheck %s -check-prefix=SUPER_IN_INSTANCEMETHOD
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SELF_IN_STATICMETHOD | %FileCheck %s -check-prefix=SELF_IN_STATICMETHOD
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SUPER_IN_STATICMETHOD | %FileCheck %s -check-prefix=SUPER_IN_STATICMETHOD
|
|
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LABELED_SUBSCRIPT | %FileCheck %s -check-prefix=LABELED_SUBSCRIPT
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TUPLE | %FileCheck %s -check-prefix=TUPLE
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SETTABLE_SUBSCRIPT | %FileCheck %s -check-prefix=SETTABLE_SUBSCRIPT
|
|
|
|
struct MyStruct<T> {
|
|
static subscript(x: Int, static defValue: T) -> MyStruct<T> {
|
|
fatalError()
|
|
}
|
|
subscript(x: Int, instance defValue: T) -> Int {
|
|
fatalError()
|
|
}
|
|
}
|
|
|
|
func test1() {
|
|
let _ = MyStruct #^METATYPE_UNRESOLVED^#
|
|
// METATYPE_UNRESOLVED: Begin completions, 4 items
|
|
// METATYPE_UNRESOLVED-DAG: Decl[Subscript]/CurrNominal: [{#(x): Int#}, {#static: _#}][#MyStruct<_>#];
|
|
// METATYPE_UNRESOLVED-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ()[#MyStruct<_>#];
|
|
// METATYPE_UNRESOLVED-DAG: Keyword[self]/CurrNominal: .self[#MyStruct<_>.Type#];
|
|
// METATYPE_UNRESOLVED-DAG: Keyword/CurrNominal: .Type[#MyStruct<_>.Type#];
|
|
|
|
let _ = MyStruct[#^METATYPE_UNRESOLVED_BRACKET^#
|
|
// METATYPE_UNRESOLVED_BRACKET-DAG: Decl[Subscript]/CurrNominal/Flair[ArgLabels]: ['[']{#(x): Int#}, {#static: T#}[']'][#MyStruct<T>#];
|
|
|
|
let _ = MyStruct<Int> #^METATYPE_INT^#
|
|
// METATYPE_INT: Begin completions, 4 items
|
|
// METATYPE_INT-DAG: Decl[Subscript]/CurrNominal: [{#(x): Int#}, {#static: Int#}][#MyStruct<Int>#];
|
|
// METATYPE_INT-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ()[#MyStruct<Int>#];
|
|
// METATYPE_INT-DAG: Keyword[self]/CurrNominal: .self[#MyStruct<Int>.Type#];
|
|
// METATYPE_INT-DAG: Keyword/CurrNominal: .Type[#MyStruct<Int>.Type#];
|
|
|
|
let _ = MyStruct<Int>[#^METATYPE_INT_BRACKET^#
|
|
// METATYPE_INT_BRACKET-DAG: Decl[Subscript]/CurrNominal/Flair[ArgLabels]: ['[']{#(x): Int#}, {#static: Int#}[']'][#MyStruct<Int>#];
|
|
|
|
let _ = MyStruct<Int>()#^INSTANCE_INT^#
|
|
// INSTANCE_INT: Begin completions, 2 items
|
|
// INSTANCE_INT-DAG: Decl[Subscript]/CurrNominal: [{#(x): Int#}, {#instance: Int#}][#Int#];
|
|
// INSTANCE_INT-DAG: Keyword[self]/CurrNominal: .self[#MyStruct<Int>#];
|
|
|
|
let _ = MyStruct<Int>()[#^INSTANCE_INT_BRACKET^#
|
|
// INSTANCE_INT_BRACKET-DAG: Decl[Subscript]/CurrNominal/Flair[ArgLabels]: ['[']{#(x): Int#}, {#instance: Int#}[']'][#Int#];
|
|
// INSTANCE_INT_BRACKET-DAG: Pattern/CurrNominal/Flair[ArgLabels]: ['[']{#keyPath: KeyPath<MyStruct<Int>, Value>#}[']'][#Value#];
|
|
}
|
|
func test2<U>(value: MyStruct<U>) {
|
|
let _ = MyStruct<U>#^METATYPE_ARCHETYPE^#
|
|
// METATYPE_ARCHETYPE: Begin completions, 4 items
|
|
// METATYPE_ARCHETYPE-DAG: Decl[Subscript]/CurrNominal: [{#(x): Int#}, {#static: U#}][#MyStruct<U>#];
|
|
// METATYPE_ARCHETYPE-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ()[#MyStruct<U>#];
|
|
// METATYPE_ARCHETYPE-DAG: Keyword[self]/CurrNominal: .self[#MyStruct<U>.Type#];
|
|
// METATYPE_ARCHETYPE-DAG: Keyword/CurrNominal: .Type[#MyStruct<U>.Type#];
|
|
|
|
let _ = MyStruct<U>[#^METATYPE_ARCHETYPE_BRACKET^#
|
|
// METATYPE_ARCHETYPE_BRACKET-DAG: Decl[Subscript]/CurrNominal/Flair[ArgLabels]: ['[']{#(x): Int#}, {#static: U#}[']'][#MyStruct<U>#];
|
|
|
|
let _ = value #^INSTANCE_ARCHETYPE^#
|
|
// INSTANCE_ARCHETYPE: Begin completions, 2 items
|
|
// INSTANCE_ARCHETYPE-DAG: Decl[Subscript]/CurrNominal: [{#(x): Int#}, {#instance: U#}][#Int#];
|
|
// INSTANCE_ARCHETYPE-DAG: Keyword[self]/CurrNominal: .self[#MyStruct<U>#];
|
|
|
|
let _ = value[#^INSTANCE_ARCHETYPE_BRACKET^#
|
|
// INSTANCE_ARCHETYPE_BRACKET-DAG: Decl[Subscript]/CurrNominal/Flair[ArgLabels]: ['[']{#(x): Int#}, {#instance: U#}[']'][#Int#];
|
|
// INSTANCE_ARCHETYPE_BRACKET-DAG: Pattern/CurrNominal/Flair[ArgLabels]: ['[']{#keyPath: KeyPath<MyStruct<U>, Value>#}[']'][#Value#];
|
|
|
|
let _ = MyStruct<U>[42, #^METATYPE_LABEL^#
|
|
// METATYPE_LABEL: Begin completions, 1 items
|
|
// METATYPE_LABEL-DAG: Pattern/Local/Flair[ArgLabels]: {#static: U#}[#U#];
|
|
|
|
let _ = value[42, #^INSTANCE_LABEL^#
|
|
// INSTANCE_LABEL: Begin completions, 1 items
|
|
// INSTANCE_LABEL-DAG: Pattern/Local/Flair[ArgLabels]: {#instance: U#}[#U#];
|
|
}
|
|
|
|
class Base {
|
|
static subscript(static x: Int) -> Int { return 1 }
|
|
subscript(instance x: Int) -> Int { return 1 }
|
|
}
|
|
class Derived: Base {
|
|
static subscript(derivedStatic x: Int) -> Int { return 1 }
|
|
subscript(derivedInstance x: Int) -> Int { return 1 }
|
|
|
|
func testInstance() {
|
|
let _ = self[#^SELF_IN_INSTANCEMETHOD^#]
|
|
// SELF_IN_INSTANCEMETHOD: Begin completions, 3 items
|
|
// SELF_IN_INSTANCEMETHOD-DAG: Decl[Subscript]/CurrNominal/Flair[ArgLabels]: ['[']{#derivedInstance: Int#}[']'][#Int#];
|
|
// SELF_IN_INSTANCEMETHOD-DAG: Decl[Subscript]/Super/Flair[ArgLabels]: ['[']{#instance: Int#}[']'][#Int#];
|
|
// SELF_IN_INSTANCEMETHOD-DAG: Pattern/CurrNominal/Flair[ArgLabels]: ['[']{#keyPath: KeyPath<Derived, Value>#}[']'][#Value#];
|
|
|
|
let _ = super[#^SUPER_IN_INSTANCEMETHOD^#]
|
|
// SUPER_IN_INSTANCEMETHOD: Begin completions, 2 items
|
|
// SUPER_IN_INSTANCEMETHOD-DAG: Decl[Subscript]/CurrNominal/Flair[ArgLabels]: ['[']{#instance: Int#}[']'][#Int#];
|
|
// SUPER_IN_INSTANCEMETHOD-DAG: Pattern/CurrNominal/Flair[ArgLabels]: ['[']{#keyPath: KeyPath<Base, Value>#}[']'][#Value#];
|
|
}
|
|
|
|
static func testStatic() {
|
|
let _ = self[#^SELF_IN_STATICMETHOD^#]
|
|
// SELF_IN_STATICMETHOD: Begin completions, 3 items
|
|
// SELF_IN_STATICMETHOD-DAG: Decl[Subscript]/CurrNominal/Flair[ArgLabels]: ['[']{#derivedStatic: Int#}[']'][#Int#];
|
|
// SELF_IN_STATICMETHOD-DAG: Decl[Subscript]/Super/Flair[ArgLabels]: ['[']{#static: Int#}[']'][#Int#];
|
|
// SELF_IN_STATICMETHOD-DAG: Pattern/CurrNominal/Flair[ArgLabels]: ['[']{#keyPath: KeyPath<Derived.Type, Value>#}[']'][#Value#];
|
|
|
|
let _ = super[#^SUPER_IN_STATICMETHOD^#]
|
|
// SUPER_IN_STATICMETHOD: Begin completions, 2 items
|
|
// SUPER_IN_STATICMETHOD-DAG: Decl[Subscript]/CurrNominal/Flair[ArgLabels]: ['[']{#static: Int#}[']'][#Int#];
|
|
// SUPER_IN_STATICMETHOD-DAG: Pattern/CurrNominal/Flair[ArgLabels]: ['[']{#keyPath: KeyPath<Base.Type, Value>#}[']'][#Value#];
|
|
}
|
|
}
|
|
|
|
struct MyStruct1<X: Comparable> {
|
|
subscript(idx1 _: Int, idx2 _: X) -> Int! { return 1 }
|
|
}
|
|
func testSubscriptCallSig<T>(val: MyStruct1<T>) {
|
|
val[#^LABELED_SUBSCRIPT^#
|
|
// LABELED_SUBSCRIPT: Begin completions, 2 items
|
|
// LABELED_SUBSCRIPT-DAG: Decl[Subscript]/CurrNominal/Flair[ArgLabels]: ['[']{#idx1: Int#}, {#idx2: Comparable#}[']'][#Int!#];
|
|
// LABELED_SUBSCRIPT-DAG: Pattern/CurrNominal/Flair[ArgLabels]: ['[']{#keyPath: KeyPath<MyStruct1<T>, Value>#}[']'][#Value#];
|
|
}
|
|
|
|
func testSubcscriptTuple(val: (x: Int, String)) {
|
|
val[#^TUPLE^#]
|
|
// TUPLE: Begin completions, 1 items
|
|
// TUPLE-DAG: Pattern/CurrNominal/Flair[ArgLabels]: ['[']{#keyPath: KeyPath<(x: Int, String), Value>#}[']'][#Value#];
|
|
}
|
|
|
|
struct HasSettableSub {
|
|
subscript(a: String) -> Int {
|
|
get { return 1 }
|
|
set { }
|
|
}
|
|
}
|
|
|
|
func testSettableSub(x: inout HasSettableSub) {
|
|
let local = "some string"
|
|
x[#^SETTABLE_SUBSCRIPT^#] = 32
|
|
}
|
|
// SETTABLE_SUBSCRIPT-DAG: Pattern/CurrNominal/Flair[ArgLabels]: ['[']{#keyPath: KeyPath<HasSettableSub, Value>#}[']'][#Value#];
|
|
// SETTABLE_SUBSCRIPT-DAG: Decl[Subscript]/CurrNominal/Flair[ArgLabels]: ['[']{#(a): String#}[']'][#@lvalue Int#];
|
|
// SETTABLE_SUBSCRIPT-DAG: Decl[LocalVar]/Local/TypeRelation[Convertible]: local[#String#]; name=local
|