Merge pull request microsoft#250306 from microsoft/tyriar/248589

Import type from xterm/headless

Author: Tyriar

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

@@ -4,41 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Event } from '../../../../base/common/event.js';
-import { IDisposable } from '../../../../base/common/lifecycle.js';
 import type { IPromptInputModel, ISerializedPromptInputModel } from './commandDetection/promptInputModel.js';
 import { ICurrentPartialCommand } from './commandDetection/terminalCommand.js';
 import { ITerminalOutputMatch, ITerminalOutputMatcher } from '../terminal.js';
 import { ReplayEntry } from '../terminalProcess.js';
-
-interface IEvent<T, U = void> {
-	(listener: (arg1: T, arg2: U) => any): IDisposable;
-}
-
-export interface IMarker extends IDisposable {
-	/**
-	 * A unique identifier for this marker.
-	 */
-	readonly id: number;
-
-	/**
-	 * Whether this marker is disposed.
-	 */
-	readonly isDisposed: boolean;
-
-	/**
-	 * The actual line index in the buffer at this point in time. This is set to
-	 * -1 if the marker has been disposed.
-	 */
-	readonly line: number;
-
-	/**
-	 * Event listener to get notified when the marker gets disposed. Automatic disposal
-	 * might happen for a marker, that got invalidated by scrolling out or removal of
-	 * a line from the buffer.
-	 */
-	onDispose: IEvent<void>;
-}
-
+import type { IMarker } from '@xterm/headless';
 
 /**
  * Primarily driven by the shell integration feature, a terminal capability is the mechanism for
@@ -283,8 +253,8 @@ export interface INaiveCwdDetectionCapability {
 
 export interface IPartialCommandDetectionCapability {
 	readonly type: TerminalCapability.PartialCommandDetection;
-	readonly commands: readonly IXtermMarker[];
-	readonly onCommandFinished: Event<IXtermMarker>;
+	readonly commands: readonly IMarker[];
+	readonly onCommandFinished: Event<IMarker>;
 }
 
 interface IBaseTerminalCommand {
@@ -307,9 +277,9 @@ interface IBaseTerminalCommand {
 export interface ITerminalCommand extends IBaseTerminalCommand {
 	// Optional non-serializable
 	readonly promptStartMarker?: IMarker;
-	readonly marker?: IXtermMarker;
-	endMarker?: IXtermMarker;
-	readonly executedMarker?: IXtermMarker;
+	readonly marker?: IMarker;
+	endMarker?: IMarker;
+	readonly executedMarker?: IMarker;
 	readonly aliases?: string[][];
 	readonly wasReplayed?: boolean;
 
@@ -332,15 +302,15 @@ export interface ISerializedTerminalCommand extends IBaseTerminalCommand {
 /**
  * A clone of the IMarker from xterm which cannot be imported from common
  */
-export interface IXtermMarker {
-	readonly id: number;
-	readonly isDisposed: boolean;
-	readonly line: number;
-	dispose(): void;
-	onDispose: {
-		(listener: () => any): { dispose(): void };
-	};
-}
+// export interface IMarker {
+// 	readonly id: number;
+// 	readonly isDisposed: boolean;
+// 	readonly line: number;
+// 	dispose(): void;
+// 	onDispose: {
+// 		(listener: () => any): { dispose(): void };
+// 	};
+// }
 
 export interface IMarkProperties {
 	hoverMessage?: string;

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

@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMarkProperties, IMarker, ISerializedTerminalCommand, ITerminalCommand, IXtermMarker } from '../capabilities.js';
+import { IMarkProperties, ISerializedTerminalCommand, ITerminalCommand } from '../capabilities.js';
 import { ITerminalOutputMatcher, ITerminalOutputMatch } from '../../terminal.js';
