Skip to content

Commit d367eb4

Browse files
authored
Merge branch 'master' into fix_4720
2 parents 7c164ef + 40e51ab commit d367eb4

File tree

9 files changed

+9
-22
lines changed

9 files changed

+9
-22
lines changed

.eslintrc.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,11 @@
127127
{ "selector": "typeLike", "format": ["PascalCase"] },
128128
{ "selector": "interface", "format": ["PascalCase"], "prefix": ["I"] }
129129
],
130+
"@typescript-eslint/no-confusing-void-expression": [
131+
"warn",
132+
{ "ignoreArrowShorthand": true }
133+
],
134+
"@typescript-eslint/no-useless-constructor": "warn",
130135
"@typescript-eslint/prefer-namespace-keyword": "warn",
131136
"@typescript-eslint/type-annotation-spacing": "warn",
132137
"@typescript-eslint/quotes": [

addons/xterm-addon-fit/src/FitAddon.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ const MINIMUM_ROWS = 1;
2424
export class FitAddon implements ITerminalAddon {
2525
private _terminal: Terminal | undefined;
2626

27-
constructor() {}
28-
2927
public activate(terminal: Terminal): void {
3028
this._terminal = terminal;
3129
}

addons/xterm-addon-fit/test/FitAddon.api.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ describe('FitAddon', () => {
4141
});
4242

4343
describe('proposeDimensions', () => {
44-
afterEach(async () => {
45-
return await unloadFit();
46-
});
44+
afterEach(() => unloadFit());
4745

4846
it('default', async function(): Promise<any> {
4947
await loadFit();
@@ -82,9 +80,7 @@ describe('FitAddon', () => {
8280
});
8381

8482
describe('fit', () => {
85-
afterEach(async () => {
86-
return await unloadFit();
87-
});
83+
afterEach(() => unloadFit());
8884

8985
it('default', async function(): Promise<any> {
9086
await loadFit();

addons/xterm-addon-serialize/src/SerializeAddon.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,6 @@ class StringSerializeHandler extends BaseSerializeHandler {
414414
export class SerializeAddon implements ITerminalAddon {
415415
private _terminal: Terminal | undefined;
416416

417-
constructor() { }
418-
419417
public activate(terminal: Terminal): void {
420418
this._terminal = terminal;
421419
}

src/browser/Linkifier2.test.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ import { MockBufferService } from 'common/TestUtils.test';
1010
import { ILink } from 'browser/Types';
1111

1212
class TestLinkifier2 extends Linkifier2 {
13-
constructor(bufferService: IBufferService) {
14-
super(bufferService);
15-
}
16-
1713
public set currentLink(link: any) {
1814
this._currentLink = link;
1915
}

src/browser/public/Terminal.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ export class Terminal extends Disposable implements ITerminalApi {
236236
this._core.clearTextureAtlas();
237237
}
238238
public loadAddon(addon: ITerminalAddon): void {
239-
return this._addonManager.loadAddon(this, addon);
239+
this._addonManager.loadAddon(this, addon);
240240
}
241241
public static get strings(): ILocalizableStrings {
242242
return Strings;

src/common/Lifecycle.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ export abstract class Disposable implements IDisposable {
1313
protected _disposables: IDisposable[] = [];
1414
protected _isDisposed: boolean = false;
1515

16-
constructor() {
17-
}
18-
1916
/**
2017
* Disposes the object, triggering the `dispose` method on all registered IDisposables.
2118
*/

src/common/public/AddonManager.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ export interface ILoadedAddon {
1414
export class AddonManager implements IDisposable {
1515
protected _addons: ILoadedAddon[] = [];
1616

17-
constructor() {
18-
}
19-
2017
public dispose(): void {
2118
for (let i = this._addons.length - 1; i >= 0; i--) {
2219
this._addons[i].instance.dispose();

src/headless/public/Terminal.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ export class Terminal extends Disposable implements ITerminalApi {
182182
}
183183
public loadAddon(addon: ITerminalAddon): void {
184184
// TODO: This could cause issues if the addon calls renderer apis
185-
return this._addonManager.loadAddon(this as any, addon);
185+
this._addonManager.loadAddon(this as any, addon);
186186
}
187187

188188
private _verifyIntegers(...values: number[]): void {

0 commit comments

Comments
 (0)