Skip to content

Commit 12985b6

Browse files
Links are not automatically pasted as markdown over valid urls (microsoft#189347)
* check if selected text is link
1 parent 895f824 commit 12985b6

File tree

3 files changed

+33
-20
lines changed

3 files changed

+33
-20
lines changed

extensions/markdown-language-features/src/languageFeatures/copyFiles/copyPasteLinks.ts

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import * as vscode from 'vscode';
7-
import { externalUriSchemes, createEditAddingLinksForUriList, getPasteUrlAsFormattedLinkSetting, PasteUrlAsFormattedLink } from './shared';
7+
import { createEditAddingLinksForUriList, getPasteUrlAsFormattedLinkSetting, PasteUrlAsFormattedLink, validateLink } from './shared';
88
class PasteLinkEditProvider implements vscode.DocumentPasteEditProvider {
99

1010
readonly id = 'insertMarkdownLink';
@@ -46,22 +46,6 @@ class PasteLinkEditProvider implements vscode.DocumentPasteEditProvider {
4646
}
4747
}
4848

49-
export function validateLink(urlList: string): { isValid: boolean; cleanedUrlList: string } {
50-
let isValid = false;
51-
let uri = undefined;
52-
const trimmedUrlList = urlList?.trim(); //remove leading and trailing whitespace and new lines
53-
try {
54-
uri = vscode.Uri.parse(trimmedUrlList);
55-
} catch (error) {
56-
return { isValid: false, cleanedUrlList: urlList };
57-
}
58-
const splitUrlList = trimmedUrlList.split(' ').filter(item => item !== ''); //split on spaces and remove empty strings
59-
if (uri) {
60-
isValid = splitUrlList.length === 1 && !splitUrlList[0].includes('\n') && externalUriSchemes.includes(vscode.Uri.parse(splitUrlList[0]).scheme) && !!vscode.Uri.parse(splitUrlList[0]).authority;
61-
}
62-
return { isValid, cleanedUrlList: splitUrlList[0] };
63-
}
64-
6549
export function registerLinkPasteSupport(selector: vscode.DocumentSelector,) {
6650
return vscode.languages.registerDocumentPasteEditProvider(selector, new PasteLinkEditProvider(), {
6751
pasteMimeTypes: [

extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ export async function createEditAddingLinksForUriList(
151151

152152
export function checkSmartPaste(document: SkinnyTextDocument, selectedRange: vscode.Range): SmartPaste {
153153
const SmartPaste: SmartPaste = { pasteAsMarkdownLink: true, updateTitle: false };
154-
if (selectedRange.isEmpty || /^[\s\n]*$/.test(document.getText(selectedRange))) {
154+
if (selectedRange.isEmpty || /^[\s\n]*$/.test(document.getText(selectedRange)) || validateLink(document.getText(selectedRange)).isValid) {
155155
return { pasteAsMarkdownLink: false, updateTitle: false };
156156
}
157157
for (const regex of smartPasteRegexes) {
@@ -170,6 +170,22 @@ export function checkSmartPaste(document: SkinnyTextDocument, selectedRange: vsc
170170
return SmartPaste;
171171
}
172172

173+
export function validateLink(urlList: string): { isValid: boolean; cleanedUrlList: string } {
174+
let isValid = false;
175+
let uri = undefined;
176+
const trimmedUrlList = urlList?.trim(); //remove leading and trailing whitespace and new lines
177+
try {
178+
uri = vscode.Uri.parse(trimmedUrlList);
179+
} catch (error) {
180+
return { isValid: false, cleanedUrlList: urlList };
181+
}
182+
const splitUrlList = trimmedUrlList.split(' ').filter(item => item !== ''); //split on spaces and remove empty strings
183+
if (uri) {
184+
isValid = splitUrlList.length === 1 && !splitUrlList[0].includes('\n') && externalUriSchemes.includes(vscode.Uri.parse(splitUrlList[0]).scheme) && !!vscode.Uri.parse(splitUrlList[0]).authority;
185+
}
186+
return { isValid, cleanedUrlList: splitUrlList[0] };
187+
}
188+
173189
export async function tryGetUriListSnippet(document: SkinnyTextDocument, urlList: String, token: vscode.CancellationToken, title = '', placeHolderValue = 0, pasteAsMarkdownLink = true, isExternalLink = false): Promise<{ snippet: vscode.SnippetString; label: string } | undefined> {
174190
if (token.isCancellationRequested) {
175191
return undefined;

extensions/markdown-language-features/src/test/markdownLink.test.ts

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
import * as vscode from 'vscode';
66
import * as assert from 'assert';
77
import 'mocha';
8-
import { SkinnyTextDocument, checkSmartPaste, createEditAddingLinksForUriList, appendToLinkSnippet } from '../languageFeatures/copyFiles/shared';
9-
import { validateLink } from '../languageFeatures/copyFiles/copyPasteLinks';
8+
import { SkinnyTextDocument, checkSmartPaste, createEditAddingLinksForUriList, appendToLinkSnippet, validateLink } from '../languageFeatures/copyFiles/shared';
109
suite('createEditAddingLinksForUriList', () => {
1110

1211
test('Markdown Link Pasting should occur for a valid link (end to end)', async () => {
@@ -170,6 +169,20 @@ suite('createEditAddingLinksForUriList', () => {
170169
assert.strictEqual(smartPaste.pasteAsMarkdownLink, true);
171170
});
172171

172+
test('Should evaluate pasteAsMarkdownLink as false for a valid selected link', () => {
173+
skinnyDocument.getText = function () { return 'https://www.microsoft.com'; };
174+
const range = new vscode.Range(0, 0, 0, 25);
175+
const smartPaste = checkSmartPaste(skinnyDocument, range);
176+
assert.strictEqual(smartPaste.pasteAsMarkdownLink, false);
177+
});
178+
179+
test('Should evaluate pasteAsMarkdownLink as false for a valid selected link with trailing whitespace', () => {
180+
skinnyDocument.getText = function () { return ' https://www.microsoft.com '; };
181+
const range = new vscode.Range(0, 0, 0, 30);
182+
const smartPaste = checkSmartPaste(skinnyDocument, range);
183+
assert.strictEqual(smartPaste.pasteAsMarkdownLink, false);
184+
});
185+
173186
test('Should evaluate pasteAsMarkdownLink as false for no selection', () => {
174187
const range = new vscode.Range(0, 0, 0, 0);
175188
const smartPaste = checkSmartPaste(skinnyDocument, range);

0 commit comments

Comments
 (0)