Skip to content

Commit a7577ab

Browse files
committed
Revert [Custom]PlaygroundQuickLook[able] moves
This reverts commits: 4bd65751a2e7c0bd442a2671fbf663f2a36cedd5 865fd0c0a6eaa027473e5d30618167cf817b1f56 b5863f2e5d5841081fee4167d9e8c556f27c9510 acee2e1d5e62323cccc2e9705fff0ef329eb9717. ab605ef280cf081b97b6e0ff8967c86548f9b5c0. aab7af43372bfe3ae9213bf655c89dd2e52db8d7.
1 parent 9d11f22 commit a7577ab

File tree

4 files changed

+11
-16
lines changed

4 files changed

+11
-16
lines changed

PlaygroundLogger/PlaygroundLogger/Common.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ protocol Serializable {
2121
}
2222

2323
typealias ChildrenRange = CountableRange<UInt64>
24-
typealias QuickLookObject = Swift._PlaygroundQuickLook
24+
typealias QuickLookObject = Swift.PlaygroundQuickLook
2525

2626
// given a disparate array of ranges, return a possibly smaller such array such that
2727
// no two ranges overlap and ranges are sorted by their startIndex

PlaygroundLogger/PlaygroundLogger/LoggerMirror.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ final class LoggerMirror {
2020
private var superclassMirror: (Bool, LoggerMirror?)
2121
private var typeNameData: String?
2222
private var displayTypeNameData: String?
23-
private var quickLookData: _PlaygroundQuickLook?? = nil
23+
private var quickLookData: PlaygroundQuickLook?? = nil
2424

2525
private static let Swift_Stdlib_Regex = Regex(pattern: "(?<!\\.)\\b(Swift\\.)")
2626

@@ -127,16 +127,16 @@ final class LoggerMirror {
127127
else { return .`struct` }
128128
}
129129

130-
var quickLookObject: _PlaygroundQuickLook? {
130+
var quickLookObject: PlaygroundQuickLook? {
131131
if let prefetched = quickLookData {
132132
return prefetched
133133
}
134134
guard let obj = object else { return nil }
135135
quickLookData = nil
136-
let cpql = _PlaygroundQuickLook(reflecting: obj)
136+
let cpql = PlaygroundQuickLook(reflecting: obj)
137137
switch cpql {
138138
case .text( _):
139-
if (obj as? _CustomPlaygroundQuickLookable) != nil {
139+
if (obj as? CustomPlaygroundQuickLookable) != nil {
140140
quickLookData = cpql
141141
} else {
142142
// ignore .Text quicklook data that doesn't come from a CustomPlaygroundQuickLookable as that is a synthetized conformance

PlaygroundLogger/PlaygroundLogger/TestCases.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -603,14 +603,14 @@ class EnumSummaryTestCase_NotGeneric : TestCase {
603603
// NSBezierPath(rect: rect).fill()
604604
// }
605605
// }
606-
// class MyView: NSView , _CustomPlaygroundQuickLookable{
606+
// class MyView: NSView , CustomPlaygroundQuickLookable{
607607
// override func drawRect(_ rect: CGRect) {
608608
// NSColor.blueColor().set()
609609
// NSBezierPath(rect: rect).fill()
610610
// }
611-
// func customPlaygroundQuickLook() -> _PlaygroundQuickLook {
611+
// func customPlaygroundQuickLook() -> PlaygroundQuickLook {
612612
// let hv = HelperView(frame: CGRect(x: 0, y: 0, width: 50, height: 50))
613-
// return _PlaygroundQuickLook.View(hv)
613+
// return PlaygroundQuickLook.View(hv)
614614
// }
615615
// }
616616
//
@@ -654,12 +654,12 @@ class PlaygroundQuickLookCalledOnceTestCase : TestCase {
654654
var explanation: String { return "Check that the logger only calls customPlaygroundQuickLook() one time per log operation" }
655655
var behavior: TestBehavior { return .ExpectedSuccess }
656656
func doTest() {
657-
class MyObject : _CustomPlaygroundQuickLookable {
657+
class MyObject : CustomPlaygroundQuickLookable {
658658
var numCalls = 0
659-
var customPlaygroundQuickLook: _PlaygroundQuickLook {
659+
var customPlaygroundQuickLook: PlaygroundQuickLook {
660660
get {
661661
numCalls = numCalls + 1
662-
return _PlaygroundQuickLook(reflecting: "Hello world")
662+
return PlaygroundQuickLook(reflecting: "Hello world")
663663
}
664664
}
665665
}

PlaygroundSupport/PlaygroundSupport/PlaygroundPage.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,3 @@ extension NSViewController: PlaygroundLiveViewable {
182182
}
183183
}
184184
#endif
185-
186-
// FIXME(ABI) the actual declarations and all the conformances should
187-
// be moved here before ABI stability.
188-
typealias CustomPlaygroundQuickLookable = Swift._CustomPlaygroundQuickLookable
189-
typealias PlaygroundQuickLook = Swift._PlaygroundQuickLook

0 commit comments

Comments
 (0)