Merge branch 'master' into fix_4720

This commit is contained in:
jerch
2023-08-24 17:32:08 +02:00
committed by GitHub
9 changed files with 9 additions and 22 deletions
+5
View File
@@ -127,6 +127,11 @@
{ "selector": "typeLike", "format": ["PascalCase"] }, { "selector": "typeLike", "format": ["PascalCase"] },
{ "selector": "interface", "format": ["PascalCase"], "prefix": ["I"] } { "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/prefer-namespace-keyword": "warn",
"@typescript-eslint/type-annotation-spacing": "warn", "@typescript-eslint/type-annotation-spacing": "warn",
"@typescript-eslint/quotes": [ "@typescript-eslint/quotes": [
-2
View File
@@ -24,8 +24,6 @@ const MINIMUM_ROWS = 1;
export class FitAddon implements ITerminalAddon { export class FitAddon implements ITerminalAddon {
private _terminal: Terminal | undefined; private _terminal: Terminal | undefined;
constructor() {}
public activate(terminal: Terminal): void { public activate(terminal: Terminal): void {
this._terminal = terminal; this._terminal = terminal;
} }
+2 -6
View File
@@ -41,9 +41,7 @@ describe('FitAddon', () => {
}); });
describe('proposeDimensions', () => { describe('proposeDimensions', () => {
afterEach(async () => { afterEach(() => unloadFit());
return await unloadFit();
});
it('default', async function(): Promise<any> { it('default', async function(): Promise<any> {
await loadFit(); await loadFit();
@@ -82,9 +80,7 @@ describe('FitAddon', () => {
}); });
describe('fit', () => { describe('fit', () => {
afterEach(async () => { afterEach(() => unloadFit());
return await unloadFit();
});
it('default', async function(): Promise<any> { it('default', async function(): Promise<any> {
await loadFit(); await loadFit();
@@ -414,8 +414,6 @@ class StringSerializeHandler extends BaseSerializeHandler {
export class SerializeAddon implements ITerminalAddon { export class SerializeAddon implements ITerminalAddon {
private _terminal: Terminal | undefined; private _terminal: Terminal | undefined;
constructor() { }
public activate(terminal: Terminal): void { public activate(terminal: Terminal): void {
this._terminal = terminal; this._terminal = terminal;
} }
-4
View File
@@ -10,10 +10,6 @@ import { MockBufferService } from 'common/TestUtils.test';
import { ILink } from 'browser/Types'; import { ILink } from 'browser/Types';
class TestLinkifier2 extends Linkifier2 { class TestLinkifier2 extends Linkifier2 {
constructor(bufferService: IBufferService) {
super(bufferService);
}
public set currentLink(link: any) { public set currentLink(link: any) {
this._currentLink = link; this._currentLink = link;
} }
+1 -1
View File
@@ -236,7 +236,7 @@ export class Terminal extends Disposable implements ITerminalApi {
this._core.clearTextureAtlas(); this._core.clearTextureAtlas();
} }
public loadAddon(addon: ITerminalAddon): void { public loadAddon(addon: ITerminalAddon): void {
return this._addonManager.loadAddon(this, addon); this._addonManager.loadAddon(this, addon);
} }
public static get strings(): ILocalizableStrings { public static get strings(): ILocalizableStrings {
return Strings; return Strings;
-3
View File
@@ -13,9 +13,6 @@ export abstract class Disposable implements IDisposable {
protected _disposables: IDisposable[] = []; protected _disposables: IDisposable[] = [];
protected _isDisposed: boolean = false; protected _isDisposed: boolean = false;
constructor() {
}
/** /**
* Disposes the object, triggering the `dispose` method on all registered IDisposables. * Disposes the object, triggering the `dispose` method on all registered IDisposables.
*/ */
-3
View File
@@ -14,9 +14,6 @@ export interface ILoadedAddon {
export class AddonManager implements IDisposable { export class AddonManager implements IDisposable {
protected _addons: ILoadedAddon[] = []; protected _addons: ILoadedAddon[] = [];
constructor() {
}
public dispose(): void { public dispose(): void {
for (let i = this._addons.length - 1; i >= 0; i--) { for (let i = this._addons.length - 1; i >= 0; i--) {
this._addons[i].instance.dispose(); this._addons[i].instance.dispose();
+1 -1
View File
@@ -182,7 +182,7 @@ export class Terminal extends Disposable implements ITerminalApi {
} }
public loadAddon(addon: ITerminalAddon): void { public loadAddon(addon: ITerminalAddon): void {
// TODO: This could cause issues if the addon calls renderer apis // 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 { private _verifyIntegers(...values: number[]): void {