Skip to content

Commit c83d050

Browse files
benlangmuirbenlangmuir
authored
Merge pull request #222 from benlangmuir/avoid-warn
Avoid new warning about assignment of Void
2 parents 8554f6d + 76ce44b commit c83d050

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

‎Tests/SourceKitTests/LocalSwiftTests.swift

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ final class LocalSwiftTests: XCTestCase {
9595
})
9696

9797
sk.sendNoteSync(DidChangeTextDocumentNotification(textDocument: .init(uri, version: 14), contentChanges: [
98-
.init(range: Range(Position(line: 1, utf16index: 0)), text: "_ = bar()")
98+
.init(range: Range(Position(line: 1, utf16index: 0)), text: "bar()")
9999
]), { (note: Notification<PublishDiagnosticsNotification>) in
100100
log("Received diagnostics for edit 2 - syntactic")
101101
XCTAssertEqual(note.params.version, 14)
@@ -104,19 +104,19 @@ final class LocalSwiftTests: XCTestCase {
104104
XCTAssertLessThanOrEqual(note.params.diagnostics.count, 1)
105105
XCTAssertEqual("""
106106
func foo() {}
107-
_ = bar()
107+
bar()
108108
""", self.workspace.documentManager.latestSnapshot(uri)!.text)
109109
}, { (note: Notification<PublishDiagnosticsNotification>) in
110110
log("Received diagnostics for edit 2 - semantic")
111111
XCTAssertEqual(note.params.version, 14)
112112
XCTAssertEqual(note.params.diagnostics.count, 1)
113113
XCTAssertEqual(
114114
note.params.diagnostics.first?.range.lowerBound,
115-
Position(line: 1, utf16index: 4))
115+
Position(line: 1, utf16index: 0))
116116
})
117117

118118
sk.sendNoteSync(DidChangeTextDocumentNotification(textDocument: .init(uri, version: 14), contentChanges: [
119-
.init(range: Position(line: 1, utf16index: 4)..<Position(line: 1, utf16index: 7), text: "foo")
119+
.init(range: Position(line: 1, utf16index: 0)..<Position(line: 1, utf16index: 3), text: "foo")
120120
]), { (note: Notification<PublishDiagnosticsNotification>) in
121121
log("Received diagnostics for edit 3 - syntactic")
122122
// 1 = remaining semantic error
@@ -125,7 +125,7 @@ final class LocalSwiftTests: XCTestCase {
125125
XCTAssertLessThanOrEqual(note.params.diagnostics.count, 1)
126126
XCTAssertEqual("""
127127
func foo() {}
128-
_ = foo()
128+
foo()
129129
""", self.workspace.documentManager.latestSnapshot(uri)!.text)
130130
}, { (note: Notification<PublishDiagnosticsNotification>) in
131131
log("Received diagnostics for edit 3 - semantic")
@@ -134,7 +134,7 @@ final class LocalSwiftTests: XCTestCase {
134134
})
135135

136136
sk.sendNoteSync(DidChangeTextDocumentNotification(textDocument: .init(uri, version: 15), contentChanges: [
137-
.init(range: Position(line: 1, utf16index: 4)..<Position(line: 1, utf16index: 7), text: "fooTypo")
137+
.init(range: Position(line: 1, utf16index: 0)..<Position(line: 1, utf16index: 3), text: "fooTypo")
138138
]), { (note: Notification<PublishDiagnosticsNotification>) in
139139
log("Received diagnostics for edit 4 - syntactic")
140140
XCTAssertEqual(note.params.version, 15)
@@ -143,21 +143,21 @@ final class LocalSwiftTests: XCTestCase {
143143
XCTAssertLessThanOrEqual(note.params.diagnostics.count, 1)
144144
XCTAssertEqual("""
145145
func foo() {}
146-
_ = fooTypo()
146+
fooTypo()
147147
""", self.workspace.documentManager.latestSnapshot(uri)!.text)
148148
}, { (note: Notification<PublishDiagnosticsNotification>) in
149149
log("Received diagnostics for edit 4 - semantic")
150150
XCTAssertEqual(note.params.version, 15)
151151
XCTAssertEqual(note.params.diagnostics.count, 1)
152152
XCTAssertEqual(
153153
note.params.diagnostics.first?.range.lowerBound,
154-
Position(line: 1, utf16index: 4))
154+
Position(line: 1, utf16index: 0))
155155
})
156156

157157
sk.sendNoteSync(DidChangeTextDocumentNotification(textDocument: .init(uri, version: 16), contentChanges: [
158158
.init(range: nil, text: """
159159
func bar() {}
160-
_ = foo()
160+
foo()
161161
""")
162162
]), { (note: Notification<PublishDiagnosticsNotification>) in
163163
log("Received diagnostics for edit 5 - syntactic")
@@ -166,15 +166,15 @@ final class LocalSwiftTests: XCTestCase {
166166
XCTAssertEqual(note.params.diagnostics.count, 1)
167167
XCTAssertEqual("""
168168
func bar() {}
169-
_ = foo()
169+
foo()
170170
""", self.workspace.documentManager.latestSnapshot(uri)!.text)
171171
}, { (note: Notification<PublishDiagnosticsNotification>) in
172172
log("Received diagnostics for edit 5 - semantic")
173173
XCTAssertEqual(note.params.version, 16)
174174
XCTAssertEqual(note.params.diagnostics.count, 1)
175175
XCTAssertEqual(
176176
note.params.diagnostics.first?.range.lowerBound,
177-
Position(line: 1, utf16index: 4))
177+
Position(line: 1, utf16index: 0))
178178
})
179179
}
180180

@@ -220,7 +220,7 @@ final class LocalSwiftTests: XCTestCase {
220220
})
221221

