@xterm/addon-search 0.16.0-beta.125 → 0.16.0-beta.127

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xterm/addon-search",
-  "version": "0.16.0-beta.125",
+  "version": "0.16.0-beta.127",
   "author": {
     "name": "The xterm.js authors",
     "url": "https://xtermjs.org/"
@@ -22,7 +22,7 @@
     "start": "node ../../demo/start"
   },
   "peerDependencies": {
-    "@xterm/xterm": "^5.6.0-beta.125"
+    "@xterm/xterm": "^5.6.0-beta.127"
   },
-  "commit": "15d90826f90ffbd45d1cd8b27bebc665a152cec6"
+  "commit": "ab43a3bd22082d2dc3045672df9a62473d9cec2f"
 }

package/src/SearchAddon.ts

@@ -4,38 +4,28 @@
  */
 
 import type { Terminal, IDisposable, ITerminalAddon, IDecoration } from '@xterm/xterm';
-import type { SearchAddon as ISearchApi, ISearchOptions, ISearchDecorationOptions } from '@xterm/addon-search';
+import type { SearchAddon as ISearchApi, ISearchOptions, ISearchDecorationOptions, ISearchAddonOptions, ISearchResultChangeEvent } from '@xterm/addon-search';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, dispose, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { disposableTimeout } from 'vs/base/common/async';
 import { SearchLineCache } from './SearchLineCache';
 
 interface IInternalSearchOptions {
-  noScroll?: boolean;
+  noScroll: boolean;
 }
 
-export interface ISearchPosition {
+interface ISearchPosition {
   startCol: number;
   startRow: number;
 }
 
-export interface ISearchResultChangeEvent {
-  resultIndex: number;
-  resultCount: number;
-}
-
-export interface ISearchAddonOptions {
-  highlightLimit: number;
-}
-
-export interface ISearchResult {
+interface ISearchResult {
   term: string;
   col: number;
   row: number;
   size: number;
 }
 
-
-
 interface IHighlight extends IDisposable {
   decoration: IDecoration;
   match: ISearchResult;
@@ -57,8 +47,6 @@ const enum Constants {
    */
   NON_WORD_CHARACTERS = ' ~!@#$%^&*()+`-=[]{}|\\;:"\',./<>?',
 
-
-
   /**
    * Default maximum number of search results to highlight simultaneously. This limit prevents
    * performance degradation when searching for very common terms that would result in excessive
@@ -73,10 +61,10 @@ export class SearchAddon extends Disposable implements ITerminalAddon, ISearchAp
   private _highlightedLines: Set<number> = new Set();
   private _highlightDecorations: IHighlight[] = [];
   private _searchResultsWithHighlight: ISearchResult[] = [];
-  private _selectedDecoration: MutableDisposable<IMultiHighlight> = this._register(new MutableDisposable());
+  private _selectedDecoration = this._register(new MutableDisposable<IMultiHighlight>());
   private _highlightLimit: number;
   private _lastSearchOptions: ISearchOptions | undefined;
-  private _highlightTimeout: number | undefined;
+  private _highlightTimeout = this._register(new MutableDisposable<IDisposable>());
   private _lineCache = this._register(new MutableDisposable<SearchLineCache>());
 
   private readonly _onDidChangeResults = this._register(new Emitter<ISearchResultChangeEvent>());
@@ -97,11 +85,9 @@ export class SearchAddon extends Disposable implements ITerminalAddon, ISearchAp
   }
 
   private _updateMatches(): void {
-    if (this._highlightTimeout) {
-      window.clearTimeout(this._highlightTimeout);
-    }
+    this._highlightTimeout.clear();
     if (this._cachedSearchTerm && this._lastSearchOptions?.decorations) {
-      this._highlightTimeout = setTimeout(() => {
+      this._highlightTimeout.value = disposableTimeout(() => {
         const term = this._cachedSearchTerm;
         this._cachedSearchTerm = undefined;
         this.findPrevious(term!, { ...this._lastSearchOptions, incremental: true }, { noScroll: true });

package/src/SearchLineCache.ts

@@ -5,6 +5,7 @@
 
 import type { Terminal } from '@xterm/xterm';
 import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { disposableTimeout } from 'vs/base/common/async';
 
 export type LineCacheEntry = [
   /**
@@ -35,7 +36,7 @@ export class SearchLineCache extends Disposable {
    * _linesCache is also invalidated when the terminal cursor moves.
    */
   private _linesCache: LineCacheEntry[] | undefined;
-  private _linesCacheTimeoutId = 0;
+  private _linesCacheTimeout = this._register(new MutableDisposable());
   private _linesCacheDisposables = this._register(new MutableDisposable());
 
   constructor(private _terminal: Terminal) {
@@ -56,17 +57,13 @@ export class SearchLineCache extends Disposable {
       );
     }
 
-    window.clearTimeout(this._linesCacheTimeoutId);
-    this._linesCacheTimeoutId = window.setTimeout(() => this._destroyLinesCache(), Constants.LINES_CACHE_TIME_TO_LIVE);
+    this._linesCacheTimeout.value = disposableTimeout(() => this._destroyLinesCache(), Constants.LINES_CACHE_TIME_TO_LIVE);
   }
 
   private _destroyLinesCache(): void {
     this._linesCache = undefined;
     this._linesCacheDisposables.clear();
-    if (this._linesCacheTimeoutId) {
-      window.clearTimeout(this._linesCacheTimeoutId);
-      this._linesCacheTimeoutId = 0;
-    }
+    this._linesCacheTimeout.clear();
   }
 
   public getLineFromCache(row: number): LineCacheEntry | undefined {