Use DocumentURI instead of URL in more locations
#1395
Merged
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
|
@swift-ci Please test |
hamishknight
approved these changes
Jun 3, 2024
| try await swiftpmBuildSystem.generateBuildGraph(allowFileSystemWrites: false) | ||
|
|
||
| let aPlusSomething = packageRoot.appending(components: "Sources", "lib", "a+something.swift") | ||
| print(aPlusSomething.asURL) |
There was a problem hiding this comment.
Left over from debugging?
| ) | ||
| ) | ||
| .compilerArguments | ||
| print(arguments) |
There was a problem hiding this comment.
Left over from debugging?
There was a problem hiding this comment.
Yes, I guess I should add an actual check 🙈
|
@swift-ci Please test |
|
@swift-ci Please test Windows |
bnbarham
approved these changes
Jun 3, 2024
| let substituteFile = buildTarget.sources.sorted(by: { $0.path < $1.path }).first | ||
| { | ||
| logger.info("😅 Getting compiler arguments for \(url) using substitute file \(substituteFile)") |
There was a problem hiding this comment.
No, added it during debugging so I could find this log message more easily. Intended to remove it afterwards and forgot.
|
@swift-ci Please test |
|
@swift-ci Please test Windows |
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.
The originator for this change was that I noticed that we weren’t able to index files that contain a
+because we wouldn’t get build settings for them. This is becauseSwiftPMBuildSystemhad a URL comparison to check if the file that we are requesting build settings for is part of the target’s source files. Now, the target’s source files represented the+as a literal+while the requested file name had it escaped as%2B, so we incorrectly inferred that the source file was not part of the target.DocumentURIaccounts for this and compares the scheme + normalized path separately. So, the solution is to work in terms ofDocumentURIinSwiftPMBuildSystem.While doing this, I also changed other files to use
DocumentURIinstead ofURLin case they have similar issues.