Skip to content

Fix a merge conflict #2068

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
bnbarham merged 1 commit into from
Mar 14, 2025
Merged

Fix a merge conflict #2068

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
4 changes: 2 additions & 2 deletions Tests/SourceKitLSPTests/BackgroundIndexingTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand All @@ -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")])
}
}
Expand Down