fix(addon-image): cast buffer line lookups to IBufferLineExt | undefined

Co-authored-by: Daniel Imms <Tyriar@users.noreply.github.com>

addons/addon-image/src/ImageStorage.ts

@@ -431,8 +431,8 @@ export class ImageStorage implements IDisposable {
     // because text writes clear the BG flag but leave image tile data intact.
     // This lets top-layer images survive text overwrites (kitty C=1 behavior).
     for (let row = start; row <= end; ++row) {
-      const line = buffer.lines.get(row + buffer.ydisp) as IBufferLineExt;
-      if (!line) return;
+      const line = buffer.lines.get(row + buffer.ydisp) as IBufferLineExt | undefined;
+      if (!line) continue;
       for (let col = 0; col < cols; ++col) {
         let e: IExtendedAttrsImage;
         if (line.getBg(col) & BgFlags.HAS_EXTENDED) {
@@ -513,7 +513,10 @@ export class ImageStorage implements IDisposable {
     const rows = buffer.lines.length;
     const oldCol = this._viewportMetrics.cols - 1;
     for (let row = 0; row < rows; ++row) {
-      const line = buffer.lines.get(row) as IBufferLineExt;
+      const line = buffer.lines.get(row) as IBufferLineExt | undefined;
+      if (!line) {
+        continue;
+      }
       if (line.getBg(oldCol) & BgFlags.HAS_EXTENDED) {
         const e: IExtendedAttrsImage = line._extendedAttrs[oldCol] ?? EMPTY_ATTRS;
         const imageId = e.imageId;
@@ -531,7 +534,7 @@ export class ImageStorage implements IDisposable {
         }
         // expand only if right side is empty (nothing got wrapped from below)
         let hasData = false;
-        for (let rightCol = oldCol + 1; rightCol > metrics.cols; ++rightCol) {
+        for (let rightCol = oldCol + 1; rightCol < metrics.cols; ++rightCol) {
           if (line._data[rightCol * Cell.SIZE + Cell.CONTENT] & Content.HAS_CONTENT_MASK) {
             hasData = true;
             break;

src/common/InputHandler.test.ts

@@ -475,13 +475,6 @@ describe('InputHandler', () => {
       inputHandler.eraseInLine(Params.fromArray([1]));
       assert.equal(bufferService.buffer.lines.get(2)!.isWrapped, true);
 
-      // params[1] - full line erase at last column clears wrap on next line
-      await resetToBaseState();
-      bufferService.buffer.y = 1;
-      bufferService.buffer.x = bufferService.cols - 1;
-      inputHandler.eraseInLine(Params.fromArray([1]));
-      assert.equal(bufferService.buffer.lines.get(2)!.isWrapped, false);
-
       // params[2] - erase complete line
       await resetToBaseState();
       bufferService.buffer.y = 2;

src/common/InputHandler.ts

@@ -1202,21 +1202,6 @@ export class InputHandler extends Disposable implements IInputHandler {
     }
   }
 
-  /**
-   * Scroll-margin column operations clear isWrapped on lines inside the margins.
-   * Also clear the line below the bottom margin when it still continues a wrap chain.
-   */
-  private _clearWrapBelowScrollMargins(): void {
-    const rowBelowMargin = this._activeBuffer.scrollBottom + 1;
-    if (rowBelowMargin >= this._bufferService.rows) {
-      return;
-    }
-    const lineBelow = this._activeBuffer.lines.get(this._activeBuffer.ybase + rowBelowMargin);
-    if (lineBelow) {
-      lineBelow.isWrapped = false;
-    }
-  }
-
   /**
    * CSI Ps J  Erase in Display (ED).
    *     Ps = 0  -> Erase Below (default).
@@ -1261,7 +1246,7 @@ export class InputHandler extends Disposable implements IInputHandler {
         this._eraseInBufferLine(j, 0, this._activeBuffer.x + 1, true, respectProtect);
         if (this._activeBuffer.x + 1 >= this._bufferService.cols) {
           // Deleted entire previous line. This next line can no longer be wrapped.
-          const nextLine = this._activeBuffer.lines.get(this._activeBuffer.ybase + j + 1);
+          const nextLine = this._activeBuffer.lines.get(j + 1);
           if (nextLine) {
             nextLine.isWrapped = false;
           }
@@ -1339,12 +1324,6 @@ export class InputHandler extends Disposable implements IInputHandler {
         break;
       case 1:
         this._eraseInBufferLine(this._activeBuffer.y, 0, this._activeBuffer.x + 1, false, respectProtect);
-        if (this._activeBuffer.x + 1 >= this._bufferService.cols) {
-          const nextLine = this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y + 1);
-          if (nextLine) {
-            nextLine.isWrapped = false;
-          }
-        }
         break;
       case 2:
         this._eraseInBufferLine(this._activeBuffer.y, 0, this._bufferService.cols, true, respectProtect);
@@ -1536,7 +1515,6 @@ export class InputHandler extends Disposable implements IInputHandler {
       line.deleteCells(0, param, this._activeBuffer.getNullCell(this._eraseAttrData()));
       line.isWrapped = false;
     }
-    this._clearWrapBelowScrollMargins();
     this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom);
     return true;
   }
@@ -1570,7 +1548,6 @@ export class InputHandler extends Disposable implements IInputHandler {
       line.insertCells(0, param, this._activeBuffer.getNullCell(this._eraseAttrData()));
       line.isWrapped = false;
     }
-    this._clearWrapBelowScrollMargins();
     this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom);
     return true;
   }
@@ -1594,7 +1571,6 @@ export class InputHandler extends Disposable implements IInputHandler {
       line.insertCells(this._activeBuffer.x, param, this._activeBuffer.getNullCell(this._eraseAttrData()));
       line.isWrapped = false;
     }
-    this._clearWrapBelowScrollMargins();
     this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom);
     return true;
   }
@@ -1618,7 +1594,6 @@ export class InputHandler extends Disposable implements IInputHandler {
       line.deleteCells(this._activeBuffer.x, param, this._activeBuffer.getNullCell(this._eraseAttrData()));
       line.isWrapped = false;
     }
-    this._clearWrapBelowScrollMargins();
     this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom);
     return true;
   }