Skip to content

Commit dfb5091

Browse files
committed
Merge branch 'master' into literalTypesAlways
2 parents f13c16d + f6e2429 commit dfb5091

File tree

6 files changed

+2232
-1
lines changed

6 files changed

+2232
-1
lines changed

Gulpfile.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ const gulp = helpMaker(originalGulp);
3939
const mochaParallel = require("./scripts/mocha-parallel.js");
4040
const {runTestsInParallel} = mochaParallel;
4141

42+
Error.stackTraceLimit = 1000;
43+
4244
const cmdLineOptions = minimist(process.argv.slice(2), {
4345
boolean: ["debug", "light", "colors", "lint", "soft"],
4446
string: ["browser", "tests", "host", "reporter"],
@@ -727,6 +729,7 @@ gulp.task("browserify", "Runs browserify on run.js to produce a file suitable fo
727729
sourcemaps: {
728730
"built/local/_stream_0.js": originalMap,
729731
"built/local/bundle.js": maps,
732+
"node_modules/source-map-support/source-map-support.js": undefined,
730733
}
731734
});
732735
const finalMap = chain.apply();

src/harness/fourslash.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1304,7 +1304,7 @@ namespace FourSlash {
13041304
baselineFile,
13051305
() => stringify(
13061306
this.testData.markers.map(marker => ({
1307-
marker: marker,
1307+
marker,
13081308
quickInfo: this.languageService.getQuickInfoAtPosition(marker.fileName, marker.position)
13091309
}))
13101310
));

0 commit comments

Comments
 (0)