clean up

Author: meganrogge

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

@@ -12,7 +12,6 @@ import { ITerminalProfileContribution } from 'vs/platform/terminal/common/termin
 
 export interface ITerminalCommandSelector {
 	id: string;
-	extensionId: string;
 	commandLineMatcher: string | RegExp;
 	outputMatcher?: ITerminalOutputMatcher;
 	exitStatus: boolean;
@@ -25,29 +24,25 @@ export interface ITerminalQuickFixOptions {
 	commandLineMatcher: string | RegExp;
 	outputMatcher?: ITerminalOutputMatcher;
 	exitStatus: boolean;
-	extensionId?: string;
 }
 
 export interface ITerminalQuickFix {
 	type: 'command' | 'opener';
-	id?: string;
+	id: string;
 	source: string;
 }
 
 export interface ITerminalQuickFixCommandAction extends ITerminalQuickFix {
 	type: 'command';
 	terminalCommand: string;
-	id: string;
 	// TODO: Should this depend on whether alt is held?
 	addNewLine?: boolean;
 }
 export interface ITerminalQuickFixOpenerAction extends ITerminalQuickFix {
 	type: 'opener';
-	id: string;
 	uri: UriComponents;
 }
 
-
 export interface ITerminalCommandSelector {
 	commandLineMatcher: string | RegExp;
 	outputMatcher?: ITerminalOutputMatcher;
@@ -59,7 +54,6 @@ export type TerminalQuickFixCallback = (matchResult: ITerminalCommandMatchResult
 export type TerminalQuickFixCallbackExtension = (terminalCommand: ITerminalCommand, lines: string[] | undefined, option: ITerminalQuickFixOptions, token: CancellationToken) => Promise<ITerminalQuickFix[] | ITerminalQuickFix | undefined>;
 
 export interface ITerminalQuickFixProvider {
-	extensionId: string;
 	/**
 	 * Provides terminal quick fixes
 	 * @param commandMatchResult The command match result for which to provide quick fixes
@@ -84,11 +78,9 @@ export interface IInternalOptions extends ITerminalQuickFixOptions {
 	getQuickFixes: TerminalQuickFixCallback;
 }
 
-
 export interface IResolvedExtensionOptions extends ITerminalQuickFixOptions {
 	type: 'resolved';
 	getQuickFixes: TerminalQuickFixCallbackExtension;
-	extensionId: string;
 }
 
 export interface IUnresolvedExtensionOptions extends ITerminalQuickFixOptions {
@@ -100,10 +92,6 @@ export interface ITerminalContributions {
 	quickFixes?: ITerminalCommandSelector[];
 }
 
-export interface IExtensionTerminalQuickFix extends ITerminalQuickFixOptions {
-	extensionIdentifier: string;
-}
-
 
 /**
  * A matcher that runs on a sub-section of a terminal command's output

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

@@ -251,7 +251,6 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 	public async $registerQuickFixProvider(id: string, extensionId: string): Promise<void> {
 		this._quickFixProviders.set(id, this._terminalQuickFixService.registerQuickFixProvider(id,
 			{
-				extensionId,
 				provideTerminalQuickFixes: async (terminalCommand: ITerminalCommand, lines: string[], option: ITerminalQuickFixOptions, token: CancellationToken) => {
 					if (token.isCancellationRequested) {
 						return;
@@ -279,12 +278,14 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 						if (result && Array.isArray(result)) {
 							return result.map(r => {
 								return {
+									id,
 									source: extensionId,
 									...r
 								};
 							});
 						} else if (result) {
 							return {
+								id,
 								source: extensionId,
 								...result
 							};

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

@@ -421,7 +421,6 @@ function convertToQuickFixOptions(selectorProvider: ITerminalQuickFixProviderSel
 		commandLineMatcher: selectorProvider.selector.commandLineMatcher,
 		outputMatcher: selectorProvider.selector.outputMatcher,
 		exitStatus: selectorProvider.selector.exitStatus,
-		getQuickFixes: selectorProvider.provider.provideTerminalQuickFixes,
-		extensionId: selectorProvider.provider.extensionId
+		getQuickFixes: selectorProvider.provider.provideTerminalQuickFixes
 	};
 }