Fix relative path for inserted url()

For microsoft#224190
mjbvz · Jul 29, 2024 · de3c6e2 · de3c6e2
1 parent b755f23
commit de3c6e2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/extensions/css-language-features/client/src/dropOrPaste/dropOrPasteResource.ts b/extensions/css-language-features/client/src/dropOrPaste/dropOrPasteResource.ts
@@ -5,7 +5,7 @@
 
 import * as path from 'path';
 import * as vscode from 'vscode';
-import { getDocumentDir, Mimes, Schemes } from './shared';
+import { Mimes, Schemes } from './shared';
 import { UriList } from './uriList';
 
 class DropOrPasteResourceProvider implements vscode.DocumentDropEditProvider, vscode.DocumentPasteEditProvider {
@@ -115,17 +115,17 @@ class DropOrPasteResourceProvider implements vscode.DocumentDropEditProvider, vs
 }
 
 function getRelativePath(file: vscode.Uri): string | undefined {
-	const dir = getDocumentDir(file);
-	if (dir && dir.scheme === file.scheme && dir.authority === file.authority) {
+	const workspaceUri = vscode.workspace.getWorkspaceFolder(file)?.uri;
+	if (workspaceUri && workspaceUri.scheme === file.scheme && workspaceUri.authority === file.authority) {
 		if (file.scheme === Schemes.file) {
 			// On windows, we must use the native `path.relative` 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
-			const relativePath = path.relative(dir.fsPath, file.fsPath);
+			const relativePath = path.relative(workspaceUri.fsPath, file.fsPath);
 			return path.posix.normalize(relativePath.split(path.sep).join(path.posix.sep));
 		}
 
-		return path.posix.relative(dir.path, file.path);
+		return path.posix.relative(workspaceUri.path, file.path);
 	}
 
 	return undefined;

diff --git a/extensions/css-language-features/client/src/dropOrPaste/shared.ts b/extensions/css-language-features/client/src/dropOrPaste/shared.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { Utils } from 'vscode-uri';
 
 export const Schemes = Object.freeze({
 	file: 'file',
@@ -17,16 +16,7 @@ export const Mimes = Object.freeze({
 	uriList: 'text/uri-list',
 });
 
-
-export function getDocumentDir(uri: vscode.Uri): vscode.Uri | undefined {
-	const docUri = getParentDocumentUri(uri);
-	if (docUri.scheme === Schemes.untitled) {
-		return vscode.workspace.workspaceFolders?.[0]?.uri;
-	}
-	return Utils.dirname(docUri);
-}
-
-function getParentDocumentUri(uri: vscode.Uri): vscode.Uri {
+export function getParentDocumentUri(uri: vscode.Uri): vscode.Uri {
 	if (uri.scheme === Schemes.notebookCell) {
 		// is notebook documents necessary?
 		for (const notebook of vscode.workspace.notebookDocuments) {