Merge pull request #4726 from Tyriar/no_confusing

Warn on eslint rule @typescript-eslint/no-confusing-void-expression
xtermjs · Aug 24, 2023 · 40e51ab · 40e51ab
2 parents 2835976 + f9dc26d
commit 40e51ab
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git 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/no-useless-constructor": "warn",
  "@typescript-eslint/prefer-namespace-keyword": "warn",
  "@typescript-eslint/type-annotation-spacing": "warn",

diff --git 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<any> {
  await loadFit();
@@ -82,9 +80,7 @@ describe('FitAddon', () => {
  });
 
  describe('fit', () => {
- afterEach(async () => {
- return await unloadFit();
- });
+ afterEach(() => unloadFit());
 
  it('default', async function(): Promise<any> {
  await loadFit();

diff --git 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
@@ -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 {