From 9e650cea9ff221fee7275be65443eb2905cd7fff Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 28 Jul 2022 11:00:08 -0700
Subject: [PATCH] Fix service access in canvas addon

---
 addons/xterm-addon-canvas/src/CanvasAddon.ts    | 10 ++++++----
 addons/xterm-addon-canvas/src/CanvasRenderer.ts |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/xterm-addon-canvas/src/CanvasAddon.ts b/addons/xterm-addon-canvas/src/CanvasAddon.ts
index 8b8dcee6..26fad8bd 100644
--- a/addons/xterm-addon-canvas/src/CanvasAddon.ts
+++ b/addons/xterm-addon-canvas/src/CanvasAddon.ts
@@ -3,10 +3,10 @@
  * @license MIT
  */
 
-import { IRenderService } from 'browser/services/Services';
+import { ICharSizeService, IRenderService } from 'browser/services/Services';
 import { IColorSet } from 'browser/Types';
 import { CanvasRenderer } from './CanvasRenderer';
-import { IBufferService, IInstantiationService } from 'common/services/Services';
+import { IBufferService, IInstantiationService, IOptionsService } from 'common/services/Services';
 import { ITerminalAddon, Terminal } from 'xterm';
 
 export class CanvasAddon implements ITerminalAddon {
@@ -19,12 +19,14 @@ export class CanvasAddon implements ITerminalAddon {
     }
     this._terminal = terminal;
     const instantiationService: IInstantiationService = (terminal as any)._core._instantiationService;
-    const bufferService: IBufferService = (terminal as any)._core._renderService;
+    const bufferService: IBufferService = (terminal as any)._core._bufferService;
     const renderService: IRenderService = (terminal as any)._core._renderService;
+    const charSizeService: ICharSizeService = (terminal as any)._core._charSizeService;
+    const optionsService: IOptionsService = (terminal as any)._core.optionsService;
     const colors: IColorSet = (terminal as any)._core._colorManager.colors;
     const screenElement: HTMLElement = (terminal as any)._core.screenElement;
     const linkifier = (terminal as any)._core.linkifier2;
-    this._renderer = instantiationService.createInstance(CanvasRenderer, colors, screenElement, linkifier);
+    this._renderer = new CanvasRenderer(colors, screenElement, linkifier, instantiationService, bufferService, charSizeService, optionsService);
     renderService.setRenderer(this._renderer);
     renderService.onResize(bufferService.cols, bufferService.rows);
   }
diff --git a/addons/xterm-addon-canvas/src/CanvasRenderer.ts b/addons/xterm-addon-canvas/src/CanvasRenderer.ts
index 238d9bbb..7239005a 100644
--- a/addons/xterm-addon-canvas/src/CanvasRenderer.ts
+++ b/addons/xterm-addon-canvas/src/CanvasRenderer.ts
@@ -34,10 +34,10 @@ export class CanvasRenderer extends Disposable implements IRenderer {
     private _colors: IColorSet,
     private readonly _screenElement: HTMLElement,
     linkifier2: ILinkifier2,
-    @IInstantiationService instantiationService: IInstantiationService,
-    @IBufferService private readonly _bufferService: IBufferService,
-    @ICharSizeService private readonly _charSizeService: ICharSizeService,
-    @IOptionsService private readonly _optionsService: IOptionsService
+    instantiationService: IInstantiationService,
+    private readonly _bufferService: IBufferService,
+    private readonly _charSizeService: ICharSizeService,
+    private readonly _optionsService: IOptionsService
   ) {
     super();
     const allowTransparency = this._optionsService.rawOptions.allowTransparency;