Skip to content

Commit c9f5a46

Browse files
author
Arthur Ozga
committed
Merge branch 'master' into addCodeFixMissingMethod
2 parents f56be99 + d82a57e commit c9f5a46

190 files changed

Lines changed: 6124 additions & 733 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.

‎Gulpfile.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ const es2017LibrarySource = [
131131
"es2017.object.d.ts",
132132
"es2017.sharedmemory.d.ts",
133133
"es2017.string.d.ts",
134+
"es2017.intl.d.ts",
134135
];
135136

136137
const es2017LibrarySourceMap = es2017LibrarySource.map(function(source) {

‎Jakefile.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ var harnessSources = harnessCoreSources.concat([
129129
"initializeTSConfig.ts",
130130
"printer.ts",
131131
"textChanges.ts",
132+
"telemetry.ts",
132133
"transform.ts",
133134
"customTransforms.ts",
134135
].map(function (f) {
@@ -172,7 +173,8 @@ var es2016LibrarySourceMap = es2016LibrarySource.map(function (source) {
172173
var es2017LibrarySource = [
173174
"es2017.object.d.ts",
174175
"es2017.sharedmemory.d.ts",
175-
"es2017.string.d.ts"
176+
"es2017.string.d.ts",
177+
"es2017.intl.d.ts"
176178
];
177179

178180
var es2017LibrarySourceMap = es2017LibrarySource.map(function (source) {
@@ -1078,7 +1080,7 @@ var loggedIOJsPath = builtLocalDirectory + 'loggedIO.js';
10781080
file(loggedIOJsPath, [builtLocalDirectory, loggedIOpath], function () {
10791081
var temp = builtLocalDirectory + 'temp';
10801082
jake.mkdirP(temp);
1081-
var options = "--types --outdir " + temp + ' ' + loggedIOpath;
1083+
var options = "--target es5 --lib es6 --types --outdir " + temp + ' ' + loggedIOpath;
10821084
var cmd = host + " " + LKGDirectory + compilerFilename + " " + options + " ";
10831085
console.log(cmd + "\n");
10841086
var ex = jake.createExec([cmd]);
@@ -1092,7 +1094,7 @@ file(loggedIOJsPath, [builtLocalDirectory, loggedIOpath], function () {
10921094

10931095
var instrumenterPath = harnessDirectory + 'instrumenter.ts';
10941096
var instrumenterJsPath = builtLocalDirectory + 'instrumenter.js';
1095-
compileFile(instrumenterJsPath, [instrumenterPath], [tscFile, instrumenterPath].concat(libraryTargets), [], /*useBuiltCompiler*/ true);
1097+
compileFile(instrumenterJsPath, [instrumenterPath], [tscFile, instrumenterPath].concat(libraryTargets), [], /*useBuiltCompiler*/ true, { lib: "es6", types: ["node"] });
10961098

10971099
desc("Builds an instrumented tsc.js");
10981100
task('tsc-instrumented', [loggedIOJsPath, instrumenterJsPath, tscFile], function () {

‎lib/lib.es2017.d.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ and limitations under the License.
2121
/// <reference path="lib.es2016.d.ts" />
2222
/// <reference path="lib.es2017.object.d.ts" />
2323
/// <reference path="lib.es2017.sharedmemory.d.ts" />
24-
/// <reference path="lib.es2017.string.d.ts" />
24+
/// <reference path="lib.es2017.string.d.ts" />
25+
/// <reference path="lib.es2017.intl.d.ts" />

‎lib/lib.es2017.full.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ and limitations under the License.
2222
/// <reference path="lib.es2017.object.d.ts" />
2323
/// <reference path="lib.es2017.sharedmemory.d.ts" />
2424
/// <reference path="lib.es2017.string.d.ts" />
25+
/// <reference path="lib.es2017.intl.d.ts" />
2526

2627
declare type PropertyKey = string | number | symbol;
2728

‎lib/tsc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56880,6 +56880,7 @@ var ts;
5688056880
"es2017.object": "lib.es2017.object.d.ts",
5688156881
"es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts",
5688256882
"es2017.string": "lib.es2017.string.d.ts",
56883+
"es2017.intl": "lib.es2017.intl.d.ts",
5688356884
"esnext.asynciterable": "lib.esnext.asynciterable.d.ts",
5688456885
}),
5688556886
},

‎lib/tsserver.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56898,6 +56898,7 @@ var ts;
5689856898
"es2017.object": "lib.es2017.object.d.ts",
5689956899
"es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts",
5690056900
"es2017.string": "lib.es2017.string.d.ts",
56901+
"es2017.intl": "lib.es2017.intl.d.ts",
5690156902
"esnext.asynciterable": "lib.esnext.asynciterable.d.ts",
5690256903
}),
5690356904
},

‎lib/tsserverlibrary.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6079,6 +6079,7 @@ var ts;
60796079
"es2017.object": "lib.es2017.object.d.ts",
60806080
"es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts",
60816081
"es2017.string": "lib.es2017.string.d.ts",
6082+
"es2017.intl": "lib.es2017.intl.d.ts",
60826083
"esnext.asynciterable": "lib.esnext.asynciterable.d.ts",
60836084
}),
60846085
},

‎lib/typescript.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69276,6 +69276,7 @@ var ts;
6927669276
"es2017.object": "lib.es2017.object.d.ts",
6927769277
"es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts",
6927869278
"es2017.string": "lib.es2017.string.d.ts",
69279+
"es2017.intl": "lib.es2017.intl.d.ts",
6927969280
"esnext.asynciterable": "lib.esnext.asynciterable.d.ts",
6928069281
}),
6928169282
},

‎lib/typescriptServices.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69276,6 +69276,7 @@ var ts;
6927669276
"es2017.object": "lib.es2017.object.d.ts",
6927769277
"es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts",
6927869278
"es2017.string": "lib.es2017.string.d.ts",
69279+
"es2017.intl": "lib.es2017.intl.d.ts",
6927969280
"esnext.asynciterable": "lib.esnext.asynciterable.d.ts",
6928069281
}),
6928169282
},

‎lib/typingsInstaller.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6071,6 +6071,7 @@ var ts;
60716071
"es2017.object": "lib.es2017.object.d.ts",
60726072
"es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts",
60736073
"es2017.string": "lib.es2017.string.d.ts",
6074+
"es2017.intl": "lib.es2017.intl.d.ts",
60746075
"esnext.asynciterable": "lib.esnext.asynciterable.d.ts",
60756076
}),
60766077
},

0 commit comments

Comments
 (0)