Merge branch 'master' into decoration_queue

src/browser/AccessibilityManager.ts

@@ -53,7 +53,6 @@ export class AccessibilityManager extends Disposable {
   ) {
     super();
     this._accessibilityTreeRoot = document.createElement('div');
-    this._accessibilityTreeRoot.setAttribute('role', 'document');
     this._accessibilityTreeRoot.classList.add('xterm-accessibility');
     this._accessibilityTreeRoot.tabIndex = 0;
 

src/browser/services/DecorationService.ts

@@ -134,23 +134,6 @@ export class Decoration extends Disposable implements IDecoration {
     } else {
       this._element.style.left = this.x ? `${this.x * renderService.dimensions.actualCellWidth}px` : '';
     }
-    this.register({
-      dispose: () => {
-        if (this.isDisposed) {
-          return;
-        }
-        if (!this.marker.isDisposed) {
-          this.marker.dispose();
-        }
-        if (this._element && this._container.contains(this._element)) {
-          this._container.removeChild(this._element);
-        }
-        this.isDisposed = true;
-        // Emit before super.dispose such that dispose listeners get a change to react
-        this._onDispose.fire();
-        super.dispose();
-      }
-    });
   }
 
   private _refreshStyle(renderService: IRenderService): void {
@@ -166,4 +149,15 @@ export class Decoration extends Disposable implements IDecoration {
       this._element.style.display = this._bufferService.buffer === this._bufferService.buffers.alt ? 'none' : 'block';
     }
   }
+
+  public override dispose(): void {
+    if (this.isDisposed) {
+      return;
+    }
+    if (this._element && this._container.contains(this._element)) {
+      this._container.removeChild(this._element);
+    }
+    this.isDisposed = true;
+    this._onDispose.fire();
+  }
 }

src/common/buffer/Buffer.ts

@@ -587,10 +587,12 @@ export class Buffer implements IBuffer {
 
   public clearMarkers(y?: number): void {
     this._isClearing = true;
-    if (y) {
-      for (const marker of this.markers.filter(m => m.line === y)) {
-        marker.dispose();
-        this.markers.splice(this.markers.indexOf(marker), 1);
+    if (y !== undefined) {
+      for (let i = 0; i < this.markers.length; i++) {
+        if (this.markers[i].line === y) {
+          this.markers[i].dispose();
+          this.markers.splice(i, 1);
+        }
       }
     } else {
       for (const marker of this.markers) {