-
Notifications
You must be signed in to change notification settings - Fork 4.3k
fix(core): normalize workspace dir paths to file:// URIs #11561
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
Open
BillionClaw
wants to merge
1
commit into
continuedev:main
Choose a base branch
from
BillionClaw:clawoss/fix/11559-file-path-resolution
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+131
−2
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| import { describe, expect, it, vi } from "vitest"; | ||
| import { IDE } from ".."; | ||
| import { | ||
| inferResolvedUriFromRelativePath, | ||
| normalizeDirUri, | ||
| resolveRelativePathInDir, | ||
| } from "./ideUtils"; | ||
|
|
||
| describe("normalizeDirUri", () => { | ||
| it("should pass through file:// URIs unchanged", () => { | ||
| expect(normalizeDirUri("file:///home/user/project")).toBe( | ||
| "file:///home/user/project", | ||
| ); | ||
| }); | ||
|
|
||
| it("should convert Linux absolute path to file:// URI", () => { | ||
| expect(normalizeDirUri("/home/user/project")).toBe("file:///home/user/project"); | ||
| }); | ||
|
|
||
| it("should encode special characters in Linux paths", () => { | ||
| expect(normalizeDirUri("/home/user/my project")).toBe("file:///home/user/my%20project"); | ||
| }); | ||
|
|
||
| it("should convert Windows drive path to file:// URI", () => { | ||
| expect(normalizeDirUri("C:\\Users\\user\\project")).toBe("file:///C%3A/Users/user/project"); | ||
| }); | ||
| }); | ||
|
|
||
| function createMockIde(opts: { | ||
| workspaceDirs: string[]; | ||
| existingFiles?: Set<string>; | ||
| }): IDE { | ||
| const existingFiles = opts.existingFiles ?? new Set<string>(); | ||
| return { | ||
| getWorkspaceDirs: vi.fn(async () => opts.workspaceDirs), | ||
| fileExists: vi.fn(async (uri: string) => existingFiles.has(uri)), | ||
| } as unknown as IDE; | ||
| } | ||
|
|
||
| describe("resolveRelativePathInDir", () => { | ||
| it("should resolve a relative path against a proper file:// workspace dir", async () => { | ||
| const ide = createMockIde({ | ||
| workspaceDirs: ["file:///home/user/project"], | ||
| existingFiles: new Set(["file:///home/user/project/src/file.ts"]), | ||
| }); | ||
| const result = await resolveRelativePathInDir("src/file.ts", ide); | ||
| expect(result).toBe("file:///home/user/project/src/file.ts"); | ||
| }); | ||
|
|
||
| it("should resolve when workspace dir is a plain Linux path (bug #11559)", async () => { | ||
| const ide = createMockIde({ | ||
| workspaceDirs: ["/home/user/project"], | ||
| existingFiles: new Set(["file:///home/user/project/src/file.ts"]), | ||
| }); | ||
| const result = await resolveRelativePathInDir("src/file.ts", ide); | ||
| expect(result).toBe("file:///home/user/project/src/file.ts"); | ||
| }); | ||
|
|
||
| it("should NOT produce a double-prefixed path (regression guard)", async () => { | ||
| const ide = createMockIde({ | ||
| workspaceDirs: ["/home/user/project"], | ||
| existingFiles: new Set(["file:///home/user/project/src/file.ts"]), | ||
| }); | ||
| const result = await resolveRelativePathInDir("src/file.ts", ide); | ||
| expect(result).not.toContain("/home/user/home/"); | ||
| }); | ||
| }); | ||
|
|
||
| describe("inferResolvedUriFromRelativePath", () => { | ||
| it("should join relative path to normalized workspace dir", async () => { | ||
| const ide = createMockIde({ | ||
| workspaceDirs: ["file:///home/user/project"], | ||
| }); | ||
| const result = await inferResolvedUriFromRelativePath("src/file.ts", ide); | ||
| expect(result).toBe("file:///home/user/project/src/file.ts"); | ||
| }); | ||
|
|
||
| it("should produce correct URI when workspace dir is plain path (bug #11559)", async () => { | ||
| const ide = createMockIde({ | ||
| workspaceDirs: ["/home/user/project"], | ||
| }); | ||
| const result = await inferResolvedUriFromRelativePath("src/file.ts", ide); | ||
| expect(result).toBe("file:///home/user/project/src/file.ts"); | ||
| }); | ||
|
|
||
| it("should NOT produce double-prefixed path (regression guard)", async () => { | ||
| const ide = createMockIde({ | ||
| workspaceDirs: ["/home/user/project"], | ||
| }); | ||
| const result = await inferResolvedUriFromRelativePath("src/file.ts", ide); | ||
| expect(result).not.toContain("/home/user/home/"); | ||
| }); | ||
| }); |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P2: UNC Windows workspace paths are not normalized to
file://URIs, so network-share directories can still bypass the new fix and break relative-path URI resolution.Prompt for AI agents