Skip to content

Merge main into release/6.1 #1892

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.

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 16 commits into from
Dec 19, 2024

Conversation

…targets via a symlink

Consider the following scenario: A project has target A containing A.swift an target B containing B.swift. B.swift is a symlink to A.swift. When A.swift is modified, both the dependencies of A and B need to be marked as having an out-of-date preparation status, not just A.
Fix background indexing behavior if a source file is included in two targets via a symlink
VS Code spells file paths with a lowercase drive letter, while the rest of Windows APIs use an uppercase drive letter. Normalize the drive letter spelling to be uppercase.

Fixes swiftlang#1855
rdar://141001203
`SourceFilesAndDirectoriesKey` contained all source files in the project and computing its hash value was pretty expensive. The key didn’t really provide any value here because the only way it changes is if the build targets change and if that’s the case, we already clear `cachedSourceFilesAndDirectories`, so we can just avoid the hash value computation.
Improve performance of `sourceFilesAndDirectories`
For reasons that are completely oblivious to me, `DispatchIO.write`, which is used to write LSP responses to stdout fails with error code 5 on Windows unless we call `AbsolutePath(validating:)` on some URL first.
Normalize Windows drive letter to be uppercase
Fix an error that causes SourceKit-LSP to exit immediately on Windows
…s a diagnostic on the source file

The missing diagnostics might be due to an error that the user can fix. Report it to them.

Fixes swiftlang#1812
rdar://139514623
…gnostics

When a sourcekitd diagnostics request fails, show the request error as a diagnostic on the source file
…version

Check that we get correct package version even if package manifest is invalid
…mpdb

Interpret the `-index-store-path` relative to the command’s directory
…uest-diagnostics"

This reverts commit 9771138, reversing
changes made to 9a1c75e.
@ahoppen ahoppen requested a review from bnbarham December 17, 2024 15:36
@ahoppen
Copy link
Member Author

ahoppen commented Dec 18, 2024

@swift-ci Please test

@ahoppen ahoppen merged commit cd46834 into swiftlang:release/6.1 Dec 19, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants