revive URI for terminal quick fixes (microsoft#167784)

Author: meganrogge

src/vs/platform/terminal/common/xterm/terminalQuickFix.ts

@@ -6,7 +6,7 @@
 
 import { IAction } from 'vs/base/common/actions';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { UriComponents } from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ITerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities';
 
 export interface ITerminalCommandSelector {
@@ -39,7 +39,7 @@ export interface ITerminalQuickFixCommandAction extends ITerminalQuickFix {
 }
 export interface ITerminalQuickFixOpenerAction extends ITerminalQuickFix {
 	type: 'opener';
-	uri: UriComponents;
+	uri: URI;
 }
 
 export interface ITerminalCommandSelector {

src/vs/workbench/api/browser/mainThreadTerminalService.ts

@@ -20,11 +20,12 @@ import { IStartExtensionTerminalRequest, ITerminalProcessExtHostProxy, ITerminal
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { withNullAsUndefined } from 'vs/base/common/types';
 import { OperatingSystem, OS } from 'vs/base/common/platform';
-import { TerminalEditorLocationOptions } from 'vscode';
+import { TerminalEditorLocationOptions, TerminalQuickFix, TerminalQuickFixOpenerAction } from 'vscode';
 import { Promises } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ITerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ITerminalOutputMatch, ITerminalOutputMatcher, ITerminalQuickFixOptions } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
+import { ITerminalOutputMatch, ITerminalOutputMatcher, ITerminalQuickFix, ITerminalQuickFixOptions } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
+import { TerminalQuickFixType } from 'vs/workbench/api/common/extHostTypes';
 
 @extHostNamedCustomer(MainContext.MainThreadTerminalService)
 export class MainThreadTerminalService implements MainThreadTerminalServiceShape {
@@ -276,19 +277,9 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 					if (matchResult) {
 						const result = await this._proxy.$provideTerminalQuickFixes(id, matchResult, token);
 						if (result && Array.isArray(result)) {
-							return result.map(r => {
-								return {
-									id,
-									source: extensionId,
-									...r
-								};
-							});
+							return result.map(r => parseQuickFix(id, extensionId, r));
 						} else if (result) {
-							return {
-								id,
-								source: extensionId,
-								...result
-							};
+							return parseQuickFix(id, extensionId, result);
 						}
 					}
 					return;
@@ -468,3 +459,10 @@ export function getOutputMatchForLines(lines: string[], outputMatcher: ITerminal
 	const match: RegExpMatchArray | null | undefined = lines.join('\n').match(outputMatcher.lineMatcher);
 	return match ? { regexMatch: match, outputLines: outputMatcher.multipleMatches ? lines : undefined } : undefined;
 }
+
+function parseQuickFix(id: string, source: string, fix: TerminalQuickFix): ITerminalQuickFix {
+	if (fix.type === TerminalQuickFixType.opener) {
+		(fix as TerminalQuickFixOpenerAction).uri = URI.revive((fix as TerminalQuickFixOpenerAction).uri);
+	}
+	return { id, source, ...fix };
+}

src/vs/workbench/contrib/terminal/browser/terminalQuickFixBuiltinActions.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { IInternalOptions, ITerminalCommandMatchResult, TerminalQuickFixActionInternal } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
 import { ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
@@ -184,7 +185,7 @@ export function gitCreatePr(): IInternalOptions {
 				label,
 				enabled: true,
 				type: 'opener',
-				uri: link,
+				uri: URI.parse(link),
 				run: () => { }
 			};
 		}

src/vs/workbench/contrib/terminal/browser/xterm/quickFixAddon.ts

@@ -29,7 +29,8 @@ import { ITerminalQuickFixProviderSelector, ITerminalQuickFixService } from 'vs/
 import { ITerminalQuickFixOptions, IResolvedExtensionOptions, IUnresolvedExtensionOptions, ITerminalCommandSelector, ITerminalQuickFix, IInternalOptions, ITerminalQuickFixCommandAction, ITerminalQuickFixOpenerAction } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
 import { getLinesForCommand } from 'vs/platform/terminal/common/capabilities/commandDetectionCapability';
 import { IAnchor } from 'vs/base/browser/ui/contextview/contextview';
-import { URI } from 'vs/base/common/uri';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { Schemas } from 'vs/base/common/network';
 
 const quickFixTelemetryTitle = 'terminal/quick-fix';
 type QuickFixResultTelemetryEvent = {
@@ -81,7 +82,8 @@ export class TerminalQuickFixAddon extends Disposable implements ITerminalAddon,
 		@ILogService private readonly _logService: ILogService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
 		@ITerminalContributionService private readonly _terminalContributionService: ITerminalContributionService,
-		@IActionWidgetService private readonly _actionWidgetService: IActionWidgetService
+		@IActionWidgetService private readonly _actionWidgetService: IActionWidgetService,
+		@ILabelService private readonly _labelService: ILabelService
 	) {
 		super();
 		const commandDetectionCapability = this._capabilities.get(TerminalCapability.CommandDetection);
@@ -195,7 +197,7 @@ export class TerminalQuickFixAddon extends Disposable implements ITerminalAddon,
 			}
 			return provider.provideTerminalQuickFixes(command, lines, { type: 'resolved', commandLineMatcher: selector.commandLineMatcher, outputMatcher: selector.outputMatcher, exitStatus: selector.exitStatus, id: selector.id }, new CancellationTokenSource().token);
 		};
-		const result = await getQuickFixesForCommand(aliases, terminal, command, this._commandListeners, this._openerService, this._onDidRequestRerunCommand, resolver);
+		const result = await getQuickFixesForCommand(aliases, terminal, command, this._commandListeners, this._openerService, this._labelService, this._onDidRequestRerunCommand, resolver);
 		if (!result) {
 			return;
 		}
@@ -280,6 +282,7 @@ export async function getQuickFixesForCommand(
 	terminalCommand: ITerminalCommand,
 	quickFixOptions: Map<string, ITerminalQuickFixOptions[]>,
 	openerService: IOpenerService,
+	labelService: ILabelService,
 	onDidRequestRerunCommand?: Emitter<{ command: string; addNewLine?: boolean }>,
 	getResolvedFixes?: (selector: ITerminalQuickFixOptions, lines?: string[]) => Promise<ITerminalQuickFix | ITerminalQuickFix[] | undefined>
 ): Promise<ITerminalAction[] | undefined> {
@@ -344,26 +347,18 @@ export async function getQuickFixesForCommand(
 							}
 							case TerminalQuickFixType.Opener: {
 								const fix = quickFix as ITerminalQuickFixOpenerAction;
-								const label = localize('quickFix.opener', 'Open: {0}', fix.uri.toString());
+								if (!fix.uri) {
+									return;
+								}
+								const uriLabel = (fix.uri.scheme === Schemas.http || fix.uri.scheme === Schemas.https) ? encodeURI(fix.uri.toString(true)) : labelService.getUriLabel(fix.uri);
+								const label = localize('quickFix.opener', 'Open: {0}', uriLabel);
 								action = {
 									source: quickFix.source,
 									id: quickFix.id,
 									label,
 									class: quickFix.type,
 									enabled: true,
-									run: () => {
-										let uri: URI | undefined;
-										if (URI.isUri(fix.uri)) {
-											uri = fix.uri;
-										} else if (typeof fix.uri === 'string') {
-											uri = URI.parse(fix.uri);
-										}
-
-										if (!uri) {
-											return;
-										}
-										openerService.open(uri);
-									},
+									run: () => openerService.open(fix.uri),
 									tooltip: label,
 									uri: fix.uri
 								} as ITerminalAction;