From 2fe082beea9a10a3cad0e890253dd19d72f44e86 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Thu, 24 Aug 2023 06:33:11 -0700 Subject: [PATCH] Warn on eslint rule @typescript-eslint/no-confusing-void-expression --- .eslintrc.json | 4 ++++ addons/xterm-addon-fit/test/FitAddon.api.ts | 8 ++------ src/browser/public/Terminal.ts | 2 +- src/headless/public/Terminal.ts | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 7e8be09c..822dd9af 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -127,6 +127,10 @@ { "selector": "typeLike", "format": ["PascalCase"] }, { "selector": "interface", "format": ["PascalCase"], "prefix": ["I"] } ], + "@typescript-eslint/no-confusing-void-expression": [ + "warn", + { "ignoreArrowShorthand": true } + ], "@typescript-eslint/prefer-namespace-keyword": "warn", "@typescript-eslint/type-annotation-spacing": "warn", "@typescript-eslint/quotes": [ diff --git a/addons/xterm-addon-fit/test/FitAddon.api.ts b/addons/xterm-addon-fit/test/FitAddon.api.ts index ef4618ea..36b44211 100644 --- a/addons/xterm-addon-fit/test/FitAddon.api.ts +++ b/addons/xterm-addon-fit/test/FitAddon.api.ts @@ -41,9 +41,7 @@ describe('FitAddon', () => { }); describe('proposeDimensions', () => { - afterEach(async () => { - return await unloadFit(); - }); + afterEach(() => unloadFit()); it('default', async function(): Promise { await loadFit(); @@ -82,9 +80,7 @@ describe('FitAddon', () => { }); describe('fit', () => { - afterEach(async () => { - return await unloadFit(); - }); + afterEach(() => unloadFit()); it('default', async function(): Promise { await loadFit(); diff --git a/src/browser/public/Terminal.ts b/src/browser/public/Terminal.ts index 4db5f7aa..2c75d7b8 100644 --- a/src/browser/public/Terminal.ts +++ b/src/browser/public/Terminal.ts @@ -236,7 +236,7 @@ export class Terminal extends Disposable implements ITerminalApi { this._core.clearTextureAtlas(); } public loadAddon(addon: ITerminalAddon): void { - return this._addonManager.loadAddon(this, addon); + this._addonManager.loadAddon(this, addon); } public static get strings(): ILocalizableStrings { return Strings; diff --git a/src/headless/public/Terminal.ts b/src/headless/public/Terminal.ts index 5eeeb361..b018d37c 100644 --- a/src/headless/public/Terminal.ts +++ b/src/headless/public/Terminal.ts @@ -182,7 +182,7 @@ export class Terminal extends Disposable implements ITerminalApi { } public loadAddon(addon: ITerminalAddon): void { // TODO: This could cause issues if the addon calls renderer apis - return this._addonManager.loadAddon(this as any, addon); + this._addonManager.loadAddon(this as any, addon); } private _verifyIntegers(...values: number[]): void {