From 9dcb012d473e3e4238bc6b986d7125718bb4992f Mon Sep 17 00:00:00 2001 From: Alex Hoppen Date: Fri, 14 Mar 2025 16:25:53 -0700 Subject: [PATCH] Fix a merge conflict https://github.com/swiftlang/sourcekit-lsp/pull/2060 and https://github.com/swiftlang/sourcekit-lsp/pull/2061 raced. --- Tests/SourceKitLSPTests/BackgroundIndexingTests.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/SourceKitLSPTests/BackgroundIndexingTests.swift b/Tests/SourceKitLSPTests/BackgroundIndexingTests.swift index 9d373ca1f..c3ba91575 100644 --- a/Tests/SourceKitLSPTests/BackgroundIndexingTests.swift +++ b/Tests/SourceKitLSPTests/BackgroundIndexingTests.swift @@ -2268,7 +2268,7 @@ final class BackgroundIndexingTests: XCTestCase { enableBackgroundIndexing: true, testScratchDir: scratchDirectory ) - try await project.testClient.send(PollIndexRequest()) + try await project.testClient.send(SynchronizeRequest(index: true)) // Ensure that changing `/private/tmp/.../test.c` only causes `/tmp/.../test.c` to be indexed, not // `/private/tmp/.../test.c`. @@ -2278,7 +2278,7 @@ final class BackgroundIndexingTests: XCTestCase { project.testClient.send( DidChangeWatchedFilesNotification(changes: [FileEvent(uri: DocumentURI(testFileURL), type: .changed)]) ) - try await project.testClient.send(PollIndexRequest()) + try await project.testClient.send(SynchronizeRequest(index: true)) XCTAssertEqual(indexedFiles.value, [try project.uri(for: "test.c")]) } }