From e7e9d5ca4c5ef799b20f05d099592656944749e4 Mon Sep 17 00:00:00 2001
From: meganrogge <merogge@microsoft.com>
Date: Tue, 15 Mar 2022 12:56:34 -0400
Subject: [PATCH] remove test

---
 demo/client.ts                                      |  6 +++---
 src/browser/Decorations/BufferDecorationRenderer.ts |  3 +++
 src/browser/Decorations/OverviewRulerRenderer.ts    |  4 ++--
 src/common/services/DecorationService.ts            |  3 ++-
 test/api/Terminal.api.ts                            | 12 ------------
 typings/xterm.d.ts                                  |  8 +++++---
 6 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/demo/client.ts b/demo/client.ts
index b80e2e76..b219b733 100644
--- a/demo/client.ts
+++ b/demo/client.ts
@@ -556,9 +556,9 @@ function addDecoration() {
 
 function addOverviewRuler() {
   term.options['overviewRulerWidth'] = 15;
-  const canvas = term.registerDecoration({marker: term.addMarker(1), overviewRulerItemColor: 'red'});
-  term.registerDecoration({marker: term.addMarker(3), overviewRulerItemColor: 'green'});
-  term.registerDecoration({marker: term.addMarker(5), overviewRulerItemColor: 'blue'});
+  const canvas = term.registerDecoration({marker: term.addMarker(1), { color }: 'red'});
+  term.registerDecoration({marker: term.addMarker(3), { color }: 'green'});
+  term.registerDecoration({marker: term.addMarker(5), { color }: 'blue'});
   canvas.onRender((e) => {
     e.style.left = `${document.querySelector('.xterm-viewport').clientWidth + 5}px`;
   });
diff --git a/src/browser/Decorations/BufferDecorationRenderer.ts b/src/browser/Decorations/BufferDecorationRenderer.ts
index 26166c77..8821ccc1 100644
--- a/src/browser/Decorations/BufferDecorationRenderer.ts
+++ b/src/browser/Decorations/BufferDecorationRenderer.ts
@@ -106,6 +106,9 @@ export class BufferDecorationRenderer extends Disposable {
 
   private _removeDecoration(decoration: IInternalDecoration): void {
     const element = this._decorationElements.get(decoration);
+    if (element && this._container && this._container.contains(element)) {
+      this._container.removeChild(element);
+    }
     element?.remove();
     this._decorationElements.delete(decoration);
   }
diff --git a/src/browser/Decorations/OverviewRulerRenderer.ts b/src/browser/Decorations/OverviewRulerRenderer.ts
index 7d8475f2..45f30c35 100644
--- a/src/browser/Decorations/OverviewRulerRenderer.ts
+++ b/src/browser/Decorations/OverviewRulerRenderer.ts
@@ -75,12 +75,12 @@ export class OverviewRulerRenderer extends Disposable {
     } else {
       this._canvas.style.left = decoration.options.x ? `${decoration.options.x * this._renderService.dimensions.actualCellWidth}px` : '';
     }
-    if (!decoration.options.overviewRulerItemColor) {
+    if (!decoration.options.overviewRulerOptions?.color) {
       this._decorationElements.delete(decoration);
       return;
     }
     this._ctx.lineWidth = 1;
-    this._ctx.strokeStyle = decoration.options.overviewRulerItemColor;
+    this._ctx.strokeStyle = decoration.options.overviewRulerOptions.color;
     this._ctx.strokeRect(
       0,
       Math.round(this._canvas.height * (decoration.options.marker.line / this._bufferService.buffers.active.lines.length)),
diff --git a/src/common/services/DecorationService.ts b/src/common/services/DecorationService.ts
index d561e91b..9d7e3314 100644
--- a/src/common/services/DecorationService.ts
+++ b/src/common/services/DecorationService.ts
@@ -68,8 +68,9 @@ class Decoration extends Disposable implements IInternalDecoration {
     this.marker.onDispose(() => this.dispose());
   }
   public override dispose(): void {
-    this.element?.remove();
     this._onDispose.fire();
+    this.element?.remove();
+    this.element = undefined;
     super.dispose();
   }
 }
diff --git a/test/api/Terminal.api.ts b/test/api/Terminal.api.ts
index c1412223..0a6732d7 100644
--- a/test/api/Terminal.api.ts
+++ b/test/api/Terminal.api.ts
@@ -744,18 +744,6 @@ describe('API Integration Tests', function(): void {
       await page.evaluate(`window.term.resize(10, 5)`);
       assert.equal(await page.evaluate(`document.querySelectorAll('.xterm-screen .xterm-decoration').length`), 0);
     });
-    it('should register decorations and render them when open is called', async () => {
-      await openTerminal(page);
-      await writeSync(page, '\\n\\n\\n\\n');
-      await writeSync(page, '\\n\\n\\n\\n');
-      await writeSync(page, '\\n\\n\\n\\n');
-      await page.evaluate(`window.marker1 = window.term.addMarker(1)`);
-      await page.evaluate(`window.marker2 = window.term.addMarker(2)`);
-      await page.evaluate(`window.term.registerDecoration({ marker: window.marker1 })`);
-      await page.evaluate(`window.term.registerDecoration({ marker: window.marker2 })`);
-      await page.evaluate(`window.term.open(document.querySelector('#terminal-container'))`);
-      assert.equal(await page.evaluate(`document.querySelectorAll('.xterm-screen .xterm-decoration').length`), 2);
-    });
     it('on resize should dispose of the old decoration and create a new one', async () => {
       await openTerminal(page);
       await writeSync(page, '\\n\\n\\n\\n');
diff --git a/typings/xterm.d.ts b/typings/xterm.d.ts
index 986e77c9..c6062967 100644
--- a/typings/xterm.d.ts
+++ b/typings/xterm.d.ts
@@ -478,10 +478,12 @@ declare module 'xterm' {
     height?: number;
 
     /**
-     * When provided, renders the decoration in the scrollbar
-     * with the given color
+     * Renders the decoration in the scrollbar
+     * with the given @param color and optional @param position.
+     * If @param position is not set, it will span the full @param overviewRulerWidth, which
+     * must be provided via @TerminalOptions for this to work.
      */
-    overviewRulerItemColor?: string;
+    overviewRulerOptions?: { color: string; position?: 'left' | 'center' | 'right'}
   }
 
   /**