Skip to content

Commit 1999845

Browse files
authored
Merge pull request #3607 from phausler/UndoManager_registerUndo_naming_update
[Foundation] Update UndoManager registerUndo to adopt new naming rules
2 parents c8c41b3 + 3cf2692 commit 1999845

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

stdlib/public/SDK/Foundation/Foundation.swift

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,10 +1259,13 @@ internal func NS_Swift_NSUndoManager_registerUndoWithTargetHandler(
12591259
_ handler: @convention(block) (AnyObject) -> Void)
12601260

12611261
extension UndoManager {
1262+
@available(*, unavailable, renamed: "registerUndo(withTarget:handler:)")
1263+
public func registerUndoWithTarget<TargetType : AnyObject>(_ target: TargetType, handler: (TargetType) -> Void) {
1264+
fatalError("This API has been renamed")
1265+
}
1266+
12621267
@available(OSX 10.11, iOS 9.0, *)
1263-
public func registerUndoWithTarget<TargetType : AnyObject>(
1264-
_ target: TargetType, handler: (TargetType) -> Void
1265-
) {
1268+
public func registerUndo<TargetType : AnyObject>(withTarget target: TargetType, handler: (TargetType) -> Void) {
12661269
// The generic blocks use a different ABI, so we need to wrap the provided
12671270
// handler in something ObjC compatible.
12681271
let objcCompatibleHandler: (AnyObject) -> Void = { internalTarget in

test/Interpreter/SDK/Foundation_test.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ if #available(OSX 10.11, iOS 9.0, *) {
230230
var someProperty: String = ""
231231
}
232232
let f = ObjCClass()
233-
UM.registerUndoWithTarget(f) { target in
233+
UM.registerUndo(withTarget: f) { target in
234234
target.someProperty = "expected"
235235
}
236236
UM.undo()
@@ -245,7 +245,7 @@ if #available(OSX 10.11, iOS 9.0, *) {
245245
var someOtherProperty: String = ""
246246
}
247247
var b = SwiftClass()
248-
UM.registerUndoWithTarget(b) { target in
248+
UM.registerUndo(withTarget:b) { target in
249249
target.someOtherProperty = "expected"
250250
}
251251
UM.undo()

0 commit comments

Comments
 (0)