Merge pull request #3959 from Tyriar/canvas_services

Fix service access in canvas addon
xtermjs · Jul 28, 2022 · 60f9bf4 · 60f9bf4
2 parents de78344 + 9e650ce
commit 60f9bf4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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;