ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix quoted link failures by removing quotes from unescaped paths, rather than just the escaped paths. (#17419)

Browse Source
This commit is contained in:
Cory Rivera
2021-10-20 18:12:39 -07:00
committed by GitHub
parent 6fb66e5de6
commit 0bc8e54568
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/workbench/contrib/notebook/browser/calloutDialog/common/utils.ts
View File

@@ -45,7 +45,7 @@ export function unquoteText(quotedText: string): string {
let doubleQuotesRegex = /^[\"\'](.*)[\"\']$/; let doubleQuotesRegex = /^[\"\'](.*)[\"\']$/;
let matches = doubleQuotesRegex.exec(quotedText); let matches = doubleQuotesRegex.exec(quotedText);
if (matches && matches[1]) { if (matches && matches[1]) {
quotedText = matches[1]; return matches[1];
} }
return quotedText; return quotedText;
} }

5
src/sql/workbench/contrib/notebook/browser/calloutDialog/linkCalloutDialog.ts
View File

@@ -158,7 +158,8 @@ export class LinkCalloutDialog extends Modal {
public insert(): void { public insert(): void {
this.hide('ok'); this.hide('ok');
let escapedLabel = escapeLabel(this._linkTextInputBox.value); let escapedLabel = escapeLabel(this._linkTextInputBox.value);
let escapedUrl = escapeUrl(unquoteText(this._linkUrlInputBox.value)); let unquotedUrl = unquoteText(this._linkUrlInputBox.value);
let escapedUrl = escapeUrl(unquotedUrl);
if (this._previouslySelectedRange) { if (this._previouslySelectedRange) {
// Reset selection to previous state before callout was open // Reset selection to previous state before callout was open
@@ -169,7 +170,7 @@ export class LinkCalloutDialog extends Modal {
this._selectionComplete.resolve({ this._selectionComplete.resolve({
insertEscapedMarkdown: `[${escapedLabel}](${escapedUrl})`, insertEscapedMarkdown: `[${escapedLabel}](${escapedUrl})`,
insertUnescapedLinkLabel: this._linkTextInputBox.value, insertUnescapedLinkLabel: this._linkTextInputBox.value,
insertUnescapedLinkUrl: this._linkUrlInputBox.value insertUnescapedLinkUrl: unquotedUrl
}); });
} }
} }

22
src/sql/workbench/contrib/notebook/test/calloutDialog/linkCalloutDialog.test.ts
View File

@@ -146,4 +146,26 @@ suite('Link Callout Dialog', function (): void {
assert.strictEqual(result.insertEscapedMarkdown, `[${defaultLabel}](${sampleUrl})`, 'Markdown not returned correctly'); assert.strictEqual(result.insertEscapedMarkdown, `[${defaultLabel}](${sampleUrl})`, 'Markdown not returned correctly');
}); });
test('Should handle quoted URLs properly', async function (): Promise<void> {
const defaultLabel = 'defaultLabel';
const unquotedUrl = 'C:/Test/Test.ipynb';
const quotedUrl = `"${unquotedUrl}"`;
let linkCalloutDialog = new LinkCalloutDialog('Title', 'below', defaultDialogProperties, defaultLabel, '',
undefined, themeService, layoutService, telemetryService, contextKeyService, undefined, undefined, undefined);
linkCalloutDialog.render();
let deferred = new Deferred<ILinkCalloutDialogOptions>();
// When I first open the callout dialog
linkCalloutDialog.open().then(value => {
deferred.resolve(value);
});
linkCalloutDialog.url = quotedUrl;
// And insert the dialog
linkCalloutDialog.insert();
let result = await deferred.promise;
assert.strictEqual(result.insertUnescapedLinkLabel, defaultLabel, 'Label not returned correctly');
assert.strictEqual(result.insertUnescapedLinkUrl, unquotedUrl, 'URL not unquoted correctly');
assert.strictEqual(result.insertEscapedMarkdown, `[${defaultLabel}](${unquotedUrl})`, 'Markdown not unquoted correctly');
});
}); });