diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts index ce01e4468e5..4433f18e97d 100644 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts @@ -118,7 +118,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType this.pathSeparator = path.sep; this.lastStart = Date.now(); - // tslint:disable-next-line: no-var-keyword + // eslint-disable-next-line no-var var p = new Promise((resolve, reject) => { this._onReady = { promise: p, resolve, reject }; }); diff --git a/src/vs/base/common/uri.ts b/src/vs/base/common/uri.ts index 19f89eec626..78c9fda1d71 100644 --- a/src/vs/base/common/uri.ts +++ b/src/vs/base/common/uri.ts @@ -389,7 +389,7 @@ interface UriState extends UriComponents { const _pathSepMarker = isWindows ? 1 : undefined; -// tslint:disable-next-line:class-name +// eslint-disable-next-line @typescript-eslint/class-name-casing class _URI extends URI { _formatted: string | null = null; diff --git a/src/vs/base/test/common/event.test.ts b/src/vs/base/test/common/event.test.ts index a0e8ca9fcfa..8c9d65ba20b 100644 --- a/src/vs/base/test/common/event.test.ts +++ b/src/vs/base/test/common/event.test.ts @@ -136,6 +136,7 @@ suite('Event', function () { let a = new Emitter(); let hit = false; a.event(function () { + // eslint-disable-next-line no-throw-literal throw 9; }); a.event(function () { diff --git a/src/vs/base/test/node/keytar.test.ts b/src/vs/base/test/node/keytar.test.ts index 53f1c31a1a6..b2f7bab5042 100644 --- a/src/vs/base/test/node/keytar.test.ts +++ b/src/vs/base/test/node/keytar.test.ts @@ -28,7 +28,7 @@ suite('Keytar', () => { try { await keytar.deletePassword(name, 'foo'); } finally { - // tslint:disable-next-line: no-unsafe-finally + // eslint-disable-next-line no-unsafe-finally throw err; } } diff --git a/src/vs/editor/test/node/classification/typescript-test.ts b/src/vs/editor/test/node/classification/typescript-test.ts index bf8856d2f76..f1a8a21c22d 100644 --- a/src/vs/editor/test/node/classification/typescript-test.ts +++ b/src/vs/editor/test/node/classification/typescript-test.ts @@ -1,5 +1,5 @@ /// -/* tslint:disable */ +/* eslint-disable */ const x01 = "string"; /// ^^^^^^^^ string diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts index d0654bc1caf..a91b5ed5987 100644 --- a/src/vs/platform/contextkey/common/contextkey.ts +++ b/src/vs/platform/contextkey/common/contextkey.ts @@ -282,10 +282,9 @@ export class ContextKeyEqualsExpr implements ContextKeyExpr { } public evaluate(context: IContext): boolean { - /* tslint:disable:triple-equals */ // Intentional == + // eslint-disable-next-line eqeqeq return (context.getValue(this.key) == this.value); - /* tslint:enable:triple-equals */ } public serialize(): string { @@ -348,10 +347,9 @@ export class ContextKeyNotEqualsExpr implements ContextKeyExpr { } public evaluate(context: IContext): boolean { - /* tslint:disable:triple-equals */ // Intentional != + // eslint-disable-next-line eqeqeq return (context.getValue(this.key) != this.value); - /* tslint:enable:triple-equals */ } public serialize(): string { diff --git a/src/vs/platform/sign/node/signService.ts b/src/vs/platform/sign/node/signService.ts index dac29b90c0c..b6d0afd467c 100644 --- a/src/vs/platform/sign/node/signService.ts +++ b/src/vs/platform/sign/node/signService.ts @@ -5,9 +5,8 @@ import { ISignService } from 'vs/platform/sign/common/sign'; -/* tslint:disable */ - declare module vsda { + // eslint-disable-next-line @typescript-eslint/class-name-casing export class signer { sign(arg: any): any; } diff --git a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts index 50063ae1e88..93958775e4f 100644 --- a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts +++ b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts @@ -37,10 +37,11 @@ import { isFullscreen } from 'vs/base/browser/browser'; import { IHostService } from 'vs/workbench/services/host/browser/host'; // TODO@sbatten https://github.com/microsoft/vscode/issues/81360 -// tslint:disable-next-line: import-patterns layering TODO@sbatten +// eslint-disable-next-line code-layering, code-import-patterns import { IElectronService } from 'vs/platform/electron/node/electron'; import { optional } from 'vs/platform/instantiation/common/instantiation'; -// tslint:disable-next-line: import-patterns layering TODO@sbatten +// TODO@sbatten +// eslint-disable-next-line code-layering, code-import-patterns import { IElectronEnvironmentService } from 'vs/workbench/services/electron/electron-browser/electronEnvironmentService'; import { BrowserFeatures } from 'vs/base/browser/canIUse'; diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts index 2af28e59378..09a3338ddcc 100644 --- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts +++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts @@ -43,7 +43,7 @@ import { IProductService } from 'vs/platform/product/common/productService'; import { REMOTE_HOST_SCHEME } from 'vs/platform/remote/common/remoteHosts'; // TODO@sbatten https://github.com/microsoft/vscode/issues/81360 -// tslint:disable-next-line: import-patterns layering +// eslint-disable-next-line code-layering, code-import-patterns import { IElectronService } from 'vs/platform/electron/node/electron'; export class TitlebarPart extends Part implements ITitleService { diff --git a/src/vs/workbench/services/extensions/test/node/rpcProtocol.test.ts b/src/vs/workbench/services/extensions/test/node/rpcProtocol.test.ts index 404e8b259f6..51951f79e20 100644 --- a/src/vs/workbench/services/extensions/test/node/rpcProtocol.test.ts +++ b/src/vs/workbench/services/extensions/test/node/rpcProtocol.test.ts @@ -190,6 +190,7 @@ suite('RPCProtocol', () => { test('issue #72798: null errors are hard to digest', function (done) { delegate = (a1: number, a2: number) => { + // eslint-disable-next-line no-throw-literal throw { 'what': 'what' }; }; bProxy.$m(4, 1).then((res) => {