Skip to content

Use AbsolutePath.asURL instead of creating a new URL from the path string #8159

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

Jump to bottom
Merged
merged 2 commits into from
Dec 6, 2024
Merged

Use AbsolutePath.asURL instead of creating a new URL from the path string #8159

merged 2 commits into from
Dec 6, 2024

Conversation

matthewbastien
Copy link
Member

Use AbsolutePath.asURL instead of creating a new URL from the path string.

Motivation:

The original PR that added resources, ignored, and other files to BuildTarget should have used AbsolutePath.asURL instead of creating a new URL from the path string. This PR fixes that in order to maintain a single location where absolute paths can be converted to URLs.

Modifications:

I've replaced the AbsolutePath to URL mappings in SourceKitLSPAPI with calls to AbsolutePath.asURL.

Result:

This PR does not have an affect on the functionality of Swift Package Manager.

@matthewbastien
Copy link
Member Author

@swift-ci please test

@matthewbastien matthewbastien mentioned this pull request Dec 5, 2024
Merged
@plemarquand plemarquand enabled auto-merge (squash) December 5, 2024 16:14
ahoppen
ahoppen reviewed Dec 5, 2024
View reviewed changes
Copy link
Member

@ahoppen ahoppen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you also change https://github.com/swiftlang/swift-package-manager/pull/8107/files#diff-72ff8dbc42cccd7358baab7677ff143ef74abd789f8778461d575b450a0eacebR137 and https://github.com/swiftlang/swift-package-manager/pull/8107/files#diff-c7f0bf510ced31ce26ddf0df789cdd1913ae460e430aca0f1e12287d1aae2f5cR44?

@plemarquand plemarquand disabled auto-merge December 5, 2024 18:10
@matthewbastien
Copy link
Member Author

matthewbastien commented Dec 5, 2024 •
edited
Loading

Could you also change https://github.com/swiftlang/swift-package-manager/pull/8107/files#diff-72ff8dbc42cccd7358baab7677ff143ef74abd789f8778461d575b450a0eacebR137 and https://github.com/swiftlang/swift-package-manager/pull/8107/files#diff-c7f0bf510ced31ce26ddf0df789cdd1913ae460e430aca0f1e12287d1aae2f5cR44?

Whoops I missed those. They have been updated now. Thanks!

@matthewbastien
Copy link
Member Author

@swift-ci please test

@MaxDesiatov
Copy link
Contributor

@swift-ci test windows

@matthewbastien matthewbastien merged commit 4073657 into swiftlang:main Dec 6, 2024
5 checks passed
@matthewbastien matthewbastien deleted the sourcekit-lsp-fixes branch December 6, 2024 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@plemarquand plemarquand plemarquand approved these changes

@ahoppen ahoppen ahoppen approved these changes

@bnbarham bnbarham Awaiting requested review from bnbarham bnbarham is a code owner

@MaxDesiatov MaxDesiatov Awaiting requested review from MaxDesiatov MaxDesiatov is a code owner

@jakepetroules jakepetroules Awaiting requested review from jakepetroules jakepetroules is a code owner

@francescomikulis francescomikulis Awaiting requested review from francescomikulis

@xedin xedin Awaiting requested review from xedin xedin is a code owner

@dschaefer2 dschaefer2 Awaiting requested review from dschaefer2 dschaefer2 is a code owner

@shawnhyam shawnhyam Awaiting requested review from shawnhyam shawnhyam is a code owner

@bripeticca bripeticca Awaiting requested review from bripeticca bripeticca is a code owner

@owenv owenv Awaiting requested review from owenv owenv is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@matthewbastien @MaxDesiatov @plemarquand @ahoppen