Skip to content

Commit 9e08cae

Browse files
committed
Merge branch 'master' into watchImprovements
2 parents 68d3605 + 683d6c7 commit 9e08cae

File tree

197 files changed

+18409
-13197
lines changed

Some content is hidden

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

197 files changed

+18409
-13197
lines changed

Gulpfile.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -978,8 +978,9 @@ gulp.task(instrumenterJsPath, /*help*/ false, [servicesFile], () => {
978978
.pipe(gulp.dest(builtLocalDirectory));
979979
});
980980

981-
gulp.task("tsc-instrumented", "Builds an instrumented tsc.js", ["local", loggedIOJsPath, instrumenterJsPath, servicesFile], (done) => {
982-
exec(host, [instrumenterJsPath, "record", "iocapture", builtLocalCompiler], done, done);
981+
gulp.task("tsc-instrumented", "Builds an instrumented tsc.js - run with --test=[testname]", ["local", loggedIOJsPath, instrumenterJsPath, servicesFile], (done) => {
982+
const test = cmdLineOptions["tests"] || "iocapture";
983+
exec(host, [instrumenterJsPath, "record", test, builtLocalCompiler], done, done);
983984
});
984985

985986
gulp.task("update-sublime", "Updates the sublime plugin's tsserver", ["local", serverFile], () => {

Jakefile.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,10 @@ var harnessSources = harnessCoreSources.concat([
139139
"projectErrors.ts",
140140
"matchFiles.ts",
141141
"initializeTSConfig.ts",
142-
"extractMethods.ts",
142+
"extractConstants.ts",
143+
"extractFunctions.ts",
144+
"extractRanges.ts",
145+
"extractTestHelpers.ts",
143146
"printer.ts",
144147
"textChanges.ts",
145148
"telemetry.ts",
@@ -1104,9 +1107,10 @@ var instrumenterPath = harnessDirectory + 'instrumenter.ts';
11041107
var instrumenterJsPath = builtLocalDirectory + 'instrumenter.js';
11051108
compileFile(instrumenterJsPath, [instrumenterPath], [tscFile, instrumenterPath].concat(libraryTargets), [], /*useBuiltCompiler*/ true, { lib: "es6", types: ["node"], noOutFile: true, outDir: builtLocalDirectory });
11061109

1107-
desc("Builds an instrumented tsc.js");
1110+
desc("Builds an instrumented tsc.js - run with test=[testname]");
11081111
task('tsc-instrumented', [loggedIOJsPath, instrumenterJsPath, tscFile], function () {
1109-
var cmd = host + ' ' + instrumenterJsPath + ' record iocapture ' + builtLocalDirectory + compilerFilename;
1112+
var test = process.env.test || process.env.tests || process.env.t || "iocapture";
1113+
var cmd = host + ' ' + instrumenterJsPath + " record " + test + " " + builtLocalDirectory + compilerFilename;
11101114
console.log(cmd);
11111115
var ex = jake.createExec([cmd]);
11121116
ex.addListener("cmdEnd", function () {

lib/lib.d.ts

Lines changed: 235 additions & 163 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)