Fix incorrect ConfiguredTargets for Package.swift w/ multiple workspaces #1545
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ahoppen
reviewed
Jul 2, 2024
plemarquand
force-pushed
the
multi-package-root-fix
branch
from
d2088d3 to
ecffdf0
Compare
ahoppen
approved these changes
Jul 2, 2024
|
@swift-ci Please test |
auto-merge was automatically disabled
July 3, 2024 12:41
Head branch was pushed to by a user without write access
plemarquand
force-pushed
the
multi-package-root-fix
branch
from
ecffdf0 to
9a6e155
Compare
ahoppen
reviewed
Jul 3, 2024
In a project with multiple folders each containing a Package.swift, the `bestWorkspace` found in `workspaceForDocument(uri:)` was always the first one encountered. `fileHandlingCapability(for:)` checks if there are configured targets for the Package.swift and if there are, the workspace is chosen since the Package.swift is determined to be part of the workspace. However the check in `configuredTargets(for:)` always returned a target for any `Package.swift`, even if that `Package.swift` was not part of the workspace associated with the BuildSystem. Ultimately this manifested as code completion not working in all but one of the Package.swift files in a multi workspace project. Some work was done in swiftlang#1210 to address swiftlang/vscode-swift#768, which is where this issue originated from. However while verifying swiftlang/vscode-swift#768 I found that swiftlang#1210 didn't fully address code completion of `Package.swift` files in multi workspace projects.
plemarquand
force-pushed
the
multi-package-root-fix
branch
from
9a6e155 to
707b8e5
Compare
ahoppen
approved these changes
Jul 3, 2024
|
@swift-ci Please test |
|
@swift-ci Please test Windows |
|
@ahoppen when you get a moment I think this is ready to be merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In a project with multiple folders each containing a Package.swift, the
bestWorkspacefound inworkspaceForDocument(uri:)was always the first one encountered.fileHandlingCapability(for:)checks if there are configured targets for the Package.swift and if there are, the workspace is chosen since the Package.swift is determined to be part of the workspace. However the check inconfiguredTargets(for:)always returned a target for any Package.swift, even if that Package.swift was not part of the workspace associated with the BuildSystem.Ultimately this manifested as code completion not working in all but one of the Package.swift files in a multi workspace project.
Some work was done in #1210 to address swiftlang/vscode-swift#768, which is where this issue originated from. However while verifying swiftlang/vscode-swift#768 I found that #1210 didn't fully address code completion of Package.swift files in multi workspace projects.
Also took the opportunity to fix a few deprecation warnings.