222222
sk.sendNoteSync(DidChangeTextDocumentNotification(textDocument: .init(uri, version: 14), contentChanges: [
223-
.init(range: Range(Position(line: 1, utf16index: 0)), text: "_ = bar()")
223+
.init(range: Range(Position(line: 1, utf16index: 0)), text: "bar()")
224224
]), { (note: Notification<PublishDiagnosticsNotification>) in
225225
log("Received diagnostics for edit 2 - syntactic")
226226
XCTAssertEqual(note.params.version, 14)
@@ -229,19 +229,19 @@ final class LocalSwiftTests: XCTestCase {
229229
XCTAssertLessThanOrEqual(note.params.diagnostics.count, 1)
230230
XCTAssertEqual("""
231231
func foo() {}
232-
_ = bar()
232+
bar()
233233
""", self.workspace.documentManager.latestSnapshot(uri)!.text)
234234
}, { (note: Notification<PublishDiagnosticsNotification>) in
235235
log("Received diagnostics for edit 2 - semantic")
236236
XCTAssertEqual(note.params.version, 14)
237237
XCTAssertEqual(note.params.diagnostics.count, 1)
238238
XCTAssertEqual(
239239
note.params.diagnostics.first?.range.lowerBound,
240-
Position(line: 1, utf16index: 4))
240+
Position(line: 1, utf16index: 0))
241241
})
242242

