@opensumi/ide-terminal-next 3.7.2-next-1740448398.0 → 3.7.2-next-1741226843.0

package/src/browser/component/terminal.view.tsx

@@ -1,7 +1,8 @@
+import cls from 'classnames';
 import debounce from 'lodash/debounce';
 import React from 'react';
 
-import { FRAME_THREE, useAutorun, useEventEffect, useInjectable } from '@opensumi/ide-core-browser';
+import { FRAME_THREE, getIcon, localize, useAutorun, useEventEffect, useInjectable } from '@opensumi/ide-core-browser';
 
 import {
   ITerminalController,
@@ -14,7 +15,6 @@ import {
 } from '../../common';
 
 import ResizeView, { ResizeDirection } from './resize.view';
-import { TerminalSearch } from './search.view';
 import styles from './terminal.module.less';
 import TerminalWidget from './terminal.widget';
 
@@ -26,6 +26,7 @@ export default () => {
   const errorService = useInjectable<ITerminalErrorService>(ITerminalErrorService);
   const network = useInjectable<ITerminalNetwork>(ITerminalNetwork);
 
+  const inputRef = React.useRef<HTMLInputElement>(null);
   const wrapperRef = React.useRef<HTMLDivElement | null>(null);
 
   const view = useInjectable<ITerminalGroupViewService>(ITerminalGroupViewService);
@@ -33,6 +34,19 @@ export default () => {
   const currentGroupIndex = useAutorun(view.currentGroupIndex);
   const groups = useAutorun(view.groups);
 
+  React.useEffect(() => {
+    const dispose = searchService.onVisibleChange((show) => {
+      if (show && inputRef.current) {
+        inputRef.current.focus();
+
+        if (inputRef.current.value.length > 0) {
+          inputRef.current.setSelectionRange(0, inputRef.current.value.length);
+        }
+      }
+    });
+    return () => dispose.dispose();
+  }, [searchService, inputRef.current]);
+
   const [themeBackground, setThemeBackground] = React.useState(controller.themeBackground);
 
   useEventEffect(controller.onThemeBackgroundChange, (themeBackground) => {
@@ -64,6 +78,31 @@ export default () => {
     setIsVisible(visible);
   });
 
+  const [inputText, setInputText] = React.useState('');
+
+  const searchInput = React.useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      searchService.text = event.target.value;
+      searchService.search();
+      setInputText(event.target.value);
+    },
+    [searchService],
+  );
+
+  const searchKeyDown = React.useCallback(
+    (event: React.KeyboardEvent<HTMLInputElement>) => {
+      if (event.key === 'Enter') {
+        searchService.search();
+      }
+
+      if (event.key === 'Escape') {
+        searchService.close();
+        searchService.clear();
+      }
+    },
+    [searchService],
+  );
+
   React.useEffect(() => {
     if (wrapperRef.current) {
       controller.initContextKey(wrapperRef.current);
@@ -78,7 +117,21 @@ export default () => {
       style={{ backgroundColor: themeBackground }}
       data-group-current={currentGroupId}
     >
-      {isVisible && <TerminalSearch />}
+      {isVisible && (
+        <div className={styles.terminalSearch}>
+          <div className='kt-input-box'>
+            <input
+              autoFocus
+              ref={inputRef}
+              placeholder={localize('common.find')}
+              value={inputText}
+              onChange={searchInput}
+              onKeyDown={searchKeyDown}
+            />
+          </div>
+          <div className={cls(styles.closeBtn, getIcon('close'))} onClick={() => searchService.close()}></div>
+        </div>
+      )}
       {groups.map((group, index) => {
         if (!group.activated.get()) {
           return;

package/src/browser/component/terminal.widget.tsx

@@ -68,13 +68,8 @@ export default ({ widget, error, show }: IProps) => {
   const view = useInjectable<ITerminalGroupViewService>(ITerminalGroupViewService);
 
   React.useEffect(() => {
-    if (content.current && widget.element) {
-      content.current.appendChild(widget.element);
-    } else if (content.current && !widget.element) {
-      const ele = document.createElement('div');
-      content.current.appendChild(ele);
-      ele.className = styles.terminalContent;
-      widget.element = ele;
+    if (content.current) {
+      widget.element = content.current;
     }
   }, []);
 
@@ -96,7 +91,7 @@ export default ({ widget, error, show }: IProps) => {
       <div
         data-term-id={widget.id}
         style={{ display: error ? 'none' : 'block' }}
-        className={styles.terminalContentWrapper}
+        className={styles.terminalContent}
         onFocus={onFocus}
         ref={content}
       ></div>

package/src/browser/contribution/terminal.view.ts

@@ -56,8 +56,6 @@ export class TerminalRenderContribution implements ComponentContribution, TabBar
         activateKeyBinding: 'ctrl+`',
         containerId: TerminalRenderContribution.viewId,
         titleComponent: TerminalTabs,
-        draggable: true,
-        hideLocationTab: ['right'],
       },
     );
   }

package/src/browser/links/link-manager.ts

@@ -41,7 +41,6 @@ import {
   winLineAndColumnMatchIndex,
   winLocalLinkClause,
 } from './validated-local-link-provider';
-import { TerminalWordLinkProvider } from './word-link-provider';
 
 const { posix, win32 } = path;
 
@@ -137,13 +136,6 @@ export class TerminalLinkManager extends Disposable {
     ]);
     this._standardLinkProviders.push(validatedProvider);
 
-    const wordLinkProvider = this.injector.get(TerminalWordLinkProvider, [
-      this._xterm,
-      async (link, cb) => cb(await this._resolvePath(link)),
-      wrappedTextLinkActivateCallback,
-    ]);
-    this._standardLinkProviders.push(wordLinkProvider);
-
     this._registerStandardLinkProviders();
   }
 
@@ -173,8 +165,8 @@ export class TerminalLinkManager extends Disposable {
   ) {
     const core = (this._xterm as any)._core as XTermCore;
     const cellDimensions = {
-      width: core._renderService.dimensions.css.cell.width,
-      height: core._renderService.dimensions.css.cell.height,
+      width: core._renderService.dimensions.actualCellWidth,
+      height: core._renderService.dimensions.actualCellHeight,
     };
     const terminalDimensions = {
       width: this._xterm.cols,
@@ -383,8 +375,13 @@ export class TerminalLinkManager extends Disposable {
       return undefined;
     }
 
+    const linkUrl = this.extractLinkUrl(preprocessedLink);
+    if (!linkUrl) {
+      return undefined;
+    }
+
     try {
-      const uri = URI.file(preprocessedLink);
+      const uri = URI.file(linkUrl);
       const stat = await this._fileService.getFileStat(uri.toString());
       if (stat) {
         return { uri, isDirectory: stat.isDirectory };

package/src/browser/links/validated-local-link-provider.ts

@@ -138,6 +138,7 @@ export class TerminalValidatedLocalLinkProvider extends TerminalBaseLinkProvider
     let match;
     let stringIndex = -1;
     while ((match = rex.exec(text)) !== null) {
+      // const link = match[typeof matcher.matchIndex !== 'number' ? 0 : matcher.matchIndex];
       let link = match[0];
       if (!link) {
         // something matched but does not comply with the given matchIndex
@@ -168,81 +169,60 @@ export class TerminalValidatedLocalLinkProvider extends TerminalBaseLinkProvider
         link = link.substring(2);
         stringIndex += 2;
       }
-      const validatedLinks = await this.detectLocalLink(link, lines, startLine, stringIndex, 1);
 
-      if (validatedLinks.length > 0) {
-        result.push(...validatedLinks);
-      }
-    }
-
-    if (result.length === 0) {
-      const validatedLinks = await this.detectLocalLink(text, lines, startLine, stringIndex, 2);
-      if (validatedLinks.length > 0) {
-        result.push(...validatedLinks);
+      // Convert the link text's string index into a wrapped buffer range
+      const bufferRange = convertLinkRangeToBuffer(
+        lines,
+        this._xterm.cols,
+        {
+          startColumn: stringIndex + 1,
+          startLineNumber: 1,
+          endColumn: stringIndex + link.length + 1,
+          endLineNumber: 1,
+        },
+        startLine,
+      );
+
+      const validatedLink = await new Promise<TerminalLink | undefined>((r) => {
+        this._validationCallback(link, async (result) => {
+          if (result) {
+            const label = result.isDirectory
+              ? (await this._isDirectoryInsideWorkspace(result.uri))
+                ? FOLDER_IN_WORKSPACE_LABEL
+                : FOLDER_NOT_IN_WORKSPACE_LABEL
+              : OPEN_FILE_LABEL;
+            const activateCallback = this._wrapLinkHandler((event: MouseEvent | undefined, text: string) => {
+              if (result.isDirectory) {
+                this._handleLocalFolderLink(result.uri);
+              } else {
+                this._activateFileCallback(event, text);
+              }
+            });
+            r(
+              this.injector.get(TerminalLink, [
+                this._xterm,
+                bufferRange,
+                link,
+                this._xterm.buffer.active.viewportY,
+                activateCallback,
+                this._tooltipCallback,
+                true,
+                label,
+              ]),
+            );
+          } else {
+            r(undefined);
+          }
+        });
+      });
+      if (validatedLink) {
+        result.push(validatedLink);
       }
     }
 
     return result;
   }
 
-  private async detectLocalLink(
-    text: string,
-    bufferLines: IBufferLine[],
-    startLine: number,
-    stringIndex: number,
-    offset,
-  ) {
-    const result: TerminalLink[] = [];
-    const validatedLink = await new Promise<TerminalLink | undefined>((r) => {
-      this._validationCallback(text, async (result) => {
-        if (result) {
-          const label = result.isDirectory
-            ? (await this._isDirectoryInsideWorkspace(result.uri))
-              ? FOLDER_IN_WORKSPACE_LABEL
-              : FOLDER_NOT_IN_WORKSPACE_LABEL
-            : OPEN_FILE_LABEL;
-          const activateCallback = this._wrapLinkHandler((event: MouseEvent | undefined, text: string) => {
-            if (result.isDirectory) {
-              this._handleLocalFolderLink(result.uri);
-            } else {
-              this._activateFileCallback(event, text);
-            }
-          });
-          // Convert the link text's string index into a wrapped buffer range
-          const bufferRange = convertLinkRangeToBuffer(
-            bufferLines,
-            this._xterm.cols,
-            {
-              startColumn: stringIndex + 1,
-              startLineNumber: 1,
-              endColumn: stringIndex + text.length + offset,
-              endLineNumber: 1,
-            },
-            startLine,
-          );
-          r(
-            this.injector.get(TerminalLink, [
-              this._xterm,
-              bufferRange,
-              text,
-              this._xterm.buffer.active.viewportY,
-              activateCallback,
-              this._tooltipCallback,
-              true,
-              label,
-            ]),
-          );
-        } else {
-          r(undefined);
-        }
-      });
-    });
-    if (validatedLink) {
-      result.push(validatedLink);
-    }
-    return result;
-  }
-
   protected get _localLinkRegex(): RegExp {
     const baseLocalLinkClause = this._client.os === OperatingSystem.Windows ? winLocalLinkClause : unixLocalLinkClause;
     // Append line and column number regex

package/src/browser/terminal.client.ts

@@ -1,5 +1,3 @@
-import { ISearchOptions } from '@xterm/addon-search';
-
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import { IEventBus, QuickPickService, TerminalClientAttachEvent, localize } from '@opensumi/ide-core-browser';
 import { PreferenceService } from '@opensumi/ide-core-browser/lib/preferences/types';
@@ -731,18 +729,9 @@ export class TerminalClient extends Disposable implements ITerminalClient {
     return this.xterm.raw.paste(text);
   }
 
-  findNext(text: string, searchOptions: ISearchOptions = {}) {
-    this._checkReady();
-    return this.xterm.findNext(text, searchOptions);
-  }
-
-  findPrevious(text: string, searchOptions: ISearchOptions = {}) {
+  findNext(text: string) {
     this._checkReady();
-    return this.xterm.findPrevious(text, searchOptions);
-  }
-
-  get onSearchResultsChange() {
-    return this.xterm.onSearchResultsChange;
+    return this.xterm.findNext(text);
   }
 
   closeSearch() {

package/src/browser/terminal.controller.ts

@@ -23,6 +23,7 @@ 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 {
@@ -61,6 +62,7 @@ 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>();
@@ -197,10 +199,6 @@ 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)!;
@@ -399,9 +397,11 @@ export class TerminalController extends WithEventBus implements ITerminalControl
   }
 
   initContextKey(dom: HTMLDivElement) {
-    this.terminalContextKey = this.injector.get(TerminalContextKey, [dom]);
-    this.terminalContextKey.isTerminalFocused.set(this._focus);
-    this.terminalContextKey.isTerminalViewInitialized.set(true);
+    if (!this.terminalContextKey) {
+      this.terminalContextKey = this.injector.get(TerminalContextKey, [dom]);
+      this.terminalContextKey.isTerminalFocused.set(this._focus);
+      this.terminalContextKey.isTerminalViewInitialized.set(true);
+    }
   }
 
   async firstInitialize() {
@@ -418,6 +418,7 @@ 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,12 +14,10 @@ export class TerminalHoverManagerService implements ITerminalHoverManagerService
   private hoverWidget: HTMLElement | undefined;
 
   private appendTerminalHoverOverlay() {
-    let overlayContainer = document.querySelector('#terminal-link-hover-overlay');
+    const overlayContainer = document.querySelector('#ide-overlay');
 
     if (!overlayContainer) {
-      overlayContainer = document.createElement('div');
-      overlayContainer.id = 'terminal-link-hover-overlay';
-      document.body.appendChild(overlayContainer);
+      throw new Error('ide-overlay is requried');
     }
 
     const overlay = document.createElement('div');
@@ -74,11 +72,13 @@ 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.search.ts

@@ -1,24 +1,11 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import { Emitter, Event, debounce } from '@opensumi/ide-core-common';
 
-import {
-  ITerminalClient,
-  ITerminalController,
-  ITerminalGroupViewService,
-  ITerminalSearchService,
-  IUIState,
-} from '../common';
+import { ITerminalClient, ITerminalController, ITerminalGroupViewService, ITerminalSearchService } from '../common';
 
 @Injectable()
 export class TerminalSearchService implements ITerminalSearchService {
   protected _isVisible: boolean = false;
-
-  public UIState: IUIState = {
-    isMatchCase: false,
-    isUseRegexp: false,
-    isWholeWord: false,
-  };
-
   get isVisible() {
     return this._isVisible;
   }
@@ -44,10 +31,6 @@ export class TerminalSearchService implements ITerminalSearchService {
     this.isVisible = true;
   }
 
-  get onResultChange() {
-    return this.client?.onSearchResultsChange;
-  }
-
   close() {
     this.client?.closeSearch();
     this.isVisible = false;
@@ -62,36 +45,6 @@ export class TerminalSearchService implements ITerminalSearchService {
 
   @debounce(150)
   search() {
-    this.client?.findNext(this.text, {
-      wholeWord: this.UIState.isWholeWord,
-      regex: this.UIState.isUseRegexp,
-      caseSensitive: this.UIState.isMatchCase,
-    });
-  }
-
-  @debounce(150)
-  searchPrevious() {
-    this.client?.findPrevious(this.text, {
-      wholeWord: this.UIState.isWholeWord,
-      regex: this.UIState.isUseRegexp,
-      caseSensitive: this.UIState.isMatchCase,
-    });
-  }
-
-  @debounce(150)
-  searchNext(): void {
-    this.client?.findNext(this.text, {
-      wholeWord: this.UIState.isWholeWord,
-      regex: this.UIState.isUseRegexp,
-      caseSensitive: this.UIState.isMatchCase,
-    });
-  }
-
-  updateUIState(state: Partial<IUIState>): void {
-    this.UIState = {
-      ...this.UIState,
-      ...state,
-    };
-    this.search();
+    this.client?.findNext(this.text);
   }
 }

package/src/browser/terminal.view.ts

@@ -275,23 +275,6 @@ 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/browser/xterm.ts

@@ -177,26 +177,13 @@ export class XTerm extends Disposable implements IXTerm {
     };
   }
 
-  findNext(text: string, searchOptions: ISearchOptions = {}) {
+  findNext(text: string) {
     const options: ISearchOptions = {
       decorations: this.getFindColors(),
-      ...searchOptions,
     };
     return this._searchAddon.findNext(text, options);
   }
 
-  findPrevious(text: string, searchOptions: ISearchOptions = {}) {
-    const options: ISearchOptions = {
-      decorations: this.getFindColors(),
-      ...searchOptions,
-    };
-    return this._searchAddon.findPrevious(text, options);
-  }
-
-  get onSearchResultsChange() {
-    return this._searchAddon.onDidChangeResults;
-  }
-
   closeSearch() {
     this._searchAddon.clearDecorations();
   }

package/src/common/client.ts

@@ -1,5 +1,4 @@
-import { ISearchOptions } from '@xterm/addon-search';
-import { IEvent, Terminal } from '@xterm/xterm';
+import { Terminal } from '@xterm/xterm';
 
 import { Deferred, Disposable, Event, IDisposable } from '@opensumi/ide-core-common';
 
@@ -117,11 +116,7 @@ export interface ITerminalClient extends Disposable {
    *
    * @param text 用户输入的字符串
    */
-  findNext(text: string, searchOptions?: ISearchOptions): void;
-
-  findPrevious(text: string, searchOptions?: ISearchOptions): void;
-
-  onSearchResultsChange: IEvent<{ resultIndex: number; resultCount: number }>;
+  findNext(text: string): void;
 
   closeSearch(): void;
 

package/src/common/controller.ts

@@ -1,5 +1,3 @@
-import { IEvent } from '@xterm/xterm';
-
 import { IContextKeyService } from '@opensumi/ide-core-browser';
 import { Deferred, Disposable, Event, IDisposable, Uri } from '@opensumi/ide-core-common';
 import { IObservable } from '@opensumi/ide-monaco/lib/common/observable';
@@ -115,23 +113,10 @@ export interface ITerminalController extends Disposable {
   registerLinkProvider(provider: ITerminalExternalLinkProvider): IDisposable;
 }
 
-export interface IUIState {
-  isMatchCase: boolean;
-  isWholeWord: boolean;
-  isUseRegexp: boolean;
-}
-
-export interface ISearchResult {
-  resultCount: number;
-  resultIndex: number;
-}
-
 export const ITerminalSearchService = Symbol('ITerminalSearchService');
 export interface ITerminalSearchService {
   isVisible: boolean;
   onVisibleChange: Event<boolean>;
-  UIState: IUIState;
-  onResultChange: IEvent<ISearchResult> | undefined;
 
   text: string;
 
@@ -139,9 +124,6 @@ export interface ITerminalSearchService {
   clear(): void;
   close(): void;
   search(): void;
-  searchNext(): void;
-  searchPrevious(): void;
-  updateUIState(state: Partial<IUIState>): void;
 }
 
 export const ITerminalGroupViewService = Symbol('ITerminalGroupViewService');
@@ -158,8 +140,6 @@ 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?: string | vscode.ThemeColor;
+  color?: vscode.ThemeColor;
 
   /**
    * When a parent terminal is provided via API, the group needs

package/src/common/render.ts

@@ -18,11 +18,8 @@ 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,16 +25,13 @@ export interface XTermCore {
 
   _renderService: {
     dimensions: {
-      css: {
-        cell: {
-          width: number;
-          height: number;
-        };
-      };
+      actualCellWidth: number;
+      actualCellHeight: number;
     };
     _renderer: {
-      value?: unknown;
+      _renderLayers: any[];
     };
+    _onIntersectionChange: any;
   };
 }