mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +01:00
a2c7298af5
Peek at the token following the code completion location to decide
whether or not to provide completions for entire call patterns. When
the next token looks like it's part of an existing call we don't show
the patterns because they will "push out" the existing arguments.
We should now get:
Foo<here> => (blah, blah)
Foo(<here> => ['(']blah, blah)
Foo(<here>) => ['(']blah, blah[')']
Foo(<here>, blah) => just complete the values for arg1**
Foo(<here>blah, blah) => just complete the values for arg1
** A further improvement will be to add the argument label completion
for the first argument (if applicable) when we aren't showing a full
call pattern.
rdar://problem/22804670
Swift SVN r32765
240 lines
12 KiB
Swift
240 lines
12 KiB
Swift
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_CONSTRUCTORS_1 | FileCheck %s -check-prefix=IMPLICIT_CONSTRUCTORS_1
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_CONSTRUCTORS_1P | FileCheck %s -check-prefix=IMPLICIT_CONSTRUCTORS_1P
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_CONSTRUCTORS_2 | FileCheck %s -check-prefix=IMPLICIT_CONSTRUCTORS_2
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_CONSTRUCTORS_2P | FileCheck %s -check-prefix=IMPLICIT_CONSTRUCTORS_2P
|
|
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_1 | FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_1
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_1P | FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_1P
|
|
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_2 | FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_2
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_2P | FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_2P
|
|
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_3P | FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_3P
|
|
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_SELECTOR_1 | FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_SELECTOR_1
|
|
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_CONSTRUCTORS_BASE_DERIVED_1 | FileCheck %s -check-prefix=EXPLICIT_CONSTRUCTORS_BASE_DERIVED_1
|
|
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE1 | FileCheck %s -check-prefix=INIT_FROM_METATYPE1
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE2 | FileCheck %s -check-prefix=INIT_FROM_METATYPE2
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE3 | FileCheck %s -check-prefix=INIT_FROM_METATYPE3
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE4 | FileCheck %s -check-prefix=INIT_FROM_METATYPE4
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE5 | FileCheck %s -check-prefix=INIT_FROM_METATYPE4
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FROM_METATYPE6 | FileCheck %s -check-prefix=INIT_FROM_METATYPE6
|
|
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=HAVE_RPAREN_1 | FileCheck %s -check-prefix=HAVE_RPAREN_1
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=HAVE_RPAREN_2 | FileCheck %s -check-prefix=HAVE_RPAREN_2
|
|
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=HAVE_COMMA_1 | FileCheck %s -check-prefix=HAVE_COMMA_1
|
|
|
|
func freeFunc() {}
|
|
|
|
//===---
|
|
//===--- Test that we complete calls to constructors (except for 'super'-based calls, which are tested separately).
|
|
//===---
|
|
|
|
struct ImplicitConstructors1 {
|
|
}
|
|
|
|
func testImplicitConstructors1() {
|
|
ImplicitConstructors1#^IMPLICIT_CONSTRUCTORS_1^#
|
|
// IMPLICIT_CONSTRUCTORS_1: Begin completions, 1 items
|
|
// IMPLICIT_CONSTRUCTORS_1-DAG: Decl[Constructor]/CurrNominal: ()[#ImplicitConstructors1#]{{; name=.+$}}
|
|
// IMPLICIT_CONSTRUCTORS_1: End completions
|
|
}
|
|
func testImplicitConstructors1P() {
|
|
ImplicitConstructors1(#^IMPLICIT_CONSTRUCTORS_1P^#
|
|
// IMPLICIT_CONSTRUCTORS_1P: Begin completions
|
|
// IMPLICIT_CONSTRUCTORS_1P-NEXT: Decl[Constructor]/CurrNominal: ['('])[#ImplicitConstructors1#]{{; name=.+$}}
|
|
// IMPLICIT_CONSTRUCTORS_1P-NEXT: End completions
|
|
}
|
|
|
|
struct ImplicitConstructors2 {
|
|
var instanceVar = 0
|
|
}
|
|
|
|
func testImplicitConstructors2() {
|
|
ImplicitConstructors2#^IMPLICIT_CONSTRUCTORS_2^#
|
|
// IMPLICIT_CONSTRUCTORS_2: Begin completions, 2 items
|
|
// IMPLICIT_CONSTRUCTORS_2-DAG: Decl[Constructor]/CurrNominal: ({#instanceVar: Int#})[#ImplicitConstructors2#]{{; name=.+$}}
|
|
// IMPLICIT_CONSTRUCTORS_2-DAG: Decl[Constructor]/CurrNominal: ()[#ImplicitConstructors2#]{{; name=.+$}}
|
|
// IMPLICIT_CONSTRUCTORS_2: End completions
|
|
}
|
|
func testImplicitConstructors2P() {
|
|
ImplicitConstructors2(#^IMPLICIT_CONSTRUCTORS_2P^#
|
|
// IMPLICIT_CONSTRUCTORS_2P: Begin completions
|
|
// IMPLICIT_CONSTRUCTORS_2P-NEXT: Decl[Constructor]/CurrNominal: ['(']{#instanceVar: Int#})[#ImplicitConstructors2#]{{; name=.+$}}
|
|
// IMPLICIT_CONSTRUCTORS_2P-NEXT: Decl[Constructor]/CurrNominal: ['('])[#ImplicitConstructors2#]{{; name=.+$}}
|
|
// IMPLICIT_CONSTRUCTORS_2P-NEXT: End completions
|
|
}
|
|
|
|
struct ExplicitConstructors1 {
|
|
init() {}
|
|
init(a: Int) {}
|
|
init(a: Int, b: Float) {}
|
|
}
|
|
|
|
func testExplicitConstructors1() {
|
|
ExplicitConstructors1#^EXPLICIT_CONSTRUCTORS_1^#
|
|
// EXPLICIT_CONSTRUCTORS_1: Begin completions, 3 items
|
|
// EXPLICIT_CONSTRUCTORS_1-DAG: Decl[Constructor]/CurrNominal: ()[#ExplicitConstructors1#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_1-DAG: Decl[Constructor]/CurrNominal: ({#a: Int#})[#ExplicitConstructors1#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_1-DAG: Decl[Constructor]/CurrNominal: ({#a: Int#}, {#b: Float#})[#ExplicitConstructors1#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_1: End completions
|
|
}
|
|
func testExplicitConstructors1P() {
|
|
ExplicitConstructors1(#^EXPLICIT_CONSTRUCTORS_1P^#
|
|
// EXPLICIT_CONSTRUCTORS_1P: Begin completions
|
|
// EXPLICIT_CONSTRUCTORS_1P-NEXT: Decl[Constructor]/CurrNominal: ['('])[#ExplicitConstructors1#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_1P-NEXT: Decl[Constructor]/CurrNominal: ['(']{#a: Int#})[#ExplicitConstructors1#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_1P-NEXT: Decl[Constructor]/CurrNominal: ['(']{#a: Int#}, {#b: Float#})[#ExplicitConstructors1#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_1P-NEXT: End completions
|
|
}
|
|
|
|
ExplicitConstructors1#^EXPLICIT_CONSTRUCTORS_2^#
|
|
|
|
// EXPLICIT_CONSTRUCTORS_2: Begin completions, 3 items
|
|
// EXPLICIT_CONSTRUCTORS_2-DAG: Decl[Constructor]/CurrNominal: ()[#ExplicitConstructors1#]
|
|
// EXPLICIT_CONSTRUCTORS_2-DAG: Decl[Constructor]/CurrNominal: ({#a: Int#})[#ExplicitConstructors1#]
|
|
// EXPLICIT_CONSTRUCTORS_2-DAG: Decl[Constructor]/CurrNominal: ({#a: Int#}, {#b: Float#})[#ExplicitConstructors1#]
|
|
// EXPLICIT_CONSTRUCTORS_2: End completions
|
|
|
|
ExplicitConstructors1(#^EXPLICIT_CONSTRUCTORS_2P^#
|
|
|
|
// EXPLICIT_CONSTRUCTORS_2P: Begin completions
|
|
// EXPLICIT_CONSTRUCTORS_2P-DAG: Decl[Constructor]/CurrNominal: ['('])[#ExplicitConstructors1#]
|
|
// EXPLICIT_CONSTRUCTORS_2P-DAG: Decl[Constructor]/CurrNominal: ['(']{#a: Int#})[#ExplicitConstructors1#]
|
|
// EXPLICIT_CONSTRUCTORS_2P-DAG: Decl[Constructor]/CurrNominal: ['(']{#a: Int#}, {#b: Float#})[#ExplicitConstructors1#]
|
|
// EXPLICIT_CONSTRUCTORS_2P: End completions
|
|
|
|
|
|
struct ExplicitConstructors3 {
|
|
init() {}
|
|
init(_ a: Int) {}
|
|
init(a: Int, b: Float) {}
|
|
}
|
|
|
|
func testExplicitConstructors3P() {
|
|
ExplicitConstructors3(#^EXPLICIT_CONSTRUCTORS_3P^#
|
|
// EXPLICIT_CONSTRUCTORS_3P: Begin completions
|
|
// EXPLICIT_CONSTRUCTORS_3P-DAG: Decl[Constructor]/CurrNominal: ['('])[#ExplicitConstructors3#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_3P-DAG: Decl[Constructor]/CurrNominal: ['(']{#(a): Int#})[#ExplicitConstructors3#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_3P-DAG: Decl[Constructor]/CurrNominal: ['(']{#a: Int#}, {#b: Float#})[#ExplicitConstructors3#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_3P-DAG: Decl[FreeFunction]/CurrModule/TypeRelation[Invalid]: freeFunc()[#Void#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_3P: End completions
|
|
}
|
|
|
|
|
|
struct ExplicitConstructorsSelector1 {
|
|
init(int a : Int) {}
|
|
init(int a : Int, andFloat b : Float) {}
|
|
}
|
|
|
|
func testExplicitConstructorsSelector1() {
|
|
ExplicitConstructorsSelector1#^EXPLICIT_CONSTRUCTORS_SELECTOR_1^#
|
|
// EXPLICIT_CONSTRUCTORS_SELECTOR_1: Begin completions, 2 items
|
|
// EXPLICIT_CONSTRUCTORS_SELECTOR_1-DAG: Decl[Constructor]/CurrNominal: ({#int: Int#})[#ExplicitConstructorsSelector1#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_SELECTOR_1-DAG: Decl[Constructor]/CurrNominal: ({#int: Int#}, {#andFloat: Float#})[#ExplicitConstructorsSelector1#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_SELECTOR_1: End completions
|
|
}
|
|
|
|
struct ExplicitConstructorsSelector2 {
|
|
init(noArgs _ : ()) {}
|
|
init(_ a : Int) {}
|
|
init(_ a : Int, withFloat b : Float) {}
|
|
init(int a : Int, _ b : Float) {}
|
|
}
|
|
|
|
func testExplicitConstructorsSelector2() {
|
|
ExplicitConstructorsSelector2#^EXPLICIT_CONSTRUCTORS_SELECTOR_2^#
|
|
// EXPLICIT_CONSTRUCTORS_SELECTOR_2: Begin completions, 4 items
|
|
// EXPLICIT_CONSTRUCTORS_SELECTOR_2-DAG: Decl[Constructor]/CurrNominal: ({#noArgs: ()#})[#ExplicitConstructorsSelector2#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_SELECTOR_2-DAG: Decl[Constructor]/CurrNominal: ({#Int#})[#ExplicitConstructorsSelector2#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_SELECTOR_2-DAG: Decl[Constructor]/CurrNominal: ({#Int#}, {#withFloat: Float#})[#ExplicitConstructorsSelector2#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_SELECTOR_2-DAG: Decl[Constructor]/CurrNominal: ({#int: Int#}, {#Float#})[#ExplicitConstructorsSelector2#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_SELECTOR_2: End completions
|
|
}
|
|
|
|
class ExplicitConstructorsBase1 {
|
|
init() {}
|
|
init(a : Int) {}
|
|
}
|
|
|
|
class ExplicitConstructorsDerived1 : ExplicitConstructorsBase1 {
|
|
init() {}
|
|
init(a : Int) {}
|
|
}
|
|
|
|
class ExplicitConstructorsDerived2 : ExplicitConstructorsBase1 {
|
|
init() {}
|
|
required init(a : Int) {}
|
|
class func foo() {
|
|
self.#^INIT_FROM_METATYPE5^#
|
|
}
|
|
}
|
|
|
|
func testExplicitConstructorsBaseDerived1() {
|
|
ExplicitConstructorsDerived1#^EXPLICIT_CONSTRUCTORS_BASE_DERIVED_1^#
|
|
}
|
|
// EXPLICIT_CONSTRUCTORS_BASE_DERIVED_1: Begin completions, 2 items
|
|
// EXPLICIT_CONSTRUCTORS_BASE_DERIVED_1-DAG: Decl[Constructor]/CurrNominal: ()[#ExplicitConstructorsDerived1#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_BASE_DERIVED_1-DAG: Decl[Constructor]/CurrNominal: ({#a: Int#})[#ExplicitConstructorsDerived1#]{{; name=.+$}}
|
|
// EXPLICIT_CONSTRUCTORS_BASE_DERIVED_1: End completions
|
|
|
|
func testGetInitFromMetatype1() {
|
|
ExplicitConstructorsBase1.#^INIT_FROM_METATYPE1^#
|
|
}
|
|
|
|
// INIT_FROM_METATYPE1: Begin completions
|
|
// INIT_FROM_METATYPE1-NEXT: Decl[Constructor]/CurrNominal: init()[#ExplicitConstructorsBase1#]{{; name=.+$}}
|
|
// INIT_FROM_METATYPE1-NEXT: Decl[Constructor]/CurrNominal: init({#a: Int#})[#ExplicitConstructorsBase1#]{{; name=.+$}}
|
|
// INIT_FROM_METATYPE1-NEXT: End completions
|
|
|
|
func testGetInitFromMetatype2() {
|
|
var SS = ExplicitConstructorsBase1.self
|
|
SS.#^INIT_FROM_METATYPE2^#
|
|
}
|
|
|
|
// INIT_FROM_METATYPE2-NOT: Decl[Constructor]/CurrNominal: init()[#ExplicitConstructorsBase1#]{{; name=.+$}}
|
|
|
|
func testGetInitFromMetatype3() {
|
|
var SS = ExplicitConstructorsBase1.self
|
|
SS.dynamicType.#^INIT_FROM_METATYPE3^#
|
|
}
|
|
|
|
// INIT_FROM_METATYPE3-NOT: Decl[Constructor]/CurrNominal: init()[#ExplicitConstructorsBase1#]{{; name=.+$}}
|
|
|
|
func testGetInitFromMetatype4() {
|
|
var a = ExplicitConstructorsDerived2()
|
|
a.dynamicType.#^INIT_FROM_METATYPE4^#
|
|
}
|
|
|
|
// INIT_FROM_METATYPE4: Decl[Constructor]/CurrNominal: init({#a: Int#})[#ExplicitConstructorsDerived2#]; name=init(a: Int)
|
|
// INIT_FROM_METATYPE4-NOT: Decl[Constructor]/CurrNominal: init()[#ExplicitConstructorsDerived2#]{{; name=.+$}}
|
|
|
|
struct ExplicitConstructorsDerived3 {
|
|
init() {}
|
|
required init(a : Int) {}
|
|
static func foo() {
|
|
self.#^INIT_FROM_METATYPE6^#
|
|
}
|
|
// INIT_FROM_METATYPE6: Decl[Constructor]/CurrNominal: init()[#ExplicitConstructorsDerived3#]{{; name=.+$}}
|
|
// INIT_FROM_METATYPE6: Decl[Constructor]/CurrNominal: init({#a: Int#})[#ExplicitConstructorsDerived3#]{{; name=.+$}}
|
|
}
|
|
|
|
func testHaveRParen1() {
|
|
ImplicitConstructors1(#^HAVE_RPAREN_1^#)
|
|
// HAVE_RPAREN_1-NOT: Decl[Constructor]
|
|
}
|
|
|
|
func testHaveRParen2() {
|
|
ImplicitConstructors2(#^HAVE_RPAREN_2^#)
|
|
// HAVE_RPAREN_2-NOT: Decl[Constructor]
|
|
// HAVE_RPAREN_2: Decl[Constructor]/CurrNominal: ['(']{#instanceVar: Int#}[')'][#ImplicitConstructors2#]{{; name=.+$}}
|
|
// HAVE_RPAREN_2-NOT: Decl[Constructor]
|
|
}
|
|
|
|
func testHaveComma1() {
|
|
ExplicitConstructors1(#^HAVE_COMMA_1^#,
|
|
// HAVE_COMMA_1-NOT: Decl[Constructor]
|
|
}
|