microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 08:11:30 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge branch 'master' into literalTypesAlways

Browse Source
This commit is contained in:
Mohamed Hegazy 2016-09-08 14:47:40 -07:00
commit dfb5091a5c
6 changed files with 2232 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gulpfile.ts
View File

@ -39,6 +39,8 @@ const gulp = helpMaker(originalGulp);
const mochaParallel = require("./scripts/mocha-parallel.js");
const {runTestsInParallel} = mochaParallel;
Error.stackTraceLimit = 1000;
const cmdLineOptions = minimist(process.argv.slice(2), {
boolean: ["debug", "light", "colors", "lint", "soft"],
string: ["browser", "tests", "host", "reporter"],
@ -727,6 +729,7 @@ gulp.task("browserify", "Runs browserify on run.js to produce a file suitable fo
sourcemaps: {
"built/local/_stream_0.js": originalMap,
"built/local/bundle.js": maps,
"node_modules/source-map-support/source-map-support.js": undefined,
}
});
const finalMap = chain.apply();

2
src/harness/fourslash.ts
View File

@ -1304,7 +1304,7 @@ namespace FourSlash {
baselineFile,
() => stringify(
this.testData.markers.map(marker => ({
marker: marker,
marker,
quickInfo: this.languageService.getQuickInfoAtPosition(marker.fileName, marker.position)
}))
));

1112
tests/baselines/reference/quickInfoDisplayPartsVar.shims-pp.baseline Normal file
View File

File diff suppressed because it is too large Load Diff

1112
tests/baselines/reference/quickInfoDisplayPartsVar.shims.baseline Normal file
View File

File diff suppressed because it is too large Load Diff

2
tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVar.ts
View File

@ -1,5 +1,7 @@
/// <reference path='fourslash.ts'/>
// @BaselineFile: quickInfoDisplayPartsVar.shims-pp.baseline
////var /*1*/a = 10;
////function foo() {
//// var /*2*/b = /*3*/a;

2
tests/cases/fourslash/shims/quickInfoDisplayPartsVar.ts
View File

@ -1,5 +1,7 @@
/// <reference path='fourslash.ts'/>
// @BaselineFile: quickInfoDisplayPartsVar.shims.baseline
////var /*1*/a = 10;
////function foo() {
//// var /*2*/b = /*3*/a;