mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +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.
74 lines
2.8 KiB
Swift
74 lines
2.8 KiB
Swift
@propertyWrapper
|
|
struct /*wrapper:def*/Foo<T> {
|
|
public var wrappedValue: T
|
|
init(initialValue: T) {
|
|
wrappedValue = initialValue
|
|
}
|
|
init(initialValue: T, otherThing: Bool) {
|
|
self.init(initialValue: initialValue)
|
|
}
|
|
var projectedValue: Projection<T> {
|
|
get { Projection(item: wrappedValue) }
|
|
}
|
|
}
|
|
|
|
struct Projection<T> {
|
|
var item: T
|
|
}
|
|
|
|
@_functionBuilder
|
|
struct /*builder:def*/Other {
|
|
public static func buildBlock(_ components: String...) -> String {
|
|
return components.joined()
|
|
}
|
|
}
|
|
|
|
struct Bar {
|
|
@/*wrapper*/Foo
|
|
var /*wrapped:def*/foo: Int = 10
|
|
@/*wrapper*/Foo(initialValue: "hello")
|
|
var bar: String
|
|
@/*wrapper*/Foo
|
|
var jim: String = {
|
|
struct Bar {
|
|
@/*wrapper*/Foo
|
|
var inner: String = "It's 42"
|
|
}
|
|
return Bar().inner
|
|
}()
|
|
|
|
func combined(@/*builder*/Other _ a: () -> String) -> String {
|
|
return a()
|
|
}
|
|
|
|
@/*builder*/Other
|
|
func hello() -> String {
|
|
"hello"
|
|
"there"
|
|
}
|
|
|
|
func baz() {
|
|
let _: /*wrapper*/Foo<Int> = /*wrapped+1*/_foo
|
|
let _: Int = /*wrapped+1*/_foo.wrappedValue
|
|
let _: Int = /*wrapped*/foo
|
|
let _: Projection<Int> = /*wrapped+1*/$foo
|
|
let _: /*wrapper*/Foo<String> = _bar
|
|
}
|
|
}
|
|
|
|
|
|
// RUN: %empty-directory(%t.result)
|
|
// RUN: %empty-directory(%t.ranges)
|
|
// RUN: %refactor -syntactic-rename -source-filename %s -pos="wrapper" -is-non-protocol-type -old-name "Foo" -new-name "Foo2" >> %t.result/custom-attrs-Foo.swift
|
|
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="wrapper" -is-non-protocol-type -old-name "Foo" >> %t.ranges/custom-attrs-Foo.swift
|
|
// RUN: %refactor -syntactic-rename -source-filename %s -pos="wrapped" -old-name "foo" -new-name "descriptive" >> %t.result/custom-attrs-wrapped.swift
|
|
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="wrapped" -old-name "foo" >> %t.ranges/custom-attrs-wrapped.swift
|
|
// RUN: %refactor -syntactic-rename -source-filename %s -pos="builder" -is-non-protocol-type -old-name "Other" -new-name "OtherBuilder" >> %t.result/custom-attrs-Other.swift
|
|
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="builder" -is-non-protocol-type -old-name "Other" >> %t.ranges/custom-attrs-Other.swift
|
|
// RUN: diff -u %S/Outputs/custom-attrs/Foo.swift.expected %t.result/custom-attrs-Foo.swift
|
|
// RUN: diff -u %S/FindRangeOutputs/custom-attrs/Foo.swift.expected %t.ranges/custom-attrs-Foo.swift
|
|
// RUN: diff -u %S/Outputs/custom-attrs/wrapped.swift.expected %t.result/custom-attrs-wrapped.swift
|
|
// RUN: diff -u %S/FindRangeOutputs/custom-attrs/wrapped.swift.expected %t.ranges/custom-attrs-wrapped.swift
|
|
// RUN: diff -u %S/Outputs/custom-attrs/Other.swift.expected %t.result/custom-attrs-Other.swift
|
|
// RUN: diff -u %S/FindRangeOutputs/custom-attrs/Other.swift.expected %t.ranges/custom-attrs-Other.swift
|