don't over-encode, do try to decode, fixes microsoft#85521

jrieken · jrieken · commit 9227460df47a · 2019-11-25T16:58:54.000+01:00
diff --git a/src/vs/editor/browser/services/openerService.ts b/src/vs/editor/browser/services/openerService.ts
@@ -34,12 +34,17 @@ class CommandOpener implements IOpener {
 		// execute as command
 		let args: any = [];
 		try {
-			args = parse(target.query);
-			if (!Array.isArray(args)) {
-				args = [args];
+			args = parse(decodeURIComponent(target.query));
+		} catch {
+			// ignore and retry
+			try {
+				args = parse(target.query);
+			} catch {
+				// ignore error
 			}
-		} catch (e) {
-			// ignore error
+		}
+		if (!Array.isArray(args)) {
+			args = [args];
 		}
 		await this._commandService.executeCommand(target.path, ...args);
 		return true;
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -289,16 +289,23 @@ export namespace MarkdownString {
 		if (!data) {
 			return part;
 		}
+		let changed = false;
 		data = cloneAndChange(data, value => {
 			if (URI.isUri(value)) {
 				const key = `__uri_${Math.random().toString(16).slice(2, 8)}`;
 				bucket[key] = value;
+				changed = true;
 				return key;
 			} else {
 				return undefined;
 			}
 		});
-		return encodeURIComponent(JSON.stringify(data));
+
+		if (!changed) {
+			return part;
+		}
+
+		return JSON.stringify(data);
 	}
 
 	export function to(value: htmlContent.IMarkdownString): vscode.MarkdownString {
