replace _combined map and string cache with _chars variable in LogicalLine

addons/addon-image/test/ImageAddon.test.ts

@@ -117,8 +117,8 @@ test.describe('ImageAddon', () => {
       );
     }
     // bufferline privates
-    strictEqual(await ctx.page.evaluate('window.term._core.buffer.lines.get(0)._data instanceof Uint32Array'), true);
-    strictEqual(await ctx.page.evaluate('window.term._core.buffer.lines.get(0)._extendedAttrs instanceof Object'), true);
+    strictEqual(await ctx.page.evaluate('window.term._core.buffer.lines.get(0)._logicalLine._data instanceof Uint32Array'), true);
+    strictEqual(await ctx.page.evaluate('window.term._core.buffer.lines.get(0)._logicalLine._extendedAttrs instanceof Object'), true);
     // inputhandler privates
     strictEqual(await ctx.page.evaluate('window.term._core._inputHandler._curAttrData.constructor.name'), '_AttributeData');
     strictEqual(await ctx.page.evaluate('window.term._core._inputHandler._parser.constructor.name'), 'EscapeSequenceParser');

addons/addon-search/src/DecorationManager.test.ts

@@ -6,7 +6,6 @@
 import { assert } from 'chai';
 import { DecorationManager } from './DecorationManager';
 import { SearchEngine } from './SearchEngine';
-import { SearchLineCache } from './SearchLineCache';
 import { Terminal } from 'browser/public/Terminal';
 import type { ISearchDecorationOptions } from '@xterm/addon-search';
 import type { IDecorationOptions } from '@xterm/xterm';
