Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try computing windows paths correctly on markdown drop (#166077)

Browse Source 
Fixes #165352
This commit is contained in:
Matt Bierner
2022-11-13 15:03:05 -08:00
committed by GitHub
parent a74a7644f3
commit a62879bb46
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
extensions/markdown-language-features/src/languageFeatures/dropIntoEditor.ts
View File

@@ -80,9 +80,7 @@ export function createUriListSnippet(document: vscode.TextDocument, uris: readon
const snippet = new vscode.SnippetString();
uris.forEach((uri, i) => {
const mdPath = dir && dir.scheme === uri.scheme && dir.authority === uri.authority
? encodeURI(path.posix.relative(dir.path, uri.path))
: uri.toString(false);
const mdPath = getMdPath(dir, uri);
const ext = URI.Utils.extname(uri).toLowerCase().replace('.', '');
const insertAsImage = typeof options?.insertAsImage === 'undefined' ? imageFileExtensions.has(ext) : !!options.insertAsImage;
@@ -102,6 +100,21 @@ export function createUriListSnippet(document: vscode.TextDocument, uris: readon
return snippet;
}
function getMdPath(dir: vscode.Uri | undefined, file: vscode.Uri) {
if (dir && dir.scheme === file.scheme && dir.authority === file.authority) {
if (file.scheme === Schemes.file) {
// On windows, we must use the native `path.resolve` to generate the relative path
// so that drive-letters are resolved cast insensitively. However we then want to
// convert back to a posix path to insert in to the document.
return encodeURI(path.posix.normalize(path.relative(dir.fsPath, file.fsPath)));
}
return encodeURI(path.posix.relative(dir.path, file.path));
}
return file.toString(false);
}
function getDocumentDir(document: vscode.TextDocument): vscode.Uri | undefined {
const docUri = getParentDocumentUri(document);
if (docUri.scheme === Schemes.untitled) {