From 52044e9aadd9eeaab702b88bd6e177b4ce336e80 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Tue, 21 Jun 2022 10:26:02 -0800
Subject: [PATCH] clear all markers (#3868)

---
 src/browser/Terminal.ts       |  2 +-
 src/browser/TestUtils.test.ts |  2 +-
 src/common/buffer/Buffer.ts   | 13 +++++--------
 src/common/buffer/Types.d.ts  |  4 ++--
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/browser/Terminal.ts b/src/browser/Terminal.ts
index 9ab3087c..1f436c8c 100644
--- a/src/browser/Terminal.ts
+++ b/src/browser/Terminal.ts
@@ -1325,7 +1325,7 @@ export class Terminal extends CoreTerminal implements ITerminal {
       // Don't clear if it's already clear
       return;
     }
-    this.buffer.clearAllMarkers(0);
+    this.buffer.clearAllMarkers();
     this.buffer.lines.set(0, this.buffer.lines.get(this.buffer.ybase + this.buffer.y)!);
     this.buffer.lines.length = 1;
     this.buffer.ydisp = 0;
diff --git a/src/browser/TestUtils.test.ts b/src/browser/TestUtils.test.ts
index 1ba175f3..92f90a1d 100644
--- a/src/browser/TestUtils.test.ts
+++ b/src/browser/TestUtils.test.ts
@@ -262,7 +262,7 @@ export class MockBuffer implements IBuffer {
   public clearMarkers(y: number): void {
     throw new Error('Method not implemented.');
   }
-  public clearAllMarkers(excludeY: number): void {
+  public clearAllMarkers(): void {
     throw new Error('Method not implemented.');
   }
 }
diff --git a/src/common/buffer/Buffer.ts b/src/common/buffer/Buffer.ts
index ab295784..c8b0d1b2 100644
--- a/src/common/buffer/Buffer.ts
+++ b/src/common/buffer/Buffer.ts
@@ -601,16 +601,13 @@ export class Buffer implements IBuffer {
   }
 
   /**
-   * Clears markers on all lines except for those on a particular line.
-   * @param excludeY The line to exclude.
+   * Clears markers on all lines
    */
-  public clearAllMarkers(excludeY: number): void {
+  public clearAllMarkers(): void {
     this._isClearing = true;
     for (let i = 0; i < this.markers.length; i++) {
-      if (this.markers[i].line !== excludeY) {
-        this.markers[i].dispose();
-        this.markers.splice(i--, 1);
-      }
+      this.markers[i].dispose();
+      this.markers.splice(i--, 1);
     }
     this._isClearing = false;
   }
@@ -671,7 +668,7 @@ export class Buffer implements IBuffer {
 export class BufferStringIterator implements IBufferStringIterator {
   private _current: number;
 
-  constructor (
+  constructor(
     private _buffer: IBuffer,
     private _trimRight: boolean,
     private _startIndex: number = 0,
diff --git a/src/common/buffer/Types.d.ts b/src/common/buffer/Types.d.ts
index f26b4b26..421ddd37 100644
--- a/src/common/buffer/Types.d.ts
+++ b/src/common/buffer/Types.d.ts
@@ -10,7 +10,7 @@ import { IEvent } from 'common/EventEmitter';
 export type BufferIndex = [number, number];
 
 export interface IBufferStringIteratorResult {
-  range: {first: number, last: number};
+  range: { first: number, last: number };
   content: string;
 }
 
@@ -46,7 +46,7 @@ export interface IBuffer {
   getWhitespaceCell(attr?: IAttributeData): ICellData;
   addMarker(y: number): IMarker;
   clearMarkers(y: number): void;
-  clearAllMarkers(excludeY: number): void;
+  clearAllMarkers(): void;
 }
 
 export interface IBufferSet extends IDisposable {