Dedupe the hand-rolled file:// conversion behind FileUri - #391
Merged
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #391 +/- ##
============================================
+ Coverage 98.55% 98.57% +0.02%
+ Complexity 1753 1751 -2
============================================
Files 115 116 +1
Lines 4434 4432 -2
============================================
- Hits 4370 4369 -1
+ Misses 64 63 -1 ☔ View full report in Codecov by Harness. |
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
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.
Slice SC.4:
file://URI and path conversion was hand-rolled in three live places,each handling the scheme slightly differently and none of them consistently handling
percent-encoding. One
FileUrireplaces them.Pre-existing duplication owned by no plan step, which is what the SC.* block is for. It
surfaced while splitting S3.7, whose locator wanted a fourth copy; S3.7c is gated on this
landing rather than adding one.
The three sites
FilesystemBackendpathFromUri(decoded) +'file://' . $pathFileUri::toPath/FileUri::fromPathDefaultClassInfoFactoryuriToPath— stripped the scheme, did not decodeFileUri::toPathLocation::fromFileLinestr_starts_with(...) ? $file : 'file://' . $file— never encodedTwo behavior fixes fall out
Both were latent: they only appear when the workspace sits under a path containing a
reserved character, which is ordinary on macOS (
~/My Projects/...).DefaultClassInfoFactorydid not decode, so a class in a directory with a spaceproduced a path that does not exist on disk.
Location::fromFileLinedid not encode, and its output is what a definition or hoverresponse carries to the client — an unencoded space or
#makes that an invalidURI. Covered by a test committed red before the fix.
Not in scope
WorkspaceIndexer:61holds a fourth copy and is deliberately untouched: it is dead codewith zero references, and slice SC.1 deletes the file outright.