243243
sk.sendNoteSync(DidChangeTextDocumentNotification(textDocument: .init(uri, version: 14), contentChanges: [
244-
.init(range: Position(line: 1, utf16index: 4)..<Position(line: 1, utf16index: 7), text: "foo")
244+
.init(range: Position(line: 1, utf16index: 0)..<Position(line: 1, utf16index: 3), text: "foo")
245245
]), { (note: Notification<PublishDiagnosticsNotification>) in
246246
log("Received diagnostics for edit 3 - syntactic")
247247
XCTAssertEqual(note.params.version, 14)
@@ -250,7 +250,7 @@ final class LocalSwiftTests: XCTestCase {
250250
XCTAssertLessThanOrEqual(note.params.diagnostics.count, 1)
251251
XCTAssertEqual("""
252252
func foo() {}
253-
_ = foo()
253+
foo()
254254
""", self.workspace.documentManager.latestSnapshot(uri)!.text)
255255
}, { (note: Notification<PublishDiagnosticsNotification>) in
256256
log("Received diagnostics for edit 3 - semantic")
@@ -259,7 +259,7 @@ final class LocalSwiftTests: XCTestCase {
259259
})
260260

261261
sk.sendNoteSync(DidChangeTextDocumentNotification(textDocument: .init(uri, version: 15), contentChanges: [
262-
.init(range: Position(line: 1, utf16index: 4)..<Position(line: 1, utf16index: 7), text: "fooTypo")
262+
.init(range: Position(line: 1, utf16index: 0)..<Position(line: 1, utf16index: 3), text: "fooTypo")
263263
]), { (note: Notification<PublishDiagnosticsNotification>) in
264264
log("Received diagnostics for edit 4 - syntactic")
265265
XCTAssertEqual(note.params.version, 15)
@@ -268,21 +268,21 @@ final class LocalSwiftTests: XCTestCase {
268268
XCTAssertLessThanOrEqual(note.params.diagnostics.count, 1)
269269
XCTAssertEqual("""
270270
func foo() {}
271-
_ = fooTypo()
271+
fooTypo()
272272
""", self.workspace.documentManager.latestSnapshot(uri)!.text)
273273
}, { (note: Notification<PublishDiagnosticsNotification>) in
274274
log("Received diagnostics for edit 4 - semantic")
275275
XCTAssertEqual(note.params.version, 15)
276276
XCTAssertEqual(note.params.diagnostics.count, 1)
277277
XCTAssertEqual(
278278
note.params.diagnostics.first?.range.lowerBound,
279-
Position(line: 1, utf16index: 4))
279+
Position(line: 1, utf16index: 0))
280280
})
281281

282282
sk.sendNoteSync(DidChangeTextDocumentNotification(textDocument: .init(uri, version: 16), contentChanges: [
283283
.init(range: nil, text: """
284284
func bar() {}
285-
_ = foo()
285+
foo()
286286
""")
287287
]), { (note: Notification<PublishDiagnosticsNotification>) in
288288
log("Received diagnostics for edit 5 - syntactic")
@@ -291,15 +291,15 @@ final class LocalSwiftTests: XCTestCase {
291291
XCTAssertEqual(note.params.diagnostics.count, 1)
292292
XCTAssertEqual("""
293293
func bar() {}
294-
_ = foo()
294+
foo()
295295
""", self.workspace.documentManager.latestSnapshot(uri)!.text)
296296
}, { (note: Notification<PublishDiagnosticsNotification>) in
297297
log("Received diagnostics for edit 5 - semantic")
298298
XCTAssertEqual(note.params.version, 16)
299299
XCTAssertEqual(note.params.diagnostics.count, 1)
300300
XCTAssertEqual(
301301
note.params.diagnostics.first?.range.lowerBound,
302-
Position(line: 1, utf16index: 4))
302+
Position(line: 1, utf16index: 0))
303303
})
304304
}
305305

@@ -314,7 +314,7 @@ final class LocalSwiftTests: XCTestCase {
314314
sk.sendNoteSync(DidOpenTextDocumentNotification(textDocument: TextDocumentItem(
315315
uri: uriA, language: .swift, version: 12,
316316
text: """
317-
_ = foo()
317+
foo()
318318
"""
319319
)), { (note: Notification<PublishDiagnosticsNotification>) in
320320
log("Received diagnostics for open - syntactic")
@@ -328,13 +328,13 @@ final class LocalSwiftTests: XCTestCase {
328328
XCTAssertEqual(note.params.diagnostics.count, 1)
329329
XCTAssertEqual(
330330
note.params.diagnostics.first?.range.lowerBound,
331-
Position(line: 0, utf16index: 4))
331+
Position(line: 0, utf16index: 0))
332332
})
333333

334334
sk.sendNoteSync(DidOpenTextDocumentNotification(textDocument: TextDocumentItem(
335335
uri: uriB, language: .swift, version: 12,
336336
text: """
337-
_ = bar()
337+
bar()
338338
"""
339339
)), { (note: Notification<PublishDiagnosticsNotification>) in
340340
log("Received diagnostics for open - syntactic")
@@ -348,11 +348,11 @@ final class LocalSwiftTests: XCTestCase {
348348
XCTAssertEqual(note.params.diagnostics.count, 1)
349349
XCTAssertEqual(
350350
note.params.diagnostics.first?.range.lowerBound,
351-
Position(line: 0, utf16index: 4))
351+
Position(line: 0, utf16index: 0))
352352
})
353353

354354
sk.sendNoteSync(DidChangeTextDocumentNotification(textDocument: .init(uriA, version: 13), contentChanges: [
355-
.init(range: nil, text: "_ = foo()\n")
355+
.init(range: nil, text: "foo()\n")
356356
]), { (note: Notification<PublishDiagnosticsNotification>) in
357357
log("Received diagnostics for edit 1 - syntactic")
358358
XCTAssertEqual(note.params.version, 13)
@@ -372,7 +372,7 @@ final class LocalSwiftTests: XCTestCase {
372372
sk.sendNoteSync(DidOpenTextDocumentNotification(textDocument: TextDocumentItem(
373373
uri: uriA, language: .swift, version: 12,
374374
text: """
375-
_ = foo()
375+
foo()
376376
"""
377377
)), { (note: Notification<PublishDiagnosticsNotification>) in
378378
log("Received diagnostics for open - syntactic")
@@ -386,7 +386,7 @@ final class LocalSwiftTests: XCTestCase {
386386
XCTAssertEqual(note.params.diagnostics.count, 1)
387387
XCTAssertEqual(
388388
note.params.diagnostics.first?.range.lowerBound,
389-
Position(line: 0, utf16index: 4))
389+
Position(line: 0, utf16index: 0))
390390
})
391391

392392
sk.send(DidCloseTextDocumentNotification(textDocument: .init(urlA)))

0 commit comments

Comments
 (0)