mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +01:00
Impact for an unknown property access was frequently higher than other options on ambiguous selections, by 3 to 5 points, causing fix selections that were farther away and frequently noted to be in accurate. This commit lowers the impact to be in a similar range to other fixes and this causes property accesses to be selected more proprotionaly. In the existing test suite, this changed the diagnostic only in the case of protocol composition, which was also discovered to be a flawed binding lookup. Tests added for the property lookup, tests updated for protocol composition (Including correcting a likely error in a test specification)
200 lines
5.6 KiB
Swift
200 lines
5.6 KiB
Swift
// RUN: %target-typecheck-verify-swift -swift-version 4
|
|
|
|
// See test/Compatibility/enum_cases.swift for Swift 3 behavior
|
|
|
|
enum E {
|
|
case foo(bar: String)
|
|
case bar(_: String)
|
|
case two(x: Int, y: Int)
|
|
case tuple((x: Int, y: Int))
|
|
}
|
|
|
|
enum G_E<T> {
|
|
case foo(bar: T)
|
|
case bar(_: T)
|
|
case two(x: T, y: T)
|
|
case tuple((x: T, y: T))
|
|
}
|
|
|
|
let arr: [String] = []
|
|
let _ = arr.map(E.foo) // Ok
|
|
let _ = arr.map(E.bar) // Ok
|
|
let _ = arr.map(E.two) // expected-error {{cannot convert value of type '(Int, Int) -> E' to expected argument type '(String) -> E'}}
|
|
|
|
let _ = arr.map(E.tuple) // expected-error {{cannot convert value of type '((x: Int, y: Int)) -> E' to expected argument type '(String) -> E'}}
|
|
|
|
let _ = arr.map(G_E<String>.foo) // Ok
|
|
let _ = arr.map(G_E<String>.bar) // Ok
|
|
let _ = arr.map(G_E<String>.two) // expected-error {{cannot convert value of type '(String, String) -> G_E<String>' to expected argument type '(String) -> G_E<String>'}}
|
|
let _ = arr.map(G_E<Int>.tuple) // expected-error {{cannot convert value of type '((x: Int, y: Int)) -> G_E<Int>' to expected argument type '(String) -> G_E<Int>'}}
|
|
|
|
let _ = E.foo("hello") // expected-error {{missing argument label 'bar:' in call}}
|
|
let _ = E.bar("hello") // Ok
|
|
|
|
let _ = G_E<String>.foo("hello") // expected-error {{missing argument label 'bar:' in call}}
|
|
let _ = G_E<String>.bar("hello") // Ok
|
|
|
|
// Passing enum case as an argument to generic function
|
|
|
|
func bar_1<T>(_: (T) -> E) {}
|
|
func bar_2<T>(_: (T) -> G_E<T>) {}
|
|
func bar_3<T, U>(_: (T) -> G_E<U>) {}
|
|
|
|
bar_1(E.foo) // Ok
|
|
bar_1(E.bar) // Ok
|
|
// SE-0110: We reverted to allowing this for the time being, but this
|
|
// test is valuable in case we end up disallowing it again in the
|
|
// future.
|
|
bar_1(E.two) // Ok since we backed off on this aspect of SE-0110 for the moment.
|
|
bar_1(E.tuple) // Ok - it's going to be ((x: Int, y: Int))
|
|
|
|
bar_2(G_E<String>.foo) // Ok
|
|
bar_2(G_E<Int>.bar) // Ok
|
|
bar_2(G_E<Int>.two) // expected-error {{cannot convert value of type '(Int, Int) -> G_E<Int>' to expected argument type '(Int) -> G_E<Int>'}}
|
|
bar_2(G_E<Int>.tuple) // expected-error {{cannot convert value of type '((x: Int, y: Int)) -> G_E<Int>' to expected argument type '(Int) -> G_E<Int>'}}
|
|
bar_3(G_E<Int>.tuple) // Ok
|
|
|
|
// Regular enum case assigned as a value
|
|
|
|
let foo: (String) -> E = E.foo // Ok
|
|
let _ = foo("hello") // Ok
|
|
|
|
let bar: (String) -> E = E.bar // Ok
|
|
let _ = bar("hello") // Ok
|
|
|
|
let two: (Int, Int) -> E = E.two // Ok
|
|
let _ = two(0, 42) // Ok
|
|
|
|
let tuple: ((x: Int, y: Int)) -> E = E.tuple // Ok
|
|
let _ = tuple((x: 0, y: 42)) // Ok
|
|
|
|
// Generic enum case assigned as a value
|
|
|
|
let g_foo: (String) -> G_E<String> = G_E<String>.foo // Ok
|
|
let _ = g_foo("hello") // Ok
|
|
|
|
let g_bar: (String) -> G_E<String> = G_E<String>.bar // Ok
|
|
let _ = g_bar("hello") // Ok
|
|
|
|
let g_two: (Int, Int) -> G_E<Int> = G_E<Int>.two // Ok
|
|
let _ = g_two(0, 42) // Ok
|
|
|
|
let g_tuple: ((x: Int, y: Int)) -> G_E<Int> = G_E<Int>.tuple // Ok
|
|
let _ = g_tuple((x: 0, y: 42)) // Ok
|
|
|
|
|
|
enum Foo {
|
|
case a(x: Int)
|
|
case b(y: Int)
|
|
}
|
|
|
|
func foo<T>(_: T, _: T) {}
|
|
foo(Foo.a, Foo.b) // Ok in Swift 4 because we strip labels from the arguments
|
|
|
|
// rdar://problem/32551313 - Useless SE-0110 diagnostic
|
|
|
|
enum E_32551313<L, R> {
|
|
case Left(L)
|
|
case Right(R)
|
|
}
|
|
|
|
struct Foo_32551313 {
|
|
static func bar() -> E_32551313<(String, Foo_32551313?), (String, String)>? {
|
|
return E_32551313.Left("", Foo_32551313())
|
|
// expected-error@-1 {{cannot convert value of type 'String' to expected argument type '(String, Foo_32551313?)'}}
|
|
// expected-error@-2 {{extra argument in call}}
|
|
}
|
|
}
|
|
|
|
func rdar34583132() {
|
|
enum E {
|
|
case timeOut
|
|
}
|
|
|
|
struct S {
|
|
func foo(_ x: Int) -> E { return .timeOut }
|
|
}
|
|
|
|
func bar(_ s: S) {
|
|
guard s.foo(1 + 2) == .timeout else {
|
|
// expected-error@-1 {{enum type 'E' has no case 'timeout'; did you mean 'timeOut'?}}
|
|
fatalError()
|
|
}
|
|
}
|
|
}
|
|
|
|
func rdar_49159472() {
|
|
struct A {}
|
|
struct B {}
|
|
struct C {}
|
|
|
|
enum E {
|
|
case foo(a: A, b: B?)
|
|
|
|
var foo: C? {
|
|
return nil
|
|
}
|
|
}
|
|
|
|
class Test {
|
|
var e: E
|
|
|
|
init(_ e: E) {
|
|
self.e = e
|
|
}
|
|
|
|
func bar() {
|
|
e = .foo(a: A(), b: nil) // Ok
|
|
e = E.foo(a: A(), b: nil) // Ok
|
|
baz(e: .foo(a: A(), b: nil)) // Ok
|
|
baz(e: E.foo(a: A(), b: nil)) // Ok
|
|
}
|
|
|
|
func baz(e: E) {}
|
|
}
|
|
}
|
|
|
|
struct EnumElementPatternFromContextualType<T> {
|
|
enum E {
|
|
case plain
|
|
case payload(T)
|
|
}
|
|
|
|
func foo(x: Any) where T == EnumElementPatternFromContextualType<Bool>.E {
|
|
switch x {
|
|
case T.plain: // Ok
|
|
break
|
|
case T.payload(true): // Ok
|
|
break
|
|
default:
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
// https://github.com/apple/swift/issues/56765
|
|
|
|
enum CompassPoint {
|
|
case North(Int)
|
|
case South
|
|
case East
|
|
case West
|
|
}
|
|
|
|
func isNorth(c : CompassPoint) -> Bool {
|
|
// FIXME: After improving property lookup fix, this message is not selected. Separate debug to reinstate {{member 'North' expects argument of type 'Int'}}
|
|
return c == .North // expected-error {{binary operator '==' cannot be applied to two 'CompassPoint' operands}}
|
|
// expected-note@-1 {{binary operator '==' cannot be synthesized for enums with associated values}}
|
|
}
|
|
|
|
func isNorth2(c : CompassPoint) -> Bool {
|
|
// FIXME: {{member 'North' expects argument of type 'Int'}}
|
|
return .North == c // expected-error {{binary operator '==' cannot be applied to two 'CompassPoint' operands}}
|
|
// expected-note@-1 {{binary operator '==' cannot be synthesized for enums with associated values}}
|
|
}
|
|
|
|
func isSouth(c : CompassPoint) -> Bool {
|
|
return c == .South // expected-error {{binary operator '==' cannot be applied to two 'CompassPoint' operands}}
|
|
// expected-note@-1 {{binary operator '==' cannot be synthesized for enums with associated values}}
|
|
}
|