Skip to content

Commit c876d92

Browse files
committed
Merge branch 'master' into controlFlowArrays
# Conflicts: # src/compiler/checker.ts
2 parents 79ed3a7 + cdafc9d commit c876d92

File tree

219 files changed

+73408
-58536
lines changed

Some content is hidden

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

219 files changed

+73408
-58536
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ scripts/debug.bat
4242
scripts/run.bat
4343
scripts/word2md.js
4444
scripts/ior.js
45+
scripts/buildProtocol.js
4546
scripts/*.js.map
4647
scripts/typings/
4748
coverage/

Jakefile.js

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ var serverCoreSources = [
174174
"lsHost.ts",
175175
"project.ts",
176176
"editorServices.ts",
177-
"protocol.d.ts",
177+
"protocol.ts",
178178
"session.ts",
179179
"server.ts"
180180
].map(function (f) {
@@ -198,14 +198,13 @@ var typingsInstallerSources = [
198198
var serverSources = serverCoreSources.concat(servicesSources);
199199

200200
var languageServiceLibrarySources = [
201-
"protocol.d.ts",
201+
"protocol.ts",
202202
"utilities.ts",
203203
"scriptVersionCache.ts",
204204
"scriptInfo.ts",
205205
"lsHost.ts",
206206
"project.ts",
207207
"editorServices.ts",
208-
"protocol.d.ts",
209208
"session.ts",
210209

211210
].map(function (f) {
@@ -259,15 +258,14 @@ var harnessSources = harnessCoreSources.concat([
259258
].map(function (f) {
260259
return path.join(unittestsDirectory, f);
261260
})).concat([
262-
"protocol.d.ts",
261+
"protocol.ts",
263262
"utilities.ts",
264263
"scriptVersionCache.ts",
265264
"scriptInfo.ts",
266265
"lsHost.ts",
267266
"project.ts",
268267
"typingsCache.ts",
269268
"editorServices.ts",
270-
"protocol.d.ts",
271269
"session.ts",
272270
].map(function (f) {
273271
return path.join(serverDirectory, f);
@@ -518,6 +516,40 @@ compileFile(processDiagnosticMessagesJs,
518516
[],
519517
/*useBuiltCompiler*/ false);
520518

519+
var buildProtocolTs = path.join(scriptsDirectory, "buildProtocol.ts");
520+
var buildProtocolJs = path.join(scriptsDirectory, "buildProtocol.js");
521+
var buildProtocolDts = path.join(builtLocalDirectory, "protocol.d.ts");
522+
var typescriptServicesDts = path.join(builtLocalDirectory, "typescriptServices.d.ts");
523+
524+
file(buildProtocolTs);
525+
526+
compileFile(buildProtocolJs,
527+
[buildProtocolTs],
528+
[buildProtocolTs],
529+
[],
530+
/*useBuiltCompiler*/ false,
531+
{noOutFile: true});
532+
533+
file(buildProtocolDts, [buildProtocolTs, buildProtocolJs, typescriptServicesDts], function() {
534+
535+
var protocolTs = path.join(serverDirectory, "protocol.ts");
536+
537+
var cmd = host + " " + buildProtocolJs + " "+ protocolTs + " " + typescriptServicesDts + " " + buildProtocolDts;
538+
console.log(cmd);
539+
var ex = jake.createExec([cmd]);
540+
// Add listeners for output and error
541+
ex.addListener("stdout", function (output) {
542+
process.stdout.write(output);
543+
});
544+
ex.addListener("stderr", function (error) {
545+
process.stderr.write(error);
546+
});
547+
ex.addListener("cmdEnd", function () {
548+
complete();
549+
});
550+
ex.run();
551+
}, { async: true })
552+
521553
// The generated diagnostics map; built for the compiler and for the 'generate-diagnostics' task
522554
file(diagnosticInfoMapTs, [processDiagnosticMessagesJs, diagnosticMessagesJson], function () {
523555
var cmd = host + " " + processDiagnosticMessagesJs + " " + diagnosticMessagesJson;
@@ -655,6 +687,8 @@ compileFile(
655687
inlineSourceMap: true
656688
});
657689

690+
file(typescriptServicesDts, [servicesFile]);
691+
658692
var cancellationTokenFile = path.join(builtLocalDirectory, "cancellationToken.js");
659693
compileFile(cancellationTokenFile, cancellationTokenSources, [builtLocalDirectory].concat(cancellationTokenSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true, { outDir: builtLocalDirectory, noOutFile: true });
660694

@@ -689,7 +723,7 @@ task("build-fold-end", [], function () {
689723

690724
// Local target to build the compiler and services
691725
desc("Builds the full compiler and services");
692-
task("local", ["build-fold-start", "generate-diagnostics", "lib", tscFile, servicesFile, nodeDefinitionsFile, serverFile, builtGeneratedDiagnosticMessagesJSON, "lssl", "build-fold-end"]);
726+
task("local", ["build-fold-start", "generate-diagnostics", "lib", tscFile, servicesFile, nodeDefinitionsFile, serverFile, buildProtocolDts, builtGeneratedDiagnosticMessagesJSON, "lssl", "build-fold-end"]);
693727

694728
// Local target to build only tsc.js
695729
desc("Builds only the compiler");
@@ -745,7 +779,7 @@ task("generate-spec", [specMd]);
745779
// Makes a new LKG. This target does not build anything, but errors if not all the outputs are present in the built/local directory
746780
desc("Makes a new LKG out of the built js files");
747781
task("LKG", ["clean", "release", "local"].concat(libraryTargets), function () {
748-
var expectedFiles = [tscFile, servicesFile, serverFile, nodePackageFile, nodeDefinitionsFile, standaloneDefinitionsFile, tsserverLibraryFile, tsserverLibraryDefinitionFile, cancellationTokenFile, typingsInstallerFile].concat(libraryTargets);
782+
var expectedFiles = [tscFile, servicesFile, serverFile, nodePackageFile, nodeDefinitionsFile, standaloneDefinitionsFile, tsserverLibraryFile, tsserverLibraryDefinitionFile, cancellationTokenFile, typingsInstallerFile, buildProtocolDts].concat(libraryTargets);
749783
var missingFiles = expectedFiles.filter(function (f) {
750784
return !fs.existsSync(f);
751785
});

0 commit comments

Comments
 (0)