Skip to content

Commit d437a05

Browse files
authored
Merge pull request #42141 from bnbarham/fix-doc-catalyst-test
[SourceKit] Fix and re-enable xfailed MacCatalyst test
2 parents e059cc6 + ed674f7 commit d437a05

File tree

3 files changed

+84
-206
lines changed

3 files changed

+84
-206
lines changed

test/SourceKit/DocSupport/Inputs/availability_maccatalyst_is_deprecated.swift

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 84 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,87 @@
11
// REQUIRES: maccatalyst_support
2-
// REQUIRES: rdar90937993
32

43
// RUN: %empty-directory(%t.mod)
5-
// RUN: %swift -emit-module -target x86_64-apple-ios13.1-macabi -o %t.mod/availability.swiftmodule %S/Inputs/availability_maccatalyst_is_deprecated.swift -parse-as-library -emit-module-doc-path %t.mod/availability.swiftdoc
6-
// RUN: %sourcekitd-test -req=doc-info -module availability -- -target x86_64-apple-ios13.1-macabi -I %t.mod > %t.response
7-
// RUN: %diff -u %s.response %t.response
4+
// RUN: %swift -emit-module -target x86_64-apple-ios13.1-macabi -o %t.mod/availability.swiftmodule %s -parse-as-library -emit-module-doc-path %t.mod/availability.swiftdoc
5+
// RUN: %sourcekitd-test -req=doc-info -module availability -- -target x86_64-apple-ios13.1-macabi -I %t.mod | %FileCheck %s
6+
7+
@available(macCatalyst, deprecated: 20.0)
8+
public func deprecatedInFutureVersion_catalyst() {}
9+
// CHECK-LABEL: key.name: "deprecatedInFutureVersion_catalyst()"
10+
// CHECK-NOT: {
11+
// CHECK: key.attributes: [
12+
// CHECK-NEXT: {
13+
// CHECK-NEXT: key.kind: source.lang.swift.attribute.availability,
14+
// CHECK-NEXT: key.platform: source.availability.platform.maccatalyst,
15+
// CHECK-NEXT: key.deprecated: "20.0"
16+
// CHECK-NEXT: }
17+
// CHECK-NEXT: ]
18+
// CHECK-NEXT: }
19+
20+
@available(iOS, deprecated: 20.0)
21+
public func deprecatedInFutureVersion_iOS() {}
22+
// CHECK-LABEL: key.name: "deprecatedInFutureVersion_iOS()"
23+
// CHECK-NOT: {
24+
// CHECK: key.attributes: [
25+
// CHECK-NEXT: {
26+
// CHECK-NEXT: key.kind: source.lang.swift.attribute.availability,
27+
// CHECK-NEXT: key.platform: source.availability.platform.ios,
28+
// CHECK-NEXT: key.deprecated: "20.0"
29+
// CHECK-NEXT: }
30+
// CHECK-NEXT: ]
31+
// CHECK-NEXT: }
32+
33+
@available(macCatalyst, deprecated: 1.0)
34+
public func deprecatedInPastVersion_catalyst() {}
35+
// CHECK-LABEL: key.name: "deprecatedInPastVersion_catalyst()"
36+
// CHECK-NOT: {
37+
// CHECK: key.attributes: [
38+
// CHECK-NEXT: {
39+
// CHECK-NEXT: key.kind: source.lang.swift.attribute.availability,
40+
// CHECK-NEXT: key.platform: source.availability.platform.maccatalyst,
41+
// CHECK-NEXT: key.deprecated: "1.0"
42+
// CHECK-NEXT: }
43+
// CHECK-NEXT: ],
44+
// CHECK-NEXT: key.is_deprecated: 1
45+
// CHECK-NEXT: }
46+
47+
@available(iOS, deprecated: 1.0)
48+
public func deprecatedInPastVersion_iOS() {}
49+
// CHECK-LABEL: key.name: "deprecatedInPastVersion_iOS()"
50+
// CHECK-NOT: {
51+
// CHECK: key.attributes: [
52+
// CHECK-NEXT: {
53+
// CHECK-NEXT: key.kind: source.lang.swift.attribute.availability,
54+
// CHECK-NEXT: key.platform: source.availability.platform.ios,
55+
// CHECK-NEXT: key.deprecated: "1.0"
56+
// CHECK-NEXT: }
57+
// CHECK-NEXT: ],
58+
// CHECK-NEXT: key.is_deprecated: 1
59+
// CHECK-NEXT: }
60+
61+
@available(macCatalyst, deprecated)
62+
public func isAlwaysDeprecated_catalyst() {}
63+
// CHECK-LABEL: key.name: "isAlwaysDeprecated_catalyst()"
64+
// CHECK-NOT: {
65+
// CHECK: key.attributes: [
66+
// CHECK-NEXT: {
67+
// CHECK-NEXT: key.kind: source.lang.swift.attribute.availability,
68+
// CHECK-NEXT: key.platform: source.availability.platform.maccatalyst,
69+
// CHECK-NEXT: key.is_deprecated: 1
70+
// CHECK-NEXT: }
71+
// CHECK-NEXT: ],
72+
// CHECK-NEXT: key.is_deprecated: 1
73+
// CHECK-NEXT: }
74+
75+
@available(iOS, deprecated)
76+
public func isAlwaysDeprecated_iOS() {}
77+
// CHECK-LABEL: key.name: "isAlwaysDeprecated_iOS()"
78+
// CHECK-NOT: {
79+
// CHECK: key.attributes: [
80+
// CHECK-NEXT: {
81+
// CHECK-NEXT: key.kind: source.lang.swift.attribute.availability,
82+
// CHECK-NEXT: key.platform: source.availability.platform.ios,
83+
// CHECK-NEXT: key.is_deprecated: 1
84+
// CHECK-NEXT: }
85+
// CHECK-NEXT: ],
86+
// CHECK-NEXT: key.is_deprecated: 1
87+
// CHECK-NEXT: }

test/SourceKit/DocSupport/doc_swift_module_availability_maccatalyst_is_deprecated.swift.response

Lines changed: 0 additions & 184 deletions
This file was deleted.

0 commit comments

Comments
 (0)