@opensumi/ide-terminal-next 3.7.1 → 3.7.2-next-1739848467.0

package/src/browser/terminal.controller.ts

@@ -23,7 +23,6 @@ import {
 } from '@opensumi/ide-core-common';
 import { WorkbenchEditorService } from '@opensumi/ide-editor';
 import { IMainLayoutService } from '@opensumi/ide-main-layout';
-import { TabBarHandler } from '@opensumi/ide-main-layout/lib/browser/tabbar-handler';
 import { IThemeService } from '@opensumi/ide-theme';
 
 import {
@@ -62,7 +61,6 @@ import { TerminalGroupViewService } from './terminal.view';
 @Injectable()
 export class TerminalController extends WithEventBus implements ITerminalController {
   protected _focus: boolean;
-  protected _tabBarHandler: TabBarHandler | undefined;
   protected _clients: Map<string, ITerminalClient>;
   protected _onDidOpenTerminal = new Emitter<ITerminalInfo>();
   protected _onDidCloseTerminal = new Emitter<ITerminalExitEvent>();
@@ -199,6 +197,10 @@ export class TerminalController extends WithEventBus implements ITerminalControl
     return this._clientId;
   }
 
+  get _tabBarHandler() {
+    return this.layoutService.getTabbarHandler(TERMINAL_CONTAINER_ID);
+  }
+
   private async _createClientOrIgnore(widget: IWidget) {
     if (this._clients.has(widget.id)) {
       return this._clients.get(widget.id)!;
@@ -397,11 +399,9 @@ export class TerminalController extends WithEventBus implements ITerminalControl
   }
 
   initContextKey(dom: HTMLDivElement) {
-    if (!this.terminalContextKey) {
-      this.terminalContextKey = this.injector.get(TerminalContextKey, [dom]);
-      this.terminalContextKey.isTerminalFocused.set(this._focus);
-      this.terminalContextKey.isTerminalViewInitialized.set(true);
-    }
+    this.terminalContextKey = this.injector.get(TerminalContextKey, [dom]);
+    this.terminalContextKey.isTerminalFocused.set(this._focus);
+    this.terminalContextKey.isTerminalViewInitialized.set(true);
   }
 
   async firstInitialize() {
@@ -418,7 +418,6 @@ export class TerminalController extends WithEventBus implements ITerminalControl
       }),
     ]);
 
-    this._tabBarHandler = this.layoutService.getTabbarHandler(TERMINAL_CONTAINER_ID);
     this.themeBackground = this.terminalTheme.terminalTheme.background || '';
 
     this.addDispose(

package/src/browser/terminal.hover.manager.ts

@@ -14,10 +14,12 @@ export class TerminalHoverManagerService implements ITerminalHoverManagerService
   private hoverWidget: HTMLElement | undefined;
 
   private appendTerminalHoverOverlay() {
-    const overlayContainer = document.querySelector('#ide-overlay');
+    let overlayContainer = document.querySelector('#terminal-link-hover-overlay');
 
     if (!overlayContainer) {
-      throw new Error('ide-overlay is requried');
+      overlayContainer = document.createElement('div');
+      overlayContainer.id = 'terminal-link-hover-overlay';
+      document.body.appendChild(overlayContainer);
     }
 
     const overlay = document.createElement('div');
@@ -72,13 +74,11 @@ export class TerminalHoverManagerService implements ITerminalHoverManagerService
         this.hoverWidget.style.top = `${
           (viewportRange.start.y - 1) * cellDimensions.height + boundingClientRect.y - TIPS_OFFSET_Y
         }px`;
-
         let tooltipsLeft = viewportRange.start.x * cellDimensions.width + boundingClientRect.x + TIPS_OFFSET_X;
         // if the tooltip is too close to the right edge of the terminal, move it to the left
         if (tooltipsLeft + this.hoverWidget.clientWidth > boundingClientRect.x + boundingClientRect.width) {
           tooltipsLeft = boundingClientRect.x + boundingClientRect.width - this.hoverWidget.clientWidth - TIPS_OFFSET_X;
         }
-
         this.hoverWidget.style.left = `${tooltipsLeft}px`;
       }
     });

package/src/browser/terminal.view.ts

@@ -275,6 +275,23 @@ export class TerminalGroupViewService implements ITerminalGroupViewService {
     return this.groups.get()[index];
   }
 
+  swapGroup(i: number, j: number) {
+    const groups = this.groups.get();
+
+    if (i === -1 || j === -1) {
+      return;
+    }
+
+    const newGroups = [...groups];
+    const temp = newGroups[i];
+    newGroups[i] = newGroups[j];
+    newGroups[j] = temp;
+
+    transaction((tx) => {
+      this.groups.set(newGroups, tx);
+    });
+  }
+
   private _doSelectGroup(index: number) {
     const group = this.getGroup(index);
     transaction((tx) => {

package/src/common/controller.ts

@@ -140,6 +140,8 @@ export interface ITerminalGroupViewService {
   selectGroup(index: number): void;
   removeGroup(index: number): void;
 
+  swapGroup(i: number, j: number): void;
+
   createWidget(group: IWidgetGroup, id?: string, reuse?: boolean, isSimpleWidget?: boolean): IWidget;
   getWidget(id: string): IWidget;
   selectWidget(widgetId: string): void;

package/src/common/pty.ts

@@ -539,7 +539,7 @@ export interface IShellLaunchConfig {
   /**
    * The color ID to use for this terminal. If not specified it will use the default fallback
    */
-  color?: vscode.ThemeColor;
+  color?: string | vscode.ThemeColor;
 
   /**
    * When a parent terminal is provided via API, the group needs

package/src/common/render.ts

@@ -18,8 +18,11 @@ export interface ItemProps {
   onDropdown?: (event: React.MouseEvent<HTMLElement>) => void;
   onContextMenu?: (event: React.MouseEvent<HTMLElement>) => void;
   getKeybinding?: (command: string) => string;
+  onDrop?: (event: React.DragEvent) => void;
+  onDragStart?: (event: React.DragEvent) => void;
   provider: ITerminalRenderProvider;
   theme: ThemeType;
+  draggable?: boolean;
 }
 
 export const ITerminalRenderProvider = Symbol('TerminalRenderProvider');

package/src/common/xterm-private.d.ts

@@ -25,13 +25,16 @@ export interface XTermCore {
 
   _renderService: {
     dimensions: {
-      actualCellWidth: number;
-      actualCellHeight: number;
+      css: {
+        cell: {
+          width: number;
+          height: number;
+        };
+      };
     };
     _renderer: {
-      _renderLayers: any[];
+      value?: unknown;
     };
-    _onIntersectionChange: any;
   };
 }