Skip to content

Commit ffeaa2b

Browse files
committed
Remove ! to improve safety
See microsoft/vscode#166909 This doesn't necessarily fix that, but it does remove the hacky ! which could potentially let an error slip past TS.
1 parent 880b726 commit ffeaa2b

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

addons/xterm-addon-webgl/src/WebglRenderer.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ export class WebglRenderer extends Disposable implements IRenderer {
4040

4141
private _canvas: HTMLCanvasElement;
4242
private _gl: IWebGL2RenderingContext;
43-
private _rectangleRenderer!: RectangleRenderer;
44-
private _glyphRenderer!: GlyphRenderer;
43+
private _rectangleRenderer: RectangleRenderer;
44+
private _glyphRenderer: GlyphRenderer;
4545

4646
public readonly dimensions: IRenderDimensions;
4747

@@ -127,7 +127,7 @@ export class WebglRenderer extends Disposable implements IRenderer {
127127

128128
this._core.screenElement!.appendChild(this._canvas);
129129

130-
this._initializeWebGLState();
130+
[this._rectangleRenderer, this._glyphRenderer] = this._initializeWebGLState();
131131

132132
this._isAttached = this._coreBrowserService.window.document.body.contains(this._core.screenElement!);
133133

@@ -235,7 +235,7 @@ export class WebglRenderer extends Disposable implements IRenderer {
235235
/**
236236
* Initializes members dependent on WebGL context state.
237237
*/
238-
private _initializeWebGLState(): void {
238+
private _initializeWebGLState(): [RectangleRenderer, GlyphRenderer] {
239239
// Dispose any previous rectangle and glyph renderers before creating new ones.
240240
this._rectangleRenderer?.dispose();
241241
this._glyphRenderer?.dispose();
@@ -245,6 +245,8 @@ export class WebglRenderer extends Disposable implements IRenderer {
245245

246246
// Update dimensions and acquire char atlas
247247
this.handleCharSizeChanged();
248+
249+
return [this._rectangleRenderer, this._glyphRenderer];
248250
}
249251

250252
/**
@@ -268,7 +270,6 @@ export class WebglRenderer extends Disposable implements IRenderer {
268270
this._coreBrowserService.dpr
269271
);
270272
if (this._charAtlas !== atlas) {
271-
272273
this._charAtlasDisposable?.dispose();
273274
this._onChangeTextureAtlas.fire(atlas.pages[0].canvas);
274275
this._charAtlasDisposable = getDisposeArrayDisposable([

0 commit comments

Comments
 (0)