mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
8aaf2d64ed
This makes us more lenient about what we accept for Objective-C selectors by allowing you to include or not include the trailing colons. We don't actually need that information, because we have access to the declaration, so it was only being used for validation, which made the API harder to use for clients that didn't carefully track zero vs one-arg selector names. Also remove the colons from the response, and instead add a bit to say whether it is a zero-arg or one-arg selector. This makes the response easier to use for clients that don't care about this information, and more consistent with the change to the input. rdar://problem/32177934
127 lines
6.2 KiB
Swift
127 lines
6.2 KiB
Swift
class C1 : NSObject {
|
|
func foo(a : Int, b: Int, c : Int) {}
|
|
func foo1(a : Int, _: Int, c : Int) {}
|
|
func foo2(_ : Int, _: Int, c : Int) {}
|
|
func foo3() {}
|
|
init(a : Int, b :Int) {}
|
|
init(_ : Int) {}
|
|
}
|
|
func takeC1(a : Int, b: Int, c :Int) -> C1 {
|
|
let C1Ins = C1(a: a, b: b)
|
|
C1Ins.foo(a: a, b: b, c: c)
|
|
C1Ins.foo1(a: a, b, c: c)
|
|
C1Ins.foo2(a, b, c: c)
|
|
C1Ins.foo3()
|
|
let C1Ins2 = C1(a)
|
|
return C1Ins2
|
|
}
|
|
|
|
@objc public enum CommonFix : Int {
|
|
case A1
|
|
case B1
|
|
case C1
|
|
}
|
|
|
|
func takeCommonFix(_ f: CommonFix) -> Int {
|
|
switch(f) {
|
|
case .A1: break
|
|
case .B1: break
|
|
case .C1: break
|
|
return 1
|
|
}
|
|
return 0
|
|
}
|
|
|
|
@objc public enum CustomError: Int, Error {
|
|
case a1, b1
|
|
}
|
|
|
|
func takeError(_ e : CustomError) {
|
|
switch(e) {
|
|
case .a1: break
|
|
case .b1: break
|
|
return
|
|
}
|
|
}
|
|
|
|
@objc(C2ObjC)
|
|
class C2 {}
|
|
|
|
@objc open class /*MyClass*/MyClass: NSObject {
|
|
@objc open func /*MyClass_foo*/foo(/*MyClass_foo_p1*/bar: Int, /*MyClass_foo_p2*/baz: Int) {}
|
|
}
|
|
|
|
class C3: NSObject {
|
|
@objc func oneArg(_: Int) {}
|
|
}
|
|
|
|
// REQUIRES: objc_interop
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "foo(a:b:c:)" -pos=11:11 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK1 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "foo(a:b:c:)" -pos=11:11 %s -print-raw-response -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK_RAW1 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "bar(x:y:)" -pos=11:11 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECKFEWER1 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "bar(::)" -pos=11:11 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECKMISSING1 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "(x:y:z:)" -pos=11:11 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECKMISSING2 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "foo(a1:b1:c1:)" -pos=11:11 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK2 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "foo(_:b1:c1:)" -pos=11:11 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK3 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "foo1(_:_:c2:)" -pos=11:11 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK4 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "foo1(_:_:_:)" -pos=11:11 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK5 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "foo2(a:b:c:)" -pos=12:11 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK6 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "foo2(_:_:_:)" -pos=12:11 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK7 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "foo1()" -pos=14:11 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK8 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "foo1()" -pos=14:11 %s -print-raw-response -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK_RAW8 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "foo1(a:b:c:)" -pos=14:11 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK-NONE %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "C11" -pos=1:8 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK9 %s
|
|
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "init(a1:b2:)" -pos=10:16 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK10 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "init(_:_:)" -pos=10:16 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK11 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "foo(a1:_:)" -pos=10:16 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK12 %s
|
|
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "A2" -pos=27:10 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK13 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "a2" -pos=27:10 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK13 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "a2" -pos=41:10 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK14 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "A2" -pos=41:10 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK14 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "C3" -pos=48:8 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK15 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "bar(_:other:)" -pos=51:36 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK16 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "zoo(m:)" -pos=55:14 %s -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK17 %s
|
|
// RUN: %sourcekitd-test -req=translate -swift-name "zoo(m:)" -pos=55:14 %s -print-raw-response -- -F %S/Inputs/mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK_RAW17 %s
|
|
|
|
// CHECK-NONE: <empty name translation info>
|
|
// CHECK1: fooWithA:b:c:
|
|
// CHECK2: fooWithA1:b1:c1:
|
|
// CHECK3: foo:b1:c1:
|
|
// CHECK4: foo1::c2:
|
|
// CHECK5: foo1:::
|
|
// CHECK6: foo2WithA:b:c:
|
|
// CHECK7: foo2:::
|
|
// CHECK8: foo1{{$}}
|
|
// CHECK9: C11
|
|
|
|
// CHECK10: initWithA1:b2:
|
|
// CHECK11: init::
|
|
// CHECK12: fooWithA1::
|
|
// CHECK13: CommonFixA2
|
|
// CHECK14: CustomErrorA2
|
|
// CHECK15: C2ObjC
|
|
// CHECK16: bar:other:
|
|
// CHECK17: zooWithM:
|
|
|
|
// CHECKFEWER1: barWithX:y:c:
|
|
// CHECKMISSING1: barWithA:b:c:
|
|
// CHECKMISSING2: fooWithX:y:z:
|
|
|
|
// CHECK_RAW1-LABEL: key.selectorpieces
|
|
// CHECK_RAW1: "fooWithA"
|
|
// CHECK_RAW1: "b"
|
|
// CHECK_RAW1: "c"
|
|
// CHECK_RAW1: key.namekind: source.lang.name.kind.objc
|
|
|
|
// CHECK_RAW8-LABEL: key.selectorpieces
|
|
// CHECK_RAW8: "foo1"
|
|
// CHECK_RAW8: key.namekind: source.lang.name.kind.objc
|
|
// CHECK_RAW8: key.is_zero_arg_selector: 1
|
|
|
|
// CHECK_RAW17-LABEL: key.selectorpieces
|
|
// CHECK_RAW17: "zooWithM"
|
|
// CHECK_RAW17: key.namekind: source.lang.name.kind.objc
|
|
// CHECK_RAW17-NOT: key.is_zero_arg_selector
|