move builtin terminal quick fixes to contribution model

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

@@ -7,7 +7,7 @@ import { Event } from 'vs/base/common/event';
 import { IProcessEnvironment, OperatingSystem } from 'vs/base/common/platform';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IPtyHostProcessReplayEvent, ISerializedCommandDetectionCapability, ITerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/capabilities';
+import { IPtyHostProcessReplayEvent, ISerializedCommandDetectionCapability, ITerminalCapabilityStore, ITerminalOutputMatcher } from 'vs/platform/terminal/common/capabilities/capabilities';
 import { IGetTerminalLayoutInfoArgs, IProcessDetails, ISetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess';
 import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { ISerializableEnvironmentVariableCollections } from 'vs/platform/terminal/common/environmentVariable';
@@ -799,6 +799,15 @@ export interface ITerminalContributions {
 	profiles?: ITerminalProfileContribution[];
 }
 
+export interface ITerminalQuickFixContribution {
+	id: string;
+	commandLineMatcher: string | RegExp;
+	outputMatcher: ITerminalOutputMatcher;
+	exitStatus?: boolean;
+	commandToRun?: string;
+	linkToOpen?: string;
+}
+
 export interface ITerminalProfileContribution {
 	title: string;
 	id: string;
@@ -810,6 +819,10 @@ export interface IExtensionTerminalProfile extends ITerminalProfileContribution
 	extensionIdentifier: string;
 }
 
+export interface IExtensionTerminalQuickFix extends ITerminalQuickFixContribution {
+	extensionIdentifier: string;
+}
+
 export type ITerminalProfileObject = ITerminalExecutable | ITerminalProfileSource | IExtensionTerminalProfile | null;
 export type ITerminalProfileType = ITerminalProfile | IExtensionTerminalProfile;
 

src/vs/workbench/contrib/terminal/common/terminal.ts

@@ -717,6 +717,54 @@ export const terminalContributionsDescriptor: IExtensionPointDescriptor = {
 		description: nls.localize('vscode.extension.contributes.terminal', 'Contributes terminal functionality.'),
 		type: 'object',
 		properties: {
+			quickFixes: {
+				type: 'array',
+				description: nls.localize('vscode.extension.contributes.terminal.quickFixes', "Defines quick fixes for terminals with shell integration enabled."),
+				items: {
+					type: 'object',
+					required: ['id', 'commandLineMatcher', 'outputMatcher'],
+					defaultSnippets: [{
+						body: {
+							id: '$1',
+							commandLineMatcher: '$2',
+							outputMatcher: '$3'
+						}
+					}],
+					properties: {
+						id: {
+							description: nls.localize('vscode.extension.contributes.terminal.quickFixes.id', "The ID of the quick fix."),
+							type: 'string',
+						},
+						commandLineMatcher: {
+							description: nls.localize('vscode.extension.contributes.terminal.quickFixes.commandLineMatcher', "The command line to match."),
+							type: 'string',
+						},
+						outputMatcher: {
+							description: nls.localize('vscode.extension.contributes.terminal.quickFixes.outputMatcher', "The output to match."),
+							type: 'object',
+							required: ['lineMatcher', 'anchor', 'offset', 'length'],
+							properties: {
+								lineMatcher: {
+									description: 'The command line to match',
+									type: 'string'
+								},
+								anchor: {
+									description: 'Which side of the output to anchor the offset and length against',
+									enum: ['top', 'bottom']
+								},
+								offset: {
+									description: 'How far from either the top or the bottom of the butter to start matching against.',
+									type: 'number'
+								},
+								length: {
+									description: 'The number of rows to match against, this should be as small as possible for performance reasons',
+									type: 'number'
+								}
+							}
+						},
+					},
+				}
+			},
 			profiles: {
 				type: 'array',
 				description: nls.localize('vscode.extension.contributes.terminal.profiles', "Defines additional terminal profiles that the user can create."),

src/vs/workbench/contrib/terminal/common/terminalExtensionPoints.contribution.ts

@@ -5,5 +5,7 @@
 
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { ITerminalContributionService, TerminalContributionService } from 'vs/workbench/contrib/terminal/common/terminalExtensionPoints';
+import { ITerminalQuickFixContributionsService, TerminalQuickFixContributionService } from 'vs/workbench/contrib/terminal/common/terminalQuickFixExtensionPoint';
 
 registerSingleton(ITerminalContributionService, TerminalContributionService, InstantiationType.Delayed);
+registerSingleton(ITerminalQuickFixContributionsService, TerminalQuickFixContributionService, InstantiationType.Delayed);

src/vs/workbench/contrib/terminal/common/terminalQuickFixExtensionPoint.ts

@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as extensionsRegistry from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { terminalContributionsDescriptor } from 'vs/workbench/contrib/terminal/common/terminal';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IExtensionTerminalQuickFix, ITerminalQuickFixContribution } from 'vs/platform/terminal/common/terminal';
+
+export const terminalQuickFixExtPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint<ITerminalQuickFixContribution>(terminalContributionsDescriptor);
+
+export interface ITerminalQuickFixContributionsService {
+	readonly _serviceBrand: undefined;
+
+	readonly quickFixes: Array<IExtensionTerminalQuickFix>;
+}
+
+export const ITerminalQuickFixContributionsService = createDecorator<ITerminalQuickFixContributionsService>('terminalQuickFixContributionsService');
+
+export class TerminalQuickFixContributionService implements ITerminalQuickFixContributionsService {
+	declare _serviceBrand: undefined;
+
+	private _quickFixes: Array<IExtensionTerminalQuickFix> = [];
+	get quickFixes() { return this._quickFixes; }
+
+	constructor() {
+		terminalQuickFixExtPoint.setHandler(contributions => {
+			for (const c of contributions) {
+				const fix = c.value;
+				this._quickFixes.push({
+					id: fix.id,
+					commandLineMatcher: fix.commandLineMatcher,
+					outputMatcher: fix.outputMatcher,
+					commandToRun: fix.commandToRun,
+					linkToOpen: fix.linkToOpen,
+					extensionIdentifier: c.description.identifier.value
+				});
+			}
+			return this._quickFixes;
+		});
+	}
+}