-import type { IBuffer, IBufferLine, Terminal } from '@xterm/headless';
+import type { IBuffer, IBufferLine, IMarker, Terminal } from '@xterm/headless';
 
 export interface ITerminalCommandProperties {
 	command: string;
 	commandLineConfidence: 'low' | 'medium' | 'high';
 	isTrusted: boolean;
 	timestamp: number;
 	duration: number;
-	marker: IXtermMarker | undefined;
+	marker: IMarker | undefined;
 	cwd: string | undefined;
 	exitCode: number | undefined;
 	commandStartLineContent: string | undefined;
@@ -22,8 +22,8 @@ export interface ITerminalCommandProperties {
 	startX: number | undefined;
 
 	promptStartMarker?: IMarker | undefined;
-	endMarker?: IXtermMarker | undefined;
-	executedMarker?: IXtermMarker | undefined;
+	endMarker?: IMarker | undefined;
+	executedMarker?: IMarker | undefined;
 	aliases?: string[][] | undefined;
 	wasReplayed?: boolean | undefined;
 }
@@ -38,7 +38,7 @@ export class TerminalCommand implements ITerminalCommand {
 	get promptStartMarker() { return this._properties.promptStartMarker; }
 	get marker() { return this._properties.marker; }
 	get endMarker() { return this._properties.endMarker; }
-	set endMarker(value: IXtermMarker | undefined) { this._properties.endMarker = value; }
+	set endMarker(value: IMarker | undefined) { this._properties.endMarker = value; }
 	get executedMarker() { return this._properties.executedMarker; }
 	get aliases() { return this._properties.aliases; }
 	get wasReplayed() { return this._properties.wasReplayed; }
@@ -361,9 +361,9 @@ export class PartialTerminalCommand implements ICurrentPartialCommand {
 function extractCommandLine(
 	buffer: IBuffer,
 	cols: number,
-	commandStartMarker: IXtermMarker | undefined,
+	commandStartMarker: IMarker | undefined,
 	commandStartX: number | undefined,
-	commandExecutedMarker: IXtermMarker | undefined,
+	commandExecutedMarker: IMarker | undefined,
 	commandExecutedX: number | undefined
 ): string {
 	if (!commandStartMarker || !commandExecutedMarker || commandStartX === undefined || commandExecutedX === undefined) {

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

@@ -8,7 +8,7 @@ import { debounce } from '../../../../base/common/decorators.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable, MandatoryMutableDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { ILogService } from '../../../log/common/log.js';
-import { CommandInvalidationReason, ICommandDetectionCapability, ICommandInvalidationRequest, IHandleCommandOptions, ISerializedCommandDetectionCapability, ISerializedTerminalCommand, ITerminalCommand, IXtermMarker, TerminalCapability } from './capabilities.js';
+import { CommandInvalidationReason, ICommandDetectionCapability, ICommandInvalidationRequest, IHandleCommandOptions, ISerializedCommandDetectionCapability, ISerializedTerminalCommand, ITerminalCommand, TerminalCapability } from './capabilities.js';
 import { ITerminalOutputMatcher } from '../terminal.js';
 import { ICurrentPartialCommand, PartialTerminalCommand, TerminalCommand } from './commandDetection/terminalCommand.js';
 import { PromptInputModel, type IPromptInputModel } from './commandDetection/promptInputModel.js';
@@ -1047,6 +1047,6 @@ function getXtermLineContent(buffer: IBuffer, lineStart: number, lineEnd: number
 	return content;
 }
 
-function cloneMarker(xterm: Terminal, marker: IXtermMarker, offset: number = 0): IXtermMarker | undefined {
+function cloneMarker(xterm: Terminal, marker: IMarker, offset: number = 0): IMarker | undefined {
 	return xterm.registerMarker(marker.line - (xterm.buffer.active.baseY + xterm.buffer.active.cursorY) + offset);
 }

src/vs/workbench/contrib/tasks/browser/taskTerminalStatus.ts

@@ -13,7 +13,7 @@ import { ITaskService, Task } from '../common/taskService.js';
 import { ITerminalInstance } from '../../terminal/browser/terminal.js';
 import { MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { spinningLoading } from '../../../../platform/theme/common/iconRegistry.js';
-import { IMarker } from '../../../../platform/terminal/common/capabilities/capabilities.js';
+import type { IMarker } from '@xterm/xterm';
 import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { ITerminalStatus } from '../../terminal/common/terminal.js';
 

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

@@ -17,7 +17,7 @@ import { IWorkspaceContextService } from '../../../../../../platform/workspace/c
 import { CommandDetectionCapability } from '../../../../../../platform/terminal/common/capabilities/commandDetectionCapability.js';
 import { TerminalBuiltinLinkType } from '../../browser/links.js';
 import { TerminalLocalFileLinkOpener, TerminalLocalFolderInWorkspaceLinkOpener, TerminalSearchLinkOpener } from '../../browser/terminalLinkOpeners.js';
-import { TerminalCapability, IXtermMarker } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { TerminalCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
 import { TerminalCapabilityStore } from '../../../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
 import { IEditorService } from '../../../../../services/editor/common/editorService.js';
 import { IWorkbenchEnvironmentService } from '../../../../../services/environment/common/environmentService.js';
@@ -29,6 +29,7 @@ import { ITerminalLogService } from '../../../../../../platform/terminal/common/
 import { importAMDNodeModule } from '../../../../../../amdX.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 import { TerminalCommand } from '../../../../../../platform/terminal/common/capabilities/commandDetection/terminalCommand.js';
+import type { IMarker } from '@xterm/headless';
 
 interface ITerminalLinkActivationResult {
 	source: 'editor' | 'search';
@@ -148,7 +149,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 				startX: undefined,
 				marker: {
 					line: 0
-				} as Partial<IXtermMarker> as any,
+				} as Partial<IMarker> as any,
 			})]);
 			fileService.setFiles([
 				URI.from({ scheme: Schemas.file, path: '/initial/cwd/foo/bar.txt' }),
@@ -287,7 +288,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 					startX: undefined,
 					marker: {
 						line: 0
-					} as Partial<IXtermMarker> as any,
+					} as Partial<IMarker> as any,
 					exitCode: 0,
 					commandStartLineContent: '',
 					markProperties: {}
@@ -549,7 +550,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 					duration: 0,
 					marker: {
 						line: 0
-					} as Partial<IXtermMarker> as any,
+					} as Partial<IMarker> as any,
 				})]);
 				await opener.open({
 					text: 'file.txt',