Skip to content

Fix percent-encoded drive letter colon (%3A) in Windows file URIs #11293

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

Open
ActaVerba wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix percent-encoded drive letter colon (%3A) in Windows file URIs #11293

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/pyright-internal/src/common/uri/uri.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export type SerializedType = [UriKinds, ...any[]];
import type { Uri as UriInterface } from './uriInterface';
export interface Uri extends UriInterface {}

const _dosPathRegex = /^\/[a-zA-Z]:\//;
const _dosPathRegex = /^\/[a-zA-Z](?::|%3[aA])\//;
const _win32NormalizationRegex = /\//g;

// Returns just the fsPath path portion of a vscode URI.
Expand All @@ -49,9 +49,11 @@ function getFilePath(uri: URI): string {
}

// If this is a DOS-style path with a drive letter, remove
// the leading slash.
// the leading slash and decode percent-encoded colons.
if (filePath.match(_dosPathRegex)) {
filePath = filePath.slice(1);
// Decode %3A/%3a back to ':' for Windows drive letters
filePath = filePath.replace(/^([a-zA-Z])%3[aA]/, '$1:');
}

// vscode.URI normalizes the path to use the correct path separators.
Expand Down