Skip to content

Commit d4dc67a

Browse files
committed
Merge branch 'master' into conditionalTypes
# Conflicts: # src/compiler/checker.ts
2 parents 01516c8 + 89de4c9 commit d4dc67a

220 files changed

Lines changed: 3008 additions & 705 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Jakefile.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ var child_process = require("child_process");
88
var fold = require("travis-fold");
99
var ts = require("./lib/typescript");
1010

11-
1211
// Variables
1312
var compilerDirectory = "src/compiler/";
1413
var serverDirectory = "src/server/";
@@ -86,7 +85,7 @@ var servicesSources = filesFromConfig("./src/services/tsconfig.json");
8685
var cancellationTokenSources = filesFromConfig(path.join(serverDirectory, "cancellationToken/tsconfig.json"));
8786
var typingsInstallerSources = filesFromConfig(path.join(serverDirectory, "typingsInstaller/tsconfig.json"));
8887
var watchGuardSources = filesFromConfig(path.join(serverDirectory, "watchGuard/tsconfig.json"));
89-
var serverSources = filesFromConfig(path.join(serverDirectory, "tsconfig.json"))
88+
var serverSources = filesFromConfig(path.join(serverDirectory, "tsconfig.json"));
9089
var languageServiceLibrarySources = filesFromConfig(path.join(serverDirectory, "tsconfig.library.json"));
9190

9291
var typesMapOutputPath = path.join(builtLocalDirectory, 'typesMap.json');
@@ -332,7 +331,7 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, opts
332331
var startCompileTime = mark();
333332
opts = opts || {};
334333
var compilerPath = useBuiltCompiler ? builtLocalCompiler : LKGCompiler;
335-
var options = "--noImplicitAny --noImplicitThis --alwaysStrict --noEmitOnError --types "
334+
var options = "--noImplicitAny --noImplicitThis --alwaysStrict --noEmitOnError --types ";
336335
if (opts.types) {
337336
options += opts.types.join(",");
338337
}
@@ -381,10 +380,10 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, opts
381380
}
382381
options += " --target es5";
383382
if (opts.lib) {
384-
options += " --lib " + opts.lib
383+
options += " --lib " + opts.lib;
385384
}
386385
else {
387-
options += " --lib es5"
386+
options += " --lib es5";
388387
}
389388
options += " --noUnusedLocals --noUnusedParameters";
390389

@@ -526,7 +525,7 @@ file(buildProtocolDts, [buildProtocolTs, buildProtocolJs, typescriptServicesDts]
526525
complete();
527526
});
528527
ex.run();
529-
}, { async: true })
528+
}, { async: true });
530529

531530
// The generated diagnostics map; built for the compiler and for the 'generate-diagnostics' task
532531
file(diagnosticInfoMapTs, [processDiagnosticMessagesJs, diagnosticMessagesJson], function () {
@@ -646,7 +645,7 @@ compileFile(servicesFile, servicesSources, [builtLocalDirectory, copyright].conc
646645
// Stanalone/web definition file using global 'ts' namespace
647646
jake.cpR(standaloneDefinitionsFile, nodeDefinitionsFile, { silent: true });
648647
var definitionFileContents = fs.readFileSync(nodeDefinitionsFile).toString();
649-
definitionFileContents = removeConstModifierFromEnumDeclarations(definitionFileContents)
648+
definitionFileContents = removeConstModifierFromEnumDeclarations(definitionFileContents);
650649
fs.writeFileSync(standaloneDefinitionsFile, definitionFileContents);
651650

652651
// Official node package definition file, pointed to by 'typings' in package.json
@@ -1253,15 +1252,15 @@ task("build-rules-end", [], function () {
12531252
var lintTargets = compilerSources
12541253
.concat(harnessSources)
12551254
// Other harness sources
1256-
.concat(["instrumenter.ts"].map(function (f) { return path.join(harnessDirectory, f) }))
1255+
.concat(["instrumenter.ts"].map(function (f) { return path.join(harnessDirectory, f); }))
12571256
.concat(serverSources)
12581257
.concat(tslintRulesFiles)
12591258
.concat(servicesSources)
12601259
.concat(typingsInstallerSources)
12611260
.concat(cancellationTokenSources)
12621261
.concat(["Gulpfile.ts"])
12631262
.concat([nodeServerInFile, perftscPath, "tests/perfsys.ts", webhostPath])
1264-
.map(function (p) { return path.resolve(p) });
1263+
.map(function (p) { return path.resolve(p); });
12651264
// keep only unique items
12661265
lintTargets = Array.from(new Set(lintTargets));
12671266

@@ -1303,9 +1302,10 @@ desc("Runs tslint on the compiler sources. Optional arguments are: f[iles]=regex
13031302
task("lint", ["build-rules"], () => {
13041303
if (fold.isTravis()) console.log(fold.start("lint"));
13051304
const fileMatcher = process.env.f || process.env.file || process.env.files;
1305+
13061306
const files = fileMatcher
13071307
? `src/**/${fileMatcher}`
1308-
: "Gulpfile.ts 'scripts/generateLocalizedDiagnosticMessages.ts' 'scripts/tslint/**/*.ts' 'src/**/*.ts' --exclude 'src/lib/*.d.ts'";
1308+
: `Gulpfile.ts scripts/generateLocalizedDiagnosticMessages.ts "scripts/tslint/**/*.ts" "src/**/*.ts" --exclude "src/lib/*.d.ts"`;
13091309
const cmd = `node node_modules/tslint/bin/tslint ${files} --formatters-dir ./built/local/tslint/formatters --format autolinkableStylish`;
13101310
console.log("Linting: " + cmd);
13111311
jake.exec([cmd], { interactive: true }, () => {

0 commit comments

Comments
 (0)