@@ -29,7 +28,7 @@ describe('DecorationManager', () => {
 
   it('should split highlight decorations for a wrapped match', async () => {
     await writeP(terminal, '0123456789abcde');
-    const searchEngine = new SearchEngine(terminal, store.add(new SearchLineCache(terminal)));
+    const searchEngine = new SearchEngine(terminal);
     const match = searchEngine.find('9abc', 0, 0);
     assert.ok(match);
 

addons/addon-search/src/SearchAddon.ts

@@ -8,7 +8,6 @@ import type { SearchAddon as ISearchApi, ISearchOptions, ISearchAddonOptions, IS
 import { Emitter, type IEvent } from 'common/Event';
 import { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';
 import { disposableTimeout } from 'common/Async';
-import { SearchLineCache } from './SearchLineCache';
 import { SearchState } from './SearchState';
 import { SearchEngine, type ISearchResult } from './SearchEngine';
 import { DecorationManager } from './DecorationManager';
@@ -34,7 +33,6 @@ export class SearchAddon extends Disposable implements ITerminalAddon, ISearchAp
   private _terminal: Terminal | undefined;
   private _highlightLimit: number;
   private _highlightTimeout = this._register(new MutableDisposable<IDisposable>());
-  private _lineCache = this._register(new MutableDisposable<SearchLineCache>());
 
   // Component instances
   private _state = new SearchState();
@@ -59,8 +57,7 @@ export class SearchAddon extends Disposable implements ITerminalAddon, ISearchAp
 
   public activate(terminal: Terminal): void {
     this._terminal = terminal;
-    this._lineCache.value = new SearchLineCache(terminal);
-    this._engine = new SearchEngine(terminal, this._lineCache.value);
+    this._engine = new SearchEngine(terminal);
     this._decorationManager = new DecorationManager(terminal);
     this._register(this._terminal.onWriteParsed(() => this._updateMatches()));
     this._register(this._terminal.onResize(() => this._updateMatches()));

addons/addon-search/src/SearchEngine.test.ts

@@ -4,7 +4,6 @@
  */
 import { assert } from 'chai';
 import { SearchEngine } from './SearchEngine';
-import { SearchLineCache } from './SearchLineCache';
 import { Terminal } from 'browser/public/Terminal';
 import type { ISearchOptions } from '@xterm/addon-search';
 import { DisposableStore } from 'common/Lifecycle';
@@ -16,14 +15,12 @@ function writeP(terminal: Terminal, data: string): Promise<void> {
 describe('SearchEngine', () => {
   let store: DisposableStore;
   let terminal: Terminal;
-  let lineCache: SearchLineCache;
   let searchEngine: SearchEngine;
 
   beforeEach(() => {
     store = new DisposableStore();
     terminal = store.add(new Terminal({ cols: 80, rows: 24 }));
-    lineCache = store.add(new SearchLineCache(terminal));
-    searchEngine = new SearchEngine(terminal, lineCache);
+    searchEngine = new SearchEngine(terminal);
   });
 
   afterEach(() => {
@@ -663,9 +660,6 @@ describe('SearchEngine', () => {
     it('should use cache for line translation', async () => {
       await writeP(terminal, 'Hello World');
 
-      // Initialize cache
-      lineCache.initLinesCache();
-
       const result1 = searchEngine.find('World', 0, 0);
       const result2 = searchEngine.find('World', 0, 0);
 
@@ -688,7 +682,6 @@ describe('SearchEngine', () => {
 
     it('should work correctly with cache invalidation', async () => {
       await writeP(terminal, 'Initial text');
-      lineCache.initLinesCache();
 
       const result1 = searchEngine.find('Initial', 0, 0);
       assert.notStrictEqual(result1, undefined);

addons/addon-search/src/SearchEngine.ts

@@ -5,7 +5,8 @@
 
 import type { Terminal } from '@xterm/xterm';
 import type { ISearchOptions } from '@xterm/addon-search';
-import type { SearchLineCache } from './SearchLineCache';
+import { CellData } from 'common/buffer/CellData';
+import type { ITerminal } from 'browser/Types';
 
 /**
  * Represents the position to start a search from.
@@ -43,9 +44,11 @@ const enum Constants {
  */
 export class SearchEngine {
   constructor(
-    private readonly _terminal: Terminal,
-    private readonly _lineCache: SearchLineCache
-  ) {}
+    private readonly _terminal: Terminal
+  ) {
+    this._core = (this._terminal as any)._core;
+  }
+  private _core: ITerminal;
 
   /**
    * Find the first occurrence of a term starting from a specific position.
@@ -64,8 +67,6 @@ export class SearchEngine {
       throw new Error(`Invalid col: ${startCol} to search in terminal of ${this._terminal.cols} cols`);
     }
 
-    this._lineCache.initLinesCache();
-
     const searchPosition: ISearchPosition = {
       startRow,
       startCol
@@ -115,8 +116,6 @@ export class SearchEngine {
       }
     }
 
-    this._lineCache.initLinesCache();
-
     const searchPosition: ISearchPosition = {
       startRow,
       startCol
@@ -177,7 +176,6 @@ export class SearchEngine {
     const startCol = this._terminal.cols;
     const isReverseSearch = true;
 
-    this._lineCache.initLinesCache();
     const searchPosition: ISearchPosition = {
       startRow,
       startCol
@@ -250,11 +248,11 @@ export class SearchEngine {
    * @returns The search result if it was found.
    */
   private _findInLine(term: string, searchPosition: ISearchPosition, searchOptions: ISearchOptions = {}, isReverseSearch: boolean = false): ISearchResult | undefined {
-    const row = searchPosition.startRow;
-    const col = searchPosition.startCol;
+    let row = searchPosition.startRow;
+    let col = searchPosition.startCol;
 
     // Ignore wrapped lines, only consider on unwrapped line (first row of command string).
-    const firstLine = this._terminal.buffer.active.getLine(row);
+    let firstLine = this._core.buffer.lines.get(row);
     if (firstLine?.isWrapped) {
       if (isReverseSearch) {
         searchPosition.startCol += this._terminal.cols;
@@ -263,16 +261,16 @@ export class SearchEngine {
 
       // This will iterate until we find the line start.
       // When we find it, we will search using the calculated start column.
-      searchPosition.startRow--;
-      searchPosition.startCol += this._terminal.cols;
-      return this._findInLine(term, searchPosition, searchOptions);
-    }
-    let cache = this._lineCache.getLineFromCache(row);
-    if (!cache) {
-      cache = this._lineCache.translateBufferLineToStringWithWrap(row, true);
-      this._lineCache.setLineInCache(row, cache);
+      do {
+        row--;
+        col += this._terminal.cols;
+        firstLine = this._core.buffer.lines.get(row);
+      } while (firstLine?.isWrapped);
+      searchPosition.startRow = row;
+      searchPosition.startCol = col;
     }
-    const [stringLine, offsets] = cache;
+    const logical = firstLine?.logical();
+    const stringLine = logical ? logical.asString() : '';
 
     const offset = this._bufferColsToStringOffset(row, col);
     let searchTerm = term;
@@ -314,6 +312,10 @@ export class SearchEngine {
       if (searchOptions.wholeWord && !this._isWholeWord(resultIndex, searchStringLine, term)) {
         return;
       }
+      const offsets: number[] = [];
+      logical?.forEachBufferLine((line) => {
+        offsets.push(logical.offsetInString(line.startColumn));
+      });
 
       // Adjust the row number and search index if needed since a "line" of text can span multiple
       // rows
@@ -341,12 +343,13 @@ export class SearchEngine {
   }
 
   private _stringLengthToBufferSize(row: number, offset: number): number {
-    const line = this._terminal.buffer.active.getLine(row);
+    const line = this._core.buffer.lines.get(row);
     if (!line) {
       return 0;
     }
+    const cell = new CellData();
     for (let i = 0; i < offset; i++) {
-      const cell = line.getCell(i);
+      line.loadCell(i, cell);
       if (!cell) {
         break;
       }
@@ -355,38 +358,14 @@ export class SearchEngine {
       if (char.length > 1) {
         offset -= char.length - 1;
       }
-      // Adjust the searchIndex for empty characters following wide unicode
-      // chars (eg. CJK)
-      const nextCell = line.getCell(i + 1);
-      if (nextCell && nextCell.getWidth() === 0) {
-        offset++;
-      }
+      const width = cell.getWidth();
+      if (width > 1) { offset += width - 1; }
     }
     return offset;
   }
 
   private _bufferColsToStringOffset(startRow: number, cols: number): number {
-    let lineIndex = startRow;
-    let offset = 0;
-    let line = this._terminal.buffer.active.getLine(lineIndex);
-    while (cols > 0 && line) {
-      for (let i = 0; i < cols && i < this._terminal.cols; i++) {
-        const cell = line.getCell(i);
-        if (!cell) {
-          break;
-        }
-        if (cell.getWidth()) {
-          // Treat null characters as whitespace to align with the translateToString API
-          offset += cell.getCode() === 0 ? 1 : cell.getChars().length;
-        }
-      }
-      lineIndex++;
-      line = this._terminal.buffer.active.getLine(lineIndex);
-      if (line && !line.isWrapped) {
-        break;
-      }
-      cols -= this._terminal.cols;
-    }
-    return offset;
+    const line = this._core.buffer.lines.get(startRow)!;
+    return line ? line.logical().offsetInString(cols) : 0;
   }
 }