Skip to content

Commit 5a6d476

Browse files
weswighamweswigham
committed
Fix as many linter errors as possible
1 parent bb3fb7d commit 5a6d476

File tree

7 files changed

+40
-34
lines changed

7 files changed

+40
-34
lines changed

‎src/compiler/checker.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,9 @@ namespace ts {
211211
let assignableRelation: Map<RelationComparisonResult> = {};
212212
let identityRelation: Map<RelationComparisonResult> = {};
213213

214+
// This is for caching the result of getSymbolDisplayBuilder. Do not access directly.
215+
let _displayBuilder: SymbolDisplayBuilder;
216+
214217
type TypeSystemEntity = Symbol | Type | Signature;
215218

216219
const enum TypeSystemPropertyName {
@@ -1490,8 +1493,6 @@ namespace ts {
14901493
return undefined;
14911494
}
14921495

1493-
// This is for caching the result of getSymbolDisplayBuilder. Do not access directly.
1494-
let _displayBuilder: SymbolDisplayBuilder;
14951496
function getSymbolDisplayBuilder(): SymbolDisplayBuilder {
14961497

14971498
function getNameOfSymbol(symbol: Symbol): string {
@@ -3448,7 +3449,7 @@ namespace ts {
34483449
// type, a property is considered known if it is known in any constituent type.
34493450
function isKnownProperty(type: Type, name: string): boolean {
34503451
if (type.flags & TypeFlags.ObjectType && type !== globalObjectType) {
3451-
var resolved = resolveStructuredTypeMembers(type);
3452+
const resolved = resolveStructuredTypeMembers(type);
34523453
return !!(resolved.properties.length === 0 ||
34533454
resolved.stringIndexType ||
34543455
resolved.numberIndexType ||

‎src/compiler/core.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,10 @@ namespace ts {
219219
export function reduceLeft<T, U>(array: T[], f: (a: U, x: T) => U, initial: U): U;
220220
export function reduceLeft<T, U>(array: T[], f: (a: U, x: T) => U, initial?: U): U {
221221
if (array) {
222-
var count = array.length;
222+
const count = array.length;
223223
if (count > 0) {
224-
var pos = 0;
225-
var result = arguments.length <= 2 ? array[pos++] : initial;
224+
let pos = 0;
225+
let result = arguments.length <= 2 ? array[pos++] : initial;
226226
while (pos < count) {
227227
result = f(<U>result, array[pos++]);
228228
}
@@ -236,9 +236,9 @@ namespace ts {
236236
export function reduceRight<T, U>(array: T[], f: (a: U, x: T) => U, initial: U): U;
237237
export function reduceRight<T, U>(array: T[], f: (a: U, x: T) => U, initial?: U): U {
238238
if (array) {
239-
var pos = array.length - 1;
239+
let pos = array.length - 1;
240240
if (pos >= 0) {
241-
var result = arguments.length <= 2 ? array[pos--] : initial;
241+
let result = arguments.length <= 2 ? array[pos--] : initial;
242242
while (pos >= 0) {
243243
result = f(<U>result, array[pos--]);
244244
}
@@ -805,4 +805,4 @@ namespace ts {
805805
Debug.assert(false, message);
806806
}
807807
}
808-
}
808+
}

‎src/compiler/emitter.ts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
12481248
// Don't emit empty strings
12491249
if (children[i].kind === SyntaxKind.JsxText) {
12501250
let text = getTextToEmit(<JsxText>children[i]);
1251-
if(text !== undefined) {
1251+
if (text !== undefined) {
12521252
write(', "');
12531253
write(text);
12541254
write('"');
@@ -4255,11 +4255,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
42554255
emitDetachedComments(ctor.body.statements);
42564256
}
42574257
emitCaptureThisForNodeIfNecessary(node);
4258+
let superCall: ExpressionStatement;
42584259
if (ctor) {
42594260
emitDefaultValueAssignments(ctor);
42604261
emitRestParameter(ctor);
42614262
if (baseTypeElement) {
4262-
var superCall = findInitialSuperCall(ctor);
4263+
superCall = findInitialSuperCall(ctor);
42634264
if (superCall) {
42644265
writeLine();
42654266
emit(superCall);
@@ -4936,7 +4937,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
49364937
let temp = createAndRecordTempVariable(TempFlags.Auto);
49374938
write("(typeof (");
49384939
emitNodeWithoutSourceMap(temp);
4939-
write(" = ")
4940+
write(" = ");
49404941
emitEntityNameAsExpression(typeName, /*useFallback*/ true);
49414942
write(") === 'function' && ");
49424943
emitNodeWithoutSourceMap(temp);
@@ -4995,7 +4996,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
49954996
//
49964997
// For the rules on serializing the type of each parameter declaration, see `serializeTypeOfDeclaration`.
49974998
if (node) {
4998-
var valueDeclaration: FunctionLikeDeclaration;
4999+
let valueDeclaration: FunctionLikeDeclaration;
49995000
if (node.kind === SyntaxKind.ClassDeclaration) {
50005001
valueDeclaration = getFirstConstructorWithBody(<ClassDeclaration>node);
50015002
}
@@ -5004,16 +5005,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
50045005
}
50055006

50065007
if (valueDeclaration) {
5007-
var parameters = valueDeclaration.parameters;
5008-
var parameterCount = parameters.length;
5008+
const parameters = valueDeclaration.parameters;
5009+
const parameterCount = parameters.length;
50095010
if (parameterCount > 0) {
50105011
for (var i = 0; i < parameterCount; i++) {
50115012
if (i > 0) {
50125013
write(", ");
50135014
}
50145015

50155016
if (parameters[i].dotDotDotToken) {
5016-
var parameterType = parameters[i].type;
5017+
let parameterType = parameters[i].type;
50175018
if (parameterType.kind === SyntaxKind.ArrayType) {
50185019
parameterType = (<ArrayTypeNode>parameterType).elementType;
50195020
}
@@ -5825,7 +5826,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
58255826
writeLine();
58265827
write("}");
58275828
writeLine();
5828-
write(`${exportFunctionForFile}(exports);`)
5829+
write(`${exportFunctionForFile}(exports);`);
58295830
decreaseIndent();
58305831
writeLine();
58315832
write("}");
@@ -6173,7 +6174,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
61736174
// exports_(reexports);
61746175
let reexportsVariableName = makeUniqueName("reexports");
61756176
writeLine();
6176-
write(`var ${reexportsVariableName} = {};`)
6177+
write(`var ${reexportsVariableName} = {};`);
61776178
writeLine();
61786179
for (let e of (<ExportDeclaration>importNode).exportClause.elements) {
61796180
write(`${reexportsVariableName}["`);

‎src/compiler/parser.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3148,7 +3148,7 @@ namespace ts {
31483148
}
31493149

31503150
function parseAwaitExpression() {
3151-
var node = <AwaitExpression>createNode(SyntaxKind.AwaitExpression);
3151+
const node = <AwaitExpression>createNode(SyntaxKind.AwaitExpression);
31523152
nextToken();
31533153
node.expression = parseUnaryExpressionOrHigher();
31543154
return finishNode(node);
@@ -5140,7 +5140,7 @@ namespace ts {
51405140
// the 'from' keyword can be parsed as a named export when the export clause is unterminated (i.e. `export { from "moduleName";`)
51415141
// If we don't have a 'from' keyword, see if we have a string literal such that ASI won't take effect.
51425142
if (token === SyntaxKind.FromKeyword || (token === SyntaxKind.StringLiteral && !scanner.hasPrecedingLineBreak())) {
5143-
parseExpected(SyntaxKind.FromKeyword)
5143+
parseExpected(SyntaxKind.FromKeyword);
51445144
node.moduleSpecifier = parseModuleSpecifier();
51455145
}
51465146
}

‎src/compiler/sys.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace ts {
3131
declare var __filename: string;
3232
declare var Buffer: {
3333
new (str: string, encoding ?: string): any;
34-
}
34+
};
3535

3636
declare class Enumerator {
3737
public atEnd(): boolean;
@@ -188,13 +188,13 @@ namespace ts {
188188
};
189189
}
190190
function getNodeSystem(): System {
191-
var _fs = require("fs");
192-
var _path = require("path");
193-
var _os = require('os');
191+
const _fs = require("fs");
192+
const _path = require("path");
193+
const _os = require('os');
194194

195-
var platform: string = _os.platform();
195+
const platform: string = _os.platform();
196196
// win32\win64 are case insensitive platforms, MacOS (darwin) by default is also case insensitive
197-
var useCaseSensitiveFileNames = platform !== "win32" && platform !== "win64" && platform !== "darwin";
197+
const useCaseSensitiveFileNames = platform !== "win32" && platform !== "win64" && platform !== "darwin";
198198

199199
function readFile(fileName: string, encoding?: string): string {
200200
if (!_fs.existsSync(fileName)) {
@@ -271,10 +271,10 @@ namespace ts {
271271
newLine: _os.EOL,
272272
useCaseSensitiveFileNames: useCaseSensitiveFileNames,
273273
write(s: string): void {
274-
var buffer = new Buffer(s, 'utf8');
275-
var offset: number = 0;
276-
var toWrite: number = buffer.length;
277-
var written = 0;
274+
const buffer = new Buffer(s, 'utf8');
275+
let offset: number = 0;
276+
let toWrite: number = buffer.length;
277+
let written = 0;
278278
// 1 is a standard descriptor for stdout
279279
while ((written = _fs.writeSync(1, buffer, offset, toWrite)) < toWrite) {
280280
offset += written;
@@ -297,7 +297,7 @@ namespace ts {
297297
}
298298

299299
callback(fileName);
300-
};
300+
}
301301
},
302302
resolvePath: function (path: string): string {
303303
return _path.resolve(path);

‎src/harness/harness.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
/// <reference path='sourceMapRecorder.ts'/>
2525
/// <reference path='runnerbase.ts'/>
2626

27+
// Block scoped definitions work poorly for global variables, temporarily enable var
28+
/* tslint:disable:no-var-keyword */
2729
var Buffer: BufferConstructor = require('buffer').Buffer;
2830

2931
// this will work in the browser via browserify
@@ -32,6 +34,7 @@ var assert: typeof _chai.assert = _chai.assert;
3234
var expect: typeof _chai.expect = _chai.expect;
3335
declare var __dirname: string; // Node-specific
3436
var global = <any>Function("return this").call(null);
37+
/* tslint:enable:no-var-keyword */
3538

3639
module Utils {
3740
// Setup some globals based on the current environment
@@ -412,6 +415,7 @@ module Harness {
412415
log(text: string): void;
413416
getMemoryUsage?(): number;
414417
}
418+
export var IO: IO;
415419

416420
module IOImpl {
417421
declare class Enumerator {
@@ -690,7 +694,6 @@ module Harness {
690694
}
691695
}
692696

693-
export var IO: IO;
694697
switch (Utils.getExecutionEnvironment()) {
695698
case Utils.ExecutionEnvironment.CScript:
696699
IO = IOImpl.CScript;

‎src/harness/rwcRunner.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,11 @@ module RWC {
7474
});
7575

7676
// Add files to compilation
77+
let isInInputList = (resolvedPath: string) => (inputFile: { unitName: string; content: string; }) => inputFile.unitName === resolvedPath;
7778
for (let fileRead of ioLog.filesRead) {
7879
// Check if the file is already added into the set of input files.
79-
var resolvedPath = ts.normalizeSlashes(ts.sys.resolvePath(fileRead.path));
80-
let inInputList = ts.forEach(inputFiles, inputFile => inputFile.unitName === resolvedPath);
80+
const resolvedPath = ts.normalizeSlashes(ts.sys.resolvePath(fileRead.path));
81+
let inInputList = ts.forEach(inputFiles, isInInputList(resolvedPath));
8182

8283
if (!Harness.isLibraryFile(fileRead.path)) {
8384
if (inInputList) {

0 commit comments

Comments
 (0)