mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
e08a6c1994
The backing property for 'foo' is now '_foo', and the projected value '$foo'. This updates Indexing to report occurrences of foo within both $foo and _foo occurrences (rather than just $foo - the old _foo). FindRelatedIdents was similarlar updated, so it reports 'foo' ranges in both _foo and $foo. CursorInfo now reports the USR, documentation, and location of foo when invoked occurrences of $foo or _foo, but now leaves the name, type, and annotated declaration of _foo/$foo as is. Having the same USR ensures rename invoked on any of them will still rename via foo. Reporting foo's documentation comment instead is just to present something more useful to the user.
149 lines
4.9 KiB
Swift
149 lines
4.9 KiB
Swift
class C1 {
|
|
init() {}
|
|
}
|
|
|
|
func test1() {
|
|
var x : C1 = C1()
|
|
}
|
|
|
|
extension C1 {}
|
|
|
|
test1()
|
|
|
|
import Swift
|
|
|
|
class C2 {
|
|
lazy var lazy_bar : Int = {
|
|
let x = 0
|
|
return x
|
|
}()
|
|
}
|
|
|
|
class C2<Param> {
|
|
func f(t : Param) -> Param {return t}
|
|
}
|
|
|
|
enum X {
|
|
case first(Int, String)
|
|
case second(Int, String)
|
|
case third(Int, String)
|
|
case fourth(Int, String)
|
|
}
|
|
|
|
switch X.first(2, "") {
|
|
case .first(let x, let y):
|
|
print(y)
|
|
fallthrough
|
|
case .second(let x, _):
|
|
print(x)
|
|
case .third(let x, let y):
|
|
fallthrough
|
|
case .fourth(let x, let y):
|
|
print(y)
|
|
print(x)
|
|
break
|
|
}
|
|
|
|
@propertyWrapper
|
|
struct Wrapper<T> {
|
|
var wrappedValue: T
|
|
init(initialValue: T) {
|
|
wrappedValue = initialValue
|
|
}
|
|
var projectedValue: Projection<T> {
|
|
get { Projection(item: wrappedValue) }
|
|
}
|
|
}
|
|
|
|
struct MyStruct {
|
|
@Wrapper
|
|
var foo: Int = 10
|
|
func doStuff() {
|
|
_ = foo
|
|
_ = _foo
|
|
_ = $foo
|
|
}
|
|
}
|
|
|
|
struct Projection<T> {
|
|
var item: T
|
|
}
|
|
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=6:17 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK1 %s
|
|
// CHECK1: START RANGES
|
|
// CHECK1-NEXT: 1:7 - 2
|
|
// CHECK1-NEXT: 6:11 - 2
|
|
// CHECK1-NEXT: 6:16 - 2
|
|
// CHECK1-NEXT: 9:11 - 2
|
|
// CHECK1-NEXT: END RANGES
|
|
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=5:9 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK2 %s
|
|
// CHECK2: START RANGES
|
|
// CHECK2-NEXT: 5:6 - 5
|
|
// CHECK2-NEXT: 11:1 - 5
|
|
// CHECK2-NEXT: END RANGES
|
|
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=13:10 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK3 %s
|
|
// CHECK3: START RANGES
|
|
// CHECK3-NEXT: END RANGES
|
|
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=18:12 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK4 %s
|
|
// CHECK4: START RANGES
|
|
// CHECK4-NEXT: 17:9 - 1
|
|
// CHECK4-NEXT: 18:12 - 1
|
|
// CHECK4-NEXT: END RANGES
|
|
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=22:12 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK5 %s
|
|
// CHECK5: START RANGES
|
|
// CHECK5-NEXT: 22:10 - 5
|
|
// CHECK5-NEXT: 23:13 - 5
|
|
// CHECK5-NEXT: 23:23 - 5
|
|
// CHECK5-NEXT: END RANGES
|
|
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=34:19 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK6 %s
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=37:20 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK6 %s
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=38:11 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK6 %s
|
|
// CHECK6: START RANGES
|
|
// CHECK6-NEXT: 34:19 - 1
|
|
// CHECK6-NEXT: 37:20 - 1
|
|
// CHECK6-NEXT: 38:11 - 1
|
|
// CHECK6-NEXT: END RANGES
|
|
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=34:26 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK7 %s
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=35:11 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK7 %s
|
|
// CHECK7: START RANGES
|
|
// CHECK7-NEXT: 34:26 - 1
|
|
// CHECK7-NEXT: 35:11 - 1
|
|
// CHECK7-NEXT: END RANGES
|
|
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=39:26 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK8 %s
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=41:27 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK8 %s
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=42:11 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK8 %s
|
|
// CHECK8: START RANGES
|
|
// CHECK8-NEXT: 39:26 - 1
|
|
// CHECK8-NEXT: 41:27 - 1
|
|
// CHECK8-NEXT: 42:11 - 1
|
|
// CHECK8-NEXT: END RANGES
|
|
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=39:19 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK9 %s
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=41:20 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK9 %s
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=43:11 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK9 %s
|
|
// CHECK9: START RANGES
|
|
// CHECK9-NEXT: 39:19 - 1
|
|
// CHECK9-NEXT: 41:20 - 1
|
|
// CHECK9-NEXT: 43:11 - 1
|
|
// CHECK9-NEXT: END RANGES
|
|
|
|
// Test find-related-idents considers wrapped properties and their associated property wrapper backing properties as 'related'
|
|
// but only returns the name portion of the property wrapper backing property occurrences (i.e. just the 'foo' in '$foo'),
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=60:7 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK10 %s
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=62:9 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK10 %s
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=63:9 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK10 %s
|
|
// RUN: %sourcekitd-test -req=related-idents -pos=64:9 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK10 %s
|
|
// CHECK10: START RANGES
|
|
// CHECK10-NEXT: 60:7 - 3
|
|
// CHECK10-NEXT: 62:9 - 3
|
|
// CHECK10-NEXT: 63:10 - 3
|
|
// CHECK10-NEXT: 64:10 - 3
|
|
// CHECK10-NEXT: END RANGES
|