Skip to content

Commit cb4577e

Browse files
danquirkdanquirk
committed
var->let and a few misc other fixes
1 parent fcf872f commit cb4577e

13 files changed

+788
-792
lines changed

‎src/harness/compilerRunner.ts

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -42,27 +42,27 @@ class CompilerBaselineRunner extends RunnerBase {
4242
describe('compiler tests for ' + fileName, () => {
4343
// Mocha holds onto the closure environment of the describe callback even after the test is done.
4444
// Everything declared here should be cleared out in the "after" callback.
45-
var justName: string;
46-
var content: string;
47-
var testCaseContent: { settings: Harness.TestCaseParser.CompilerSetting[]; testUnitData: Harness.TestCaseParser.TestUnitData[]; };
45+
let justName: string;
46+
let content: string;
47+
let testCaseContent: { settings: Harness.TestCaseParser.CompilerSetting[]; testUnitData: Harness.TestCaseParser.TestUnitData[]; };
4848

49-
var units: Harness.TestCaseParser.TestUnitData[];
50-
var tcSettings: Harness.TestCaseParser.CompilerSetting[];
51-
var createNewInstance: boolean;
49+
let units: Harness.TestCaseParser.TestUnitData[];
50+
let tcSettings: Harness.TestCaseParser.CompilerSetting[];
51+
let createNewInstance: boolean;
5252

53-
var lastUnit: Harness.TestCaseParser.TestUnitData;
54-
var rootDir: string;
53+
let lastUnit: Harness.TestCaseParser.TestUnitData;
54+
let rootDir: string;
5555

56-
var result: Harness.Compiler.CompilerResult;
57-
var program: ts.Program;
58-
var options: ts.CompilerOptions;
56+
let result: Harness.Compiler.CompilerResult;
57+
let program: ts.Program;
58+
let options: ts.CompilerOptions;
5959
// equivalent to the files that will be passed on the command line
60-
var toBeCompiled: { unitName: string; content: string }[];
60+
let toBeCompiled: { unitName: string; content: string }[];
6161
// equivalent to other files on the file system not directly passed to the compiler (ie things that are referenced by other files)
62-
var otherFiles: { unitName: string; content: string }[];
63-
var harnessCompiler: Harness.Compiler.HarnessCompiler;
62+
let otherFiles: { unitName: string; content: string }[];
63+
let harnessCompiler: Harness.Compiler.HarnessCompiler;
6464

65-
var createNewInstance = false;
65+
let createNewInstance = false;
6666

6767
before(() => {
6868
justName = fileName.replace(/^.*[\\\/]/, ''); // strips the fileName from the path.
@@ -105,7 +105,7 @@ class CompilerBaselineRunner extends RunnerBase {
105105
/* The compiler doesn't handle certain flags flipping during a single compilation setting. Tests on these flags will need
106106
a fresh compiler instance for themselves and then create a fresh one for the next test. Would be nice to get dev fixes
107107
eventually to remove this limitation. */
108-
for (var i = 0; i < tcSettings.length; ++i) {
108+
for (let i = 0; i < tcSettings.length; ++i) {
109109
// noImplicitAny is passed to getCompiler, but target is just passed in the settings blob to setCompilerSettings
110110
if (!createNewInstance && (tcSettings[i].flag == "noimplicitany" || tcSettings[i].flag === 'target')) {
111111
harnessCompiler = Harness.Compiler.getCompiler();
@@ -162,7 +162,7 @@ class CompilerBaselineRunner extends RunnerBase {
162162
it('Correct sourcemap content for ' + fileName, () => {
163163
if (options.sourceMap || options.inlineSourceMap) {
164164
Harness.Baseline.runBaseline('Correct sourcemap content for ' + fileName, justName.replace(/\.tsx?$/, '.sourcemap.txt'), () => {
165-
var record = result.getSourceMapRecord();
165+
let record = result.getSourceMapRecord();
166166
if (options.noEmitOnError && result.errors.length !== 0 && record === undefined) {
167167
// Because of the noEmitOnError option no files are created. We need to return null because baselining isn't required.
168168
return null;
@@ -180,33 +180,33 @@ class CompilerBaselineRunner extends RunnerBase {
180180

181181
// check js output
182182
Harness.Baseline.runBaseline('Correct JS output for ' + fileName, justName.replace(/\.tsx?/, '.js'), () => {
183-
var tsCode = '';
184-
var tsSources = otherFiles.concat(toBeCompiled);
183+
let tsCode = '';
184+
let tsSources = otherFiles.concat(toBeCompiled);
185185
if (tsSources.length > 1) {
186186
tsCode += '//// [' + fileName + '] ////\r\n\r\n';
187187
}
188-
for (var i = 0; i < tsSources.length; i++) {
188+
for (let i = 0; i < tsSources.length; i++) {
189189
tsCode += '//// [' + Harness.Path.getFileName(tsSources[i].unitName) + ']\r\n';
190190
tsCode += tsSources[i].content + (i < (tsSources.length - 1) ? '\r\n' : '');
191191
}
192192

193-
var jsCode = '';
194-
for (var i = 0; i < result.files.length; i++) {
193+
let jsCode = '';
194+
for (let i = 0; i < result.files.length; i++) {
195195
jsCode += '//// [' + Harness.Path.getFileName(result.files[i].fileName) + ']\r\n';
196196
jsCode += getByteOrderMarkText(result.files[i]);
197197
jsCode += result.files[i].code;
198198
}
199199

200200
if (result.declFilesCode.length > 0) {
201201
jsCode += '\r\n\r\n';
202-
for (var i = 0; i < result.declFilesCode.length; i++) {
202+
for (let i = 0; i < result.declFilesCode.length; i++) {
203203
jsCode += '//// [' + Harness.Path.getFileName(result.declFilesCode[i].fileName) + ']\r\n';
204204
jsCode += getByteOrderMarkText(result.declFilesCode[i]);
205205
jsCode += result.declFilesCode[i].code;
206206
}
207207
}
208208

209-
var declFileCompilationResult = harnessCompiler.compileDeclarationFiles(toBeCompiled, otherFiles, result, function (settings) {
209+
let declFileCompilationResult = harnessCompiler.compileDeclarationFiles(toBeCompiled, otherFiles, result, function (settings) {
210210
harnessCompiler.setCompilerSettings(tcSettings);
211211
}, options);
212212

@@ -244,8 +244,8 @@ class CompilerBaselineRunner extends RunnerBase {
244244
return null;
245245
}
246246

247-
var sourceMapCode = '';
248-
for (var i = 0; i < result.sourceMaps.length; i++) {
247+
let sourceMapCode = '';
248+
for (let i = 0; i < result.sourceMaps.length; i++) {
249249
sourceMapCode += '//// [' + Harness.Path.getFileName(result.sourceMaps[i].fileName) + ']\r\n';
250250
sourceMapCode += getByteOrderMarkText(result.sourceMaps[i]);
251251
sourceMapCode += result.sourceMaps[i].code;
@@ -293,7 +293,7 @@ class CompilerBaselineRunner extends RunnerBase {
293293

294294
// Produce baselines. The first gives the types for all expressions.
295295
// The second gives symbols for all identifiers.
296-
var e1: Error, e2: Error;
296+
let e1: Error, e2: Error;
297297
try {
298298
checkBaseLines(/*isSymbolBaseLine:*/ false);
299299
}
@@ -335,32 +335,32 @@ class CompilerBaselineRunner extends RunnerBase {
335335
let typeMap: { [fileName: string]: { [lineNum: number]: string[]; } } = {};
336336

337337
allFiles.forEach(file => {
338-
var codeLines = file.content.split('\n');
338+
let codeLines = file.content.split('\n');
339339
typeWriterResults[file.unitName].forEach(result => {
340340
if (isSymbolBaseline && !result.symbol) {
341341
return;
342342
}
343343

344-
var typeOrSymbolString = isSymbolBaseline ? result.symbol : result.type;
345-
var formattedLine = result.sourceText.replace(/\r?\n/g, "") + " : " + typeOrSymbolString;
344+
let typeOrSymbolString = isSymbolBaseline ? result.symbol : result.type;
345+
let formattedLine = result.sourceText.replace(/\r?\n/g, "") + " : " + typeOrSymbolString;
346346
if (!typeMap[file.unitName]) {
347347
typeMap[file.unitName] = {};
348348
}
349349

350-
var typeInfo = [formattedLine];
351-
var existingTypeInfo = typeMap[file.unitName][result.line];
350+
let typeInfo = [formattedLine];
351+
let existingTypeInfo = typeMap[file.unitName][result.line];
352352
if (existingTypeInfo) {
353353
typeInfo = existingTypeInfo.concat(typeInfo);
354354
}
355355
typeMap[file.unitName][result.line] = typeInfo;
356356
});
357357

358358
typeLines.push('=== ' + file.unitName + ' ===\r\n');
359-
for (var i = 0; i < codeLines.length; i++) {
360-
var currentCodeLine = codeLines[i];
359+
for (let i = 0; i < codeLines.length; i++) {
360+
let currentCodeLine = codeLines[i];
361361
typeLines.push(currentCodeLine + '\r\n');
362362
if (typeMap[file.unitName]) {
363-
var typeInfo = typeMap[file.unitName][i];
363+
let typeInfo = typeMap[file.unitName][i];
364364
if (typeInfo) {
365365
typeInfo.forEach(ty => {
366366
typeLines.push('>' + ty + '\r\n');
@@ -388,13 +388,13 @@ class CompilerBaselineRunner extends RunnerBase {
388388
public initializeTests() {
389389
describe(this.testSuiteName + ' tests', () => {
390390
describe("Setup compiler for compiler baselines", () => {
391-
var harnessCompiler = Harness.Compiler.getCompiler();
391+
let harnessCompiler = Harness.Compiler.getCompiler();
392392
this.parseOptions();
393393
});
394394

395395
// this will set up a series of describe/it blocks to run between the setup and cleanup phases
396396
if (this.tests.length === 0) {
397-
var testFiles = this.enumerateFiles(this.basePath, /\.tsx?$/, { recursive: true });
397+
let testFiles = this.enumerateFiles(this.basePath, /\.tsx?$/, { recursive: true });
398398
testFiles.forEach(fn => {
399399
fn = fn.replace(/\\/g, "/");
400400
this.checkTestCodeOutput(fn);
@@ -405,7 +405,7 @@ class CompilerBaselineRunner extends RunnerBase {
405405
}
406406

407407
describe("Cleanup after compiler baselines", () => {
408-
var harnessCompiler = Harness.Compiler.getCompiler();
408+
let harnessCompiler = Harness.Compiler.getCompiler();
409409
});
410410
});
411411
}
@@ -417,8 +417,8 @@ class CompilerBaselineRunner extends RunnerBase {
417417
this.decl = false;
418418
this.output = false;
419419

420-
var opts = this.options.split(',');
421-
for (var i = 0; i < opts.length; i++) {
420+
let opts = this.options.split(',');
421+
for (let i = 0; i < opts.length; i++) {
422422
switch (opts[i]) {
423423
case 'error':
424424
this.errors = true;

0 commit comments

Comments
 (0)