Skip to content

Use a ThreadSafeBox for the reusedNodes variable in testIncrementalParse #1450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2024
Merged

Use a ThreadSafeBox for the reusedNodes variable in testIncrementalParse #1450

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions Tests/SourceKitLSPTests/LocalSwiftTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import LanguageServerProtocol
import SKCore
import SKTestSupport
import SourceKitLSP
import SwiftExtensions
import SwiftParser
import SwiftSyntax
import XCTest
Expand Down Expand Up @@ -1352,14 +1353,12 @@ final class LocalSwiftTests: XCTestCase {
let uri = DocumentURI(url)

let reusedNodeCallback = self.expectation(description: "reused node callback called")
// nonisolated(unsafe) is fine because the variable will only be read after all writes from reusedNodeCallback are
// done.
nonisolated(unsafe) var reusedNodes: [Syntax] = []
let reusedNodes = ThreadSafeBox<[Syntax]>(initialValue: [])
let swiftLanguageService =
await testClient.server._languageService(for: uri, .swift, in: testClient.server.workspaceForDocument(uri: uri)!)
as! SwiftLanguageService
await swiftLanguageService.setReusedNodeCallback {
reusedNodes.append($0)
reusedNodes.value.append($0)
reusedNodeCallback.fulfill()
}

Expand All @@ -1386,9 +1385,8 @@ final class LocalSwiftTests: XCTestCase {
)
try await fulfillmentOfOrThrow([reusedNodeCallback])

XCTAssertEqual(reusedNodes.count, 1)

let firstNode = try XCTUnwrap(reusedNodes.first)
XCTAssertEqual(reusedNodes.value.count, 1)
let firstNode = try XCTUnwrap(reusedNodes.value.first)
XCTAssertEqual(
firstNode.description,
"""
Expand Down