From fef30bdba457b03e2d0f7c204b1e127449086dba Mon Sep 17 00:00:00 2001
From: meganrogge <merogge@microsoft.com>
Date: Fri, 18 Mar 2022 15:38:31 -0400
Subject: [PATCH] revert row register marker changes

---
 addons/xterm-addon-search/src/SearchAddon.ts | 4 ++--
 src/browser/Terminal.ts                      | 5 +----
 src/browser/Types.d.ts                       | 2 +-
 src/browser/public/Terminal.ts               | 7 ++-----
 typings/xterm.d.ts                           | 3 +--
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/addons/xterm-addon-search/src/SearchAddon.ts b/addons/xterm-addon-search/src/SearchAddon.ts
index f0d64eb9..90749e92 100644
--- a/addons/xterm-addon-search/src/SearchAddon.ts
+++ b/addons/xterm-addon-search/src/SearchAddon.ts
@@ -547,7 +547,7 @@ export class SearchAddon implements ITerminalAddon {
     }
     terminal.select(result.col, result.row, result.size);
     if (color) {
-      const marker = terminal.registerMarker(undefined, result.row);
+      const marker = terminal.registerMarker(-terminal.buffer.active.baseY - terminal.buffer.active.cursorY + result.row);
       if (marker) {
         this._selectedDecoration = terminal.registerDecoration({ marker, overviewRulerOptions: { color } });
         this._selectedDecoration?.onRender((e) => this._applyStyles(e, color, result));
@@ -591,7 +591,7 @@ export class SearchAddon implements ITerminalAddon {
    */
   private _createResultDecoration(result: ISearchResult, color: string): IDecoration | undefined {
     const terminal = this._terminal!;
-    const marker = terminal.registerMarker(undefined, result.row);
+    const marker = terminal.registerMarker(-terminal.buffer.active.baseY - terminal.buffer.active.cursorY + result.row);
     if (!marker) {
       return undefined;
     }
diff --git a/src/browser/Terminal.ts b/src/browser/Terminal.ts
index 496b8dfa..5803e8c4 100644
--- a/src/browser/Terminal.ts
+++ b/src/browser/Terminal.ts
@@ -1012,14 +1012,11 @@ export class Terminal extends CoreTerminal implements ITerminal {
     return this.buffer.markers;
   }
 
-  public addMarker(cursorYOffset: number, row?: number): IMarker | undefined {
+  public addMarker(cursorYOffset: number): IMarker | undefined {
     // Disallow markers on the alt buffer
     if (this.buffer !== this.buffers.normal) {
       return;
     }
-    if (row) {
-      return this.buffer.addMarker(row);
-    }
     return this.buffer.addMarker(this.buffer.ybase + this.buffer.y + cursorYOffset);
   }
 
diff --git a/src/browser/Types.d.ts b/src/browser/Types.d.ts
index 6e98eff6..8860bb41 100644
--- a/src/browser/Types.d.ts
+++ b/src/browser/Types.d.ts
@@ -61,7 +61,7 @@ export interface IPublicTerminal extends IDisposable {
   registerLinkProvider(linkProvider: ILinkProvider): IDisposable;
   registerCharacterJoiner(handler: (text: string) => [number, number][]): number;
   deregisterCharacterJoiner(joinerId: number): void;
-  addMarker(cursorYOffset: number, col?: number, row?: number): IMarker | undefined;
+  addMarker(cursorYOffset: number): IMarker | undefined;
   registerDecoration(decorationOptions: IDecorationOptions): IDecoration | undefined;
   hasSelection(): boolean;
   getSelection(): string;
diff --git a/src/browser/public/Terminal.ts b/src/browser/public/Terminal.ts
index 8c290fda..1acde934 100644
--- a/src/browser/public/Terminal.ts
+++ b/src/browser/public/Terminal.ts
@@ -166,13 +166,10 @@ export class Terminal implements ITerminalApi {
     this._checkProposedApi();
     this._core.deregisterCharacterJoiner(joinerId);
   }
-  public registerMarker(cursorYOffset: number = 0, row?: number): IMarker | undefined {
+  public registerMarker(cursorYOffset: number = 0): IMarker | undefined {
     this._checkProposedApi();
     this._verifyIntegers(cursorYOffset);
-    if (row) {
-      this._verifyPositiveIntegers(row);
-    }
-    return this._core.addMarker(cursorYOffset, row);
+    return this._core.addMarker(cursorYOffset);
   }
   public registerDecoration(decorationOptions: IDecorationOptions): IDecoration | undefined {
     this._checkProposedApi();
diff --git a/typings/xterm.d.ts b/typings/xterm.d.ts
index 451da2e8..d1eb3890 100644
--- a/typings/xterm.d.ts
+++ b/typings/xterm.d.ts
@@ -954,10 +954,9 @@ declare module 'xterm' {
      * (EXPERIMENTAL) Adds a marker to the normal buffer and returns it. If the
      * alt buffer is active, undefined is returned.
      * @param cursorYOffset The y position offset of the marker from the cursor.
-     * @param row The y position of the marker.
      * @returns The new marker or undefined.
      */
-    registerMarker(cursorYOffset?: number, row?: number): IMarker | undefined;
+    registerMarker(cursorYOffset?: number): IMarker | undefined;
 
     /**
      * @deprecated use `registerMarker` instead.