Skip to content

Commit 4f7184a

Browse files
authored
Fix all new lint failures (#29080)
1 parent c5ee5ea commit 4f7184a

File tree

7 files changed

+14
-23
lines changed

7 files changed

+14
-23
lines changed

src/compiler/binder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ namespace ts {
143143

144144
let symbolCount = 0;
145145

146-
let Symbol: { new (flags: SymbolFlags, name: __String): Symbol }; // tslint:disable-line variable-name
146+
let Symbol: new (flags: SymbolFlags, name: __String) => Symbol; // tslint:disable-line variable-name
147147
let classifiableNames: UnderscoreEscapedMap<true>;
148148

149149
const unreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };

src/compiler/core.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@ namespace ts {
112112
}
113113

114114
// The global Map object. This may not be available, so we must test for it.
115-
declare const Map: { new <T>(): Map<T> } | undefined;
115+
declare const Map: (new <T>() => Map<T>) | undefined;
116116
// Internet Explorer's Map doesn't support iteration, so don't use it.
117117
// tslint:disable-next-line no-in-operator variable-name
118118
export const MapCtr = typeof Map !== "undefined" && "entries" in Map.prototype ? Map : shimMap();
119119

120120
// Keep the class inside a function so it doesn't get compiled if it's not used.
121-
function shimMap(): { new <T>(): Map<T> } {
121+
function shimMap(): new <T>() => Map<T> {
122122

123123
class MapIterator<T, U extends (string | T | [string, T])> {
124124
private data: MapLike<T>;

src/compiler/utilities.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6925,7 +6925,7 @@ namespace ts {
69256925

69266926
export interface ObjectAllocator {
69276927
getNodeConstructor(): new (kind: SyntaxKind, pos?: number, end?: number) => Node;
6928-
getTokenConstructor(): { new <TKind extends SyntaxKind>(kind: TKind, pos?: number, end?: number): Token<TKind> };
6928+
getTokenConstructor(): new <TKind extends SyntaxKind>(kind: TKind, pos?: number, end?: number) => Token<TKind>;
69296929
getIdentifierConstructor(): new (kind: SyntaxKind.Identifier, pos?: number, end?: number) => Identifier;
69306930
getSourceFileConstructor(): new (kind: SyntaxKind.SourceFile, pos?: number, end?: number) => SourceFile;
69316931
getSymbolConstructor(): new (flags: SymbolFlags, name: __String) => Symbol;

src/harness/fourslash.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ namespace FourSlash {
600600
throw new Error("Expected exactly one output from emit of " + this.activeFile.fileName);
601601
}
602602

603-
const evaluation = new Function(`${emit.outputFiles[0].text};\r\nreturn (${expr});`)();
603+
const evaluation = new Function(`${emit.outputFiles[0].text};\r\nreturn (${expr});`)(); // tslint:disable-line:function-constructor
604604
if (evaluation !== value) {
605605
this.raiseError(`Expected evaluation of expression "${expr}" to equal "${value}", but got "${evaluation}"`);
606606
}

src/harness/harness.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@ var assert: typeof _chai.assert = _chai.assert;
2828
};
2929
}
3030

31-
var global: NodeJS.Global = Function("return this").call(undefined);
31+
var global: NodeJS.Global = Function("return this").call(undefined); // tslint:disable-line:function-constructor
3232

3333
declare var window: {};
34-
declare var XMLHttpRequest: {
35-
new(): XMLHttpRequest;
36-
};
34+
declare var XMLHttpRequest: new() => XMLHttpRequest;
3735
interface XMLHttpRequest {
3836
readonly readyState: number;
3937
readonly responseText: string;

src/services/refactors/extractSymbol.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -449,17 +449,15 @@ namespace ts.refactor.extractSymbol {
449449
case SyntaxKind.ThisKeyword:
450450
rangeFacts |= RangeFacts.UsesThis;
451451
break;
452-
case SyntaxKind.LabeledStatement:
453-
{
452+
case SyntaxKind.LabeledStatement: {
454453
const label = (<LabeledStatement>node).label;
455454
(seenLabels || (seenLabels = [])).push(label.escapedText);
456455
forEachChild(node, visit);
457456
seenLabels.pop();
458457
break;
459458
}
460459
case SyntaxKind.BreakStatement:
461-
case SyntaxKind.ContinueStatement:
462-
{
460+
case SyntaxKind.ContinueStatement: {
463461
const label = (<BreakStatement | ContinueStatement>node).label;
464462
if (label) {
465463
if (!contains(seenLabels, label.escapedText)) {

src/tsserver/server.ts

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -388,17 +388,15 @@ namespace ts.server {
388388
this.inspectValuePromise!.resolve(response.result);
389389
this.inspectValuePromise = undefined;
390390
break;
391-
case EventInitializationFailed:
392-
{
391+
case EventInitializationFailed: {
393392
const body: protocol.TypesInstallerInitializationFailedEventBody = {
394393
message: response.message
395394
};
396395
const eventName: protocol.TypesInstallerInitializationFailedEventName = "typesInstallerInitializationFailed";
397396
this.event(body, eventName);
398397
break;
399398
}
400-
case EventBeginInstallTypes:
401-
{
399+
case EventBeginInstallTypes: {
402400
const body: protocol.BeginInstallTypesEventBody = {
403401
eventId: response.eventId,
404402
packages: response.packagesToInstall,
@@ -407,8 +405,7 @@ namespace ts.server {
407405
this.event(body, eventName);
408406
break;
409407
}
410-
case EventEndInstallTypes:
411-
{
408+
case EventEndInstallTypes: {
412409
if (this.telemetryEnabled) {
413410
const body: protocol.TypingsInstalledTelemetryEventBody = {
414411
telemetryEventName: "typingsInstalled",
@@ -431,13 +428,11 @@ namespace ts.server {
431428
this.event(body, eventName);
432429
break;
433430
}
434-
case ActionInvalidate:
435-
{
431+
case ActionInvalidate: {
436432
this.projectService.updateTypingsForProject(response);
437433
break;
438434
}
439-
case ActionSet:
440-
{
435+
case ActionSet: {
441436
if (this.activeRequestCount > 0) {
442437
this.activeRequestCount--;
443438
}

0 commit comments

Comments
 (0)