Skip to content

Commit 9ef00cf

Browse files
rintarorintaro
authored
Merge pull request #36715 from rintaro/ide-completion-batchtest2
[CodeCompletion] Migrate some tests to batch completion test #2
2 parents 3028548 + 6e84c01 commit 9ef00cf

File tree

6 files changed

+324
-1107
lines changed

6 files changed

+324
-1107
lines changed

‎test/IDE/complete_accessor.swift‎

Lines changed: 26 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,5 @@
1-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_FIRST > %t.result
2-
// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL < %t.result
3-
// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.result
4-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
5-
// RUN: %FileCheck %s -check-prefix=WITH_OBSERVER < %t.result
6-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GLOBAL_SECOND > %t.result
7-
// RUN: %FileCheck %s -check-prefix=NO_GLOBAL < %t.result
8-
// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.result
9-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
10-
// RUN: %FileCheck %s -check-prefix=WITH_OBSERVER < %t.result
11-
12-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_FIRST > %t.result
13-
// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL < %t.result
14-
// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.result
15-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
16-
// RUN: %FileCheck %s -check-prefix=WITH_OBSERVER < %t.result
17-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LOCAL_SECOND > %t.result
18-
// RUN: %FileCheck %s -check-prefix=NO_GLOBAL < %t.result
19-
// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.result
20-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
21-
// RUN: %FileCheck %s -check-prefix=WITH_OBSERVER < %t.result
22-
23-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_PROPERTY_FIRST > %t.result
24-
// RUN: %FileCheck %s -check-prefix=NO_GLOBAL < %t.result
25-
// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.result
26-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
27-
// RUN: %FileCheck %s -check-prefix=NO_OBSERVER < %t.result
28-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_PROPERTY_SECOND > %t.result
29-
// RUN: %FileCheck %s -check-prefix=NO_GLOBAL < %t.result
30-
// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.result
31-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
32-
// RUN: %FileCheck %s -check-prefix=NO_OBSERVER < %t.result
33-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_SUBSCRIPT_FIRST > %t.result
34-
// RUN: %FileCheck %s -check-prefix=NO_GLOBAL < %t.result
35-
// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.result
36-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
37-
// RUN: %FileCheck %s -check-prefix=NO_OBSERVER < %t.result
38-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_SUBSCRIPT_SECOND > %t.result
39-
// RUN: %FileCheck %s -check-prefix=NO_GLOBAL < %t.result
40-
// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.result
41-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
42-
// RUN: %FileCheck %s -check-prefix=NO_OBSERVER < %t.result
43-
44-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_PROPERTY_FIRST > %t.result
45-
// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL < %t.result
46-
// RUN: %FileCheck %s -check-prefix=WITH_SELF < %t.result
47-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
48-
// RUN: %FileCheck %s -check-prefix=NO_OBSERVER < %t.result
49-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_PROPERTY_SECOND > %t.result
50-
// RUN: %FileCheck %s -check-prefix=NO_GLOBAL < %t.result
51-
// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.result
52-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
53-
// RUN: %FileCheck %s -check-prefix=NO_OBSERVER < %t.result
54-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_SUBSCRIPT_FIRST > %t.result
55-
// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL < %t.result
56-
// RUN: %FileCheck %s -check-prefix=WITH_SELF < %t.result
57-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
58-
// RUN: %FileCheck %s -check-prefix=NO_OBSERVER < %t.result
59-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_EXT_SUBSCRIPT_SECOND > %t.result
60-
// RUN: %FileCheck %s -check-prefix=NO_GLOBAL < %t.result
61-
// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.result
62-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
63-
// RUN: %FileCheck %s -check-prefix=NO_OBSERVER < %t.result
64-
65-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONCRETE_PROPERTY_FIRST > %t.result
66-
// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL < %t.result
67-
// RUN: %FileCheck %s -check-prefix=WITH_SELF < %t.result
68-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
69-
// RUN: %FileCheck %s -check-prefix=WITH_OBSERVER < %t.result
70-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONCRETE_PROPERTY_SECOND > %t.result
71-
// RUN: %FileCheck %s -check-prefix=NO_GLOBAL < %t.result
72-
// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.result
73-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
74-
// RUN: %FileCheck %s -check-prefix=WITH_OBSERVER < %t.result
75-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONCRETE_SUBSCRIPT_FIRST > %t.result
76-
// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL < %t.result
77-
// RUN: %FileCheck %s -check-prefix=WITH_SELF < %t.result
78-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
79-
// RUN: %FileCheck %s -check-prefix=NO_OBSERVER < %t.result
80-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONCRETE_SUBSCRIPT_SECOND > %t.result
81-
// RUN: %FileCheck %s -check-prefix=NO_GLOBAL < %t.result
82-
// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.result
83-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
84-
// RUN: %FileCheck %s -check-prefix=NO_OBSERVER < %t.result
85-
86-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONCRETE_EXT_PROPERTY_FIRST > %t.result
87-
// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL < %t.result
88-
// RUN: %FileCheck %s -check-prefix=WITH_SELF < %t.result
89-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
90-
// RUN: %FileCheck %s -check-prefix=WITH_OBSERVER < %t.result
91-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONCRETE_EXT_PROPERTY_SECOND > %t.result
92-
// RUN: %FileCheck %s -check-prefix=NO_GLOBAL < %t.result
93-
// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.result
94-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
95-
// RUN: %FileCheck %s -check-prefix=WITH_OBSERVER < %t.result
96-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONCRETE_EXT_SUBSCRIPT_FIRST > %t.result
97-
// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL < %t.result
98-
// RUN: %FileCheck %s -check-prefix=WITH_SELF < %t.result
99-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
100-
// RUN: %FileCheck %s -check-prefix=NO_OBSERVER < %t.result
101-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CONCRETE_EXT_SUBSCRIPT_SECOND > %t.result
102-
// RUN: %FileCheck %s -check-prefix=NO_GLOBAL < %t.result
103-
// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.result
104-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
105-
// RUN: %FileCheck %s -check-prefix=NO_OBSERVER < %t.result
106-
107-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNKNOWN_EXT_PROPERTY_FIRST > %t.result
108-
// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL < %t.result
109-
// RUN: %FileCheck %s -check-prefix=WITH_SELF < %t.result
110-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
111-
// RUN: %FileCheck %s -check-prefix=WITH_OBSERVER < %t.result
112-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNKNOWN_EXT_PROPERTY_SECOND > %t.result
113-
// RUN: %FileCheck %s -check-prefix=NO_GLOBAL < %t.result
114-
// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.result
115-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
116-
// RUN: %FileCheck %s -check-prefix=WITH_OBSERVER < %t.result
117-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNKNOWN_EXT_SUBSCRIPT_FIRST > %t.result
118-
// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL < %t.result
119-
// RUN: %FileCheck %s -check-prefix=WITH_SELF < %t.result
120-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
121-
// RUN: %FileCheck %s -check-prefix=NO_OBSERVER < %t.result
122-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNKNOWN_EXT_SUBSCRIPT_SECOND > %t.result
123-
// RUN: %FileCheck %s -check-prefix=NO_GLOBAL < %t.result
124-
// RUN: %FileCheck %s -check-prefix=NO_SELF < %t.result
125-
// RUN: %FileCheck %s -check-prefix=WITH_GETSET < %t.result
126-
// RUN: %FileCheck %s -check-prefix=NO_OBSERVER < %t.result
1+
// RUN: %empty-directory(%t)
2+
// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
1273

1284
// WITH_GETSET: Keyword/None: get; name=get
1295
// WITH_GETSET: Keyword/None: set; name=set
@@ -144,107 +20,107 @@
14420
var globalValue: String
14521

14622
var something1: String = 1 {
147-
#^GLOBAL_FIRST^#
23+
#^GLOBAL_FIRST?check=WITH_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=WITH_OBSERVER^#
14824
willSet {}
14925
}
15026

15127
var something2: String {
15228
get {}
153-
#^GLOBAL_SECOND^#
29+
#^GLOBAL_SECOND?check=NO_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=WITH_OBSERVER^#
15430
}
15531

15632
func testLocal() {
15733
var something3: String = 1 {
158-
#^LOCAL_FIRST^#
34+
#^LOCAL_FIRST?check=WITH_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=WITH_OBSERVER^#
15935
willSet {}
16036
}
16137

16238
var something4: String {
16339
get {}
164-
#^LOCAL_SECOND^#
40+
#^LOCAL_SECOND?check=NO_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=WITH_OBSERVER^#
16541
}
16642
}
16743

16844
protocol SomeProto {
16945
var prop1: Int {
170-
#^PROTOCOL_PROPERTY_FIRST^#
46+
#^PROTOCOL_PROPERTY_FIRST?check=NO_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=NO_OBSERVER^#
17147
}
17248
var prop2: Int {
173-
get #^PROTOCOL_PROPERTY_SECOND^#
49+
get #^PROTOCOL_PROPERTY_SECOND?check=NO_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=NO_OBSERVER^#
17450
}
17551
subscript(_1 index:Int) -> Int {
176-
#^PROTOCOL_SUBSCRIPT_FIRST^#
52+
#^PROTOCOL_SUBSCRIPT_FIRST?check=NO_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=NO_OBSERVER^#
17753
}
17854
subscript(_2 index:Int) -> String {
17955
get
180-
#^PROTOCOL_SUBSCRIPT_SECOND^#
56+
#^PROTOCOL_SUBSCRIPT_SECOND?check=NO_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=NO_OBSERVER^#
18157
}
18258
}
18359

