only show output button when a command's markers haven't been disposed of (microsoft#154220)

* fix microsoft#154215

* make hasOutput a function

* fix test

* Update src/vs/workbench/contrib/terminal/browser/terminalProfileService.ts

* actually fix tests

Author: meganrogge

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

@@ -198,7 +198,7 @@ export interface ITerminalCommand {
 	executedMarker?: IXtermMarker;
 	commandStartLineContent?: string;
 	getOutput(): string | undefined;
-	hasOutput: boolean;
+	hasOutput(): boolean;
 	genericMarkProperties?: IGenericMarkProperties;
 }
 

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

@@ -457,7 +457,7 @@ export class CommandDetectionCapability implements ICommandDetectionCapability {
 				cwd: this._cwd,
 				exitCode: this._exitCode,
 				commandStartLineContent: this._currentCommand.commandStartLineContent,
-				hasOutput: !!(executedMarker && endMarker && executedMarker?.line < endMarker!.line),
+				hasOutput: () => !executedMarker?.isDisposed && !endMarker?.isDisposed && !!(executedMarker && endMarker && executedMarker?.line < endMarker!.line),
 				getOutput: () => getOutputForCommand(executedMarker, endMarker, buffer),
 				genericMarkProperties: options?.genericMarkProperties
 			};
@@ -579,7 +579,7 @@ export class CommandDetectionCapability implements ICommandDetectionCapability {
 				cwd: e.cwd,
 				commandStartLineContent: e.commandStartLineContent,
 				exitCode: e.exitCode,
-				hasOutput: !!(executedMarker && endMarker && executedMarker.line < endMarker.line),
+				hasOutput: () => !executedMarker?.isDisposed && !endMarker?.isDisposed && !!(executedMarker && endMarker && executedMarker.line < endMarker.line),
 				getOutput: () => getOutputForCommand(executedMarker, endMarker, buffer),
 				genericMarkProperties: e.genericMarkProperties
 			};

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

@@ -877,7 +877,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 						description,
 						id: entry.timestamp.toString(),
 						command: entry,
-						buttons: entry.hasOutput ? buttons : undefined
+						buttons: entry.hasOutput() ? buttons : undefined
 					});
 					commandMap.add(label);
 				}

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

@@ -365,7 +365,7 @@ export class DecorationAddon extends Disposable implements ITerminalAddon {
 				run: () => this._clipboardService.writeText(command.command)
 			});
 		}
-		if (command.hasOutput) {
+		if (command.hasOutput()) {
 			if (actions.length > 0) {
 				actions.push(new Separator());
 			}

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

@@ -341,7 +341,7 @@ export interface ITerminalCommand {
 	cwd?: string;
 	exitCode?: number;
 	marker?: IXtermMarker;
-	hasOutput: boolean;
+	hasOutput(): boolean;
 	getOutput(): string | undefined;
 	genericMarkProperties?: IGenericMarkProperties;
 }

src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkOpeners.test.ts

@@ -110,7 +110,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 				marker: {
 					line: 0
 				} as Partial<IXtermMarker> as any,
-				hasOutput: true
+				hasOutput() { return true; }
 			}]);
 			fileService.setFiles([
 				URI.from({ scheme: Schemas.file, path: '/initial/cwd/foo/bar.txt' }),
@@ -188,7 +188,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 					marker: {
 						line: 0
 					} as Partial<IXtermMarker> as any,
-					hasOutput: true
+					hasOutput() { return true; }
 				}]);
 				await opener.open({
 					text: 'file.txt',
@@ -237,7 +237,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 					marker: {
 						line: 0
 					} as Partial<IXtermMarker> as any,
-					hasOutput: true
+					hasOutput() { return true; }
 				}]);
 				await opener.open({
 					text: 'file.txt',

src/vs/workbench/contrib/terminal/test/browser/xterm/decorationAddon.test.ts

@@ -56,21 +56,21 @@ suite('DecorationAddon', () => {
 
 	suite('registerDecoration', async () => {
 		test('should throw when command has no marker', async () => {
-			throws(() => decorationAddon.registerCommandDecoration({ command: 'cd src', timestamp: Date.now(), hasOutput: false } as ITerminalCommand));
+			throws(() => decorationAddon.registerCommandDecoration({ command: 'cd src', timestamp: Date.now(), hasOutput: () => false } as ITerminalCommand));
 		});
 		test('should return undefined when marker has been disposed of', async () => {
 			const marker = xterm.registerMarker(1);
 			marker?.dispose();
-			strictEqual(decorationAddon.registerCommandDecoration({ command: 'cd src', marker, timestamp: Date.now(), hasOutput: false } as ITerminalCommand), undefined);
+			strictEqual(decorationAddon.registerCommandDecoration({ command: 'cd src', marker, timestamp: Date.now(), hasOutput: () => false } as ITerminalCommand), undefined);
 		});
 		test('should return undefined when command is just empty chars', async () => {
 			const marker = xterm.registerMarker(1);
 			marker?.dispose();
-			strictEqual(decorationAddon.registerCommandDecoration({ command: ' ', marker, timestamp: Date.now(), hasOutput: false } as ITerminalCommand), undefined);
+			strictEqual(decorationAddon.registerCommandDecoration({ command: ' ', marker, timestamp: Date.now(), hasOutput: () => false } as ITerminalCommand), undefined);
 		});
 		test('should return decoration when marker has not been disposed of', async () => {
 			const marker = xterm.registerMarker(2);
-			notEqual(decorationAddon.registerCommandDecoration({ command: 'cd src', marker, timestamp: Date.now(), hasOutput: false } as ITerminalCommand), undefined);
+			notEqual(decorationAddon.registerCommandDecoration({ command: 'cd src', marker, timestamp: Date.now(), hasOutput: () => false } as ITerminalCommand), undefined);
 		});
 	});
 });