From 1c75f217f39b73e89aa51c0d6ecb6fb45342e57a Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Sun, 31 Mar 2024 22:15:53 -0700 Subject: [PATCH] Limit drop disablement to just http(s) uris For #209239 --- .../languageFeatures/copyFiles/dropOrPasteResource.ts | 9 +++++++-- .../src/languageFeatures/copyFiles/shared.ts | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropOrPasteResource.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropOrPasteResource.ts index 73a012dacecce..ef5310013b83a 100644 --- a/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropOrPasteResource.ts +++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropOrPasteResource.ts @@ -156,9 +156,14 @@ class ResourcePasteOrDropProvider implements vscode.DocumentPasteEditProvider, v return; } - // Disable ourselves if there's also a text entry with the same content as our list, + // In some browsers, copying from the address bar sets both text/uri-list and text/plain. + // Disable ourselves if there's also a text entry with the same http(s) uri as our list, // unless we are explicitly requested. - if (uriList.entries.length === 1 && !context?.only?.contains(ResourcePasteOrDropProvider.kind)) { + if ( + uriList.entries.length === 1 + && (uriList.entries[0].uri.scheme === Schemes.http || uriList.entries[0].uri.scheme === Schemes.https) + && !context?.only?.contains(ResourcePasteOrDropProvider.kind) + ) { const text = await dataTransfer.get(Mime.textPlain)?.asString(); if (token.isCancellationRequested) { return; diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts index 563c125cfc611..87e2a0eaeb506 100644 --- a/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts +++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts @@ -74,7 +74,6 @@ export function createInsertUriListEdit( return; } - const edits: vscode.SnippetTextEdit[] = []; let insertedLinkCount = 0;