Merge branch 'merogge/scroll-bar-decorations' of https://github.com/meganrogge/xterm.js into merogge/scroll-bar-decorations

src/browser/Decorations/OverviewRulerRenderer.ts

@@ -122,8 +122,7 @@ export class OverviewRulerRenderer extends Disposable {
   }
 
   private _removeDecoration(decoration: IInternalDecoration): void {
-    const element = this._decorationElements.get(decoration);
-    element?.remove();
+    this._decorationElements.get(decoration)?.remove();
     this._decorationElements.delete(decoration);
   }
 }

src/browser/Terminal.ts

@@ -82,11 +82,8 @@ export class Terminal extends CoreTerminal implements ITerminal {
 
   private _customKeyEventHandler: CustomKeyEventHandler | undefined;
 
-  // TODO: Move into CoreTerminal.ts
-  // common services
-  private _decorationService: DecorationService;
-
   // browser services
+  private _decorationService: DecorationService;
   private _charSizeService: ICharSizeService | undefined;
   private _mouseService: IMouseService | undefined;
   private _renderService: IRenderService | undefined;