18460
extension SomeProto {
18561
var prop1: Int {
186-
#^PROTOCOL_EXT_PROPERTY_FIRST^#
62+
#^PROTOCOL_EXT_PROPERTY_FIRST?check=WITH_GLOBAL;check=WITH_SELF;check=WITH_GETSET;check=NO_OBSERVER^#
18763
}
18864
var prop2: Int {
189-
set {} #^PROTOCOL_EXT_PROPERTY_SECOND^#
65+
set {} #^PROTOCOL_EXT_PROPERTY_SECOND?check=NO_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=NO_OBSERVER^#
19066
}
19167
subscript(_1 index:Int) -> Int {
192-
#^PROTOCOL_EXT_SUBSCRIPT_FIRST^#
68+
#^PROTOCOL_EXT_SUBSCRIPT_FIRST?check=WITH_GLOBAL;check=WITH_SELF;check=WITH_GETSET;check=NO_OBSERVER^#
19369
}
19470
subscript(_2 index:Int) -> String {
19571
get { }
196-
#^PROTOCOL_EXT_SUBSCRIPT_SECOND^#
72+
#^PROTOCOL_EXT_SUBSCRIPT_SECOND?check=NO_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=NO_OBSERVER^#
19773
}
19874
}
19975

20076
struct SomeStruct {
20177
var prop1: Int {
202-
#^CONCRETE_PROPERTY_FIRST^#
78+
#^CONCRETE_PROPERTY_FIRST?check=WITH_GLOBAL;check=WITH_SELF;check=WITH_GETSET;check=WITH_OBSERVER^#
20379
}
20480
var prop2: Int {
20581
get {}
20682
@available(*, unavailable)
207-
#^CONCRETE_PROPERTY_SECOND^#
83+
#^CONCRETE_PROPERTY_SECOND?check=NO_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=WITH_OBSERVER^#
20884
}
20985
subscript<T>(_1 index: T) -> Int {
210-
#^CONCRETE_SUBSCRIPT_FIRST^#
86+
#^CONCRETE_SUBSCRIPT_FIRST?check=WITH_GLOBAL;check=WITH_SELF;check=WITH_GETSET;check=NO_OBSERVER^#
21187
}
21288
subscript(_2 index: Int) -> String {
21389
get { }
214-
#^CONCRETE_SUBSCRIPT_SECOND^#
90+
#^CONCRETE_SUBSCRIPT_SECOND?check=NO_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=NO_OBSERVER^#
21591
}
21692
}
21793

21894
extension SomeStruct {
21995
var prop3: Int {
220-
#^CONCRETE_EXT_PROPERTY_FIRST^#
96+
#^CONCRETE_EXT_PROPERTY_FIRST?check=WITH_GLOBAL;check=WITH_SELF;check=WITH_GETSET;check=WITH_OBSERVER^#
22197
}
22298
var prop4: Int {
22399
get {}
224-
#^CONCRETE_EXT_PROPERTY_SECOND^#
100+
#^CONCRETE_EXT_PROPERTY_SECOND?check=NO_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=WITH_OBSERVER^#
225101
}
226102
subscript(_3 index:Int) -> Int {
227-
#^CONCRETE_EXT_SUBSCRIPT_FIRST^#
103+
#^CONCRETE_EXT_SUBSCRIPT_FIRST?check=WITH_GLOBAL;check=WITH_SELF;check=WITH_GETSET;check=NO_OBSERVER^#
228104
}
229105
subscript<U>(_4 index: Int) -> U {
230106
get { }
231-
#^CONCRETE_EXT_SUBSCRIPT_SECOND^#
107+
#^CONCRETE_EXT_SUBSCRIPT_SECOND?check=NO_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=NO_OBSERVER^#
232108
}
233109
}
234110

235111
extension UNKNOWN_TYPE {
236112
var prop1: Int {
237-
#^UNKNOWN_EXT_PROPERTY_FIRST^#
113+
#^UNKNOWN_EXT_PROPERTY_FIRST?check=WITH_GLOBAL;check=WITH_SELF;check=WITH_GETSET;check=WITH_OBSERVER^#
238114
}
239115
var prop2: Int {
240116
get {}
241-
#^UNKNOWN_EXT_PROPERTY_SECOND^#
117+
#^UNKNOWN_EXT_PROPERTY_SECOND?check=NO_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=WITH_OBSERVER^#
242118
}
243119
subscript<T>(_1 index: T) -> T where T: ANOTHER_UNKNWON_TYPE {
244-
#^UNKNOWN_EXT_SUBSCRIPT_FIRST^#
120+
#^UNKNOWN_EXT_SUBSCRIPT_FIRST?check=WITH_GLOBAL;check=WITH_SELF;check=WITH_GETSET;check=NO_OBSERVER^#
245121
}
246122
subscript(_2 index: Int) -> String {
247123
get { }
248-
#^UNKNOWN_EXT_SUBSCRIPT_SECOND^#
124+
#^UNKNOWN_EXT_SUBSCRIPT_SECOND?check=NO_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=NO_OBSERVER^#
249125
}
250126
}

0 commit comments

Comments
 (0)