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

package/src/browser/terminal.client.ts

@@ -1,3 +1,5 @@
+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';
@@ -729,9 +731,18 @@ export class TerminalClient extends Disposable implements ITerminalClient {
     return this.xterm.raw.paste(text);
   }
 
-  findNext(text: string) {
+  findNext(text: string, searchOptions: ISearchOptions = {}) {
+    this._checkReady();
+    return this.xterm.findNext(text, searchOptions);
+  }
+
+  findPrevious(text: string, searchOptions: ISearchOptions = {}) {
     this._checkReady();
-    return this.xterm.findNext(text);
+    return this.xterm.findPrevious(text, searchOptions);
+  }
+
+  get onSearchResultsChange() {
+    return this.xterm.onSearchResultsChange;
   }
 
   closeSearch() {

package/src/browser/terminal.search.ts

@@ -1,11 +1,24 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import { Emitter, Event, debounce } from '@opensumi/ide-core-common';
 
-import { ITerminalClient, ITerminalController, ITerminalGroupViewService, ITerminalSearchService } from '../common';
+import {
+  ITerminalClient,
+  ITerminalController,
+  ITerminalGroupViewService,
+  ITerminalSearchService,
+  IUIState,
+} 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;
   }
@@ -31,6 +44,10 @@ export class TerminalSearchService implements ITerminalSearchService {
     this.isVisible = true;
   }
 
+  get onResultChange() {
+    return this.client?.onSearchResultsChange;
+  }
+
   close() {
     this.client?.closeSearch();
     this.isVisible = false;
@@ -45,6 +62,36 @@ export class TerminalSearchService implements ITerminalSearchService {
 
   @debounce(150)
   search() {
-    this.client?.findNext(this.text);
+    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();
   }
 }

package/src/browser/xterm.ts

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

package/src/common/controller.ts

@@ -1,3 +1,5 @@
+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';
@@ -113,10 +115,23 @@ 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;
 
@@ -124,6 +139,9 @@ export interface ITerminalSearchService {
   clear(): void;
   close(): void;
   search(): void;
+  searchNext(): void;
+  searchPrevious(): void;
+  updateUIState(state: Partial<IUIState>): void;
 }
 
 export const ITerminalGroupViewService = Symbol('ITerminalGroupViewService');

package/src/common/xterm.ts

@@ -1,4 +1,5 @@
-import { ITerminalOptions, ITheme, Terminal } from '@xterm/xterm';
+import { ISearchOptions } from '@xterm/addon-search';
+import { IEvent, ITerminalOptions, ITheme, Terminal } from '@xterm/xterm';
 
 import { SupportedOptions } from './preference';
 
@@ -13,11 +14,14 @@ export interface IXTerm {
   container: HTMLDivElement;
   xtermOptions: ITerminalOptions & SupportedOptions;
 
+  onSearchResultsChange: IEvent<{ resultIndex: number; resultCount: number }>;
+
   copySelection(): Promise<void>;
   onSelectionChange(): Promise<void>;
   open(): void;
   fit(): void;
-  findNext(text: string): boolean;
+  findNext(text: string, searchOptions?: ISearchOptions): boolean;
+  findPrevious(text: string, searchOptions?: ISearchOptions): boolean;
   closeSearch(): void;
   updatePreferences(options: SupportedOptions): void;
   updateTheme(theme: ITheme | undefined): void;