Skip to content

Commit b7f4ee5

Browse files
author
Arthur Ozga
committed
Merge branch 'master' into abstract-classes2
2 parents b448310 + f2044a9 commit b7f4ee5

629 files changed

Lines changed: 1966 additions & 1844 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.

‎Jakefile.js‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,14 @@ var serverSources = [
105105
return path.join(serverDirectory, f);
106106
});
107107

108+
var languageServiceLibrarySources = [
109+
"editorServices.ts",
110+
"protocol.d.ts",
111+
"session.ts"
112+
].map(function (f) {
113+
return path.join(serverDirectory, f);
114+
}).concat(servicesSources);
115+
108116
var harnessSources = [
109117
"harness.ts",
110118
"sourceMapRecorder.ts",
@@ -361,14 +369,28 @@ compileFile(servicesFile, servicesSources,[builtLocalDirectory, copyright].conca
361369
// Create the node definition file by replacing 'ts' module with '"typescript"' as a module.
362370
jake.cpR(standaloneDefinitionsFile, nodeDefinitionsFile, {silent: true});
363371
var definitionFileContents = fs.readFileSync(nodeDefinitionsFile).toString();
364-
definitionFileContents = definitionFileContents.replace(/declare module ts/g, 'declare module "typescript"');
372+
definitionFileContents = definitionFileContents.replace(/declare (namespace|module) ts/g, 'declare module "typescript"');
365373
fs.writeFileSync(nodeDefinitionsFile, definitionFileContents);
366374
});
367375

368376

369377
var serverFile = path.join(builtLocalDirectory, "tsserver.js");
370378
compileFile(serverFile, serverSources,[builtLocalDirectory, copyright].concat(serverSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true);
371379

380+
var lsslFile = path.join(builtLocalDirectory, "tslssl.js");
381+
compileFile(
382+
lsslFile,
383+
languageServiceLibrarySources,
384+
[builtLocalDirectory, copyright].concat(languageServiceLibrarySources),
385+
/*prefixes*/ [copyright],
386+
/*useBuiltCompiler*/ true,
387+
/*noOutFile*/ false,
388+
/*generateDeclarations*/ true);
389+
390+
// Local target to build the language service server library
391+
desc("Builds language service server library");
392+
task("lssl", [lsslFile]);
393+
372394
// Local target to build the compiler and services
373395
desc("Builds the full compiler and services");
374396
task("local", ["generate-diagnostics", "lib", tscFile, servicesFile, nodeDefinitionsFile, serverFile]);

‎bin/tsc.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24740,7 +24740,7 @@ var ts;
2474024740
emitDeclarationName(node);
2474124741
write("\", ");
2474224742
emitDeclarationName(node);
24743-
write(")");
24743+
write(");");
2474424744
}
2474524745
emitExportMemberAssignments(node.name);
2474624746
}
@@ -24848,7 +24848,7 @@ var ts;
2484824848
emitDeclarationName(node);
2484924849
write("\", ");
2485024850
emitDeclarationName(node);
24851-
write(")");
24851+
write(");");
2485224852
}
2485324853
emitExportMemberAssignments(node.name);
2485424854
}

‎bin/tsserver.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25131,7 +25131,7 @@ var ts;
2513125131
emitDeclarationName(node);
2513225132
write("\", ");
2513325133
emitDeclarationName(node);
25134-
write(")");
25134+
write(");");
2513525135
}
2513625136
emitExportMemberAssignments(node.name);
2513725137
}
@@ -25239,7 +25239,7 @@ var ts;
2523925239
emitDeclarationName(node);
2524025240
write("\", ");
2524125241
emitDeclarationName(node);
25242-
write(")");
25242+
write(");");
2524325243
}
2524425244
emitExportMemberAssignments(node.name);
2524525245
}

‎bin/typescript.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29466,7 +29466,7 @@ var ts;
2946629466
emitDeclarationName(node);
2946729467
write("\", ");
2946829468
emitDeclarationName(node);
29469-
write(")");
29469+
write(");");
2947029470
}
2947129471
emitExportMemberAssignments(node.name);
2947229472
}
@@ -29576,7 +29576,7 @@ var ts;
2957629576
emitDeclarationName(node);
2957729577
write("\", ");
2957829578
emitDeclarationName(node);
29579-
write(")");
29579+
write(");");
2958029580
}
2958129581
emitExportMemberAssignments(node.name);
2958229582
}

‎bin/typescriptServices.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29466,7 +29466,7 @@ var ts;
2946629466
emitDeclarationName(node);
2946729467
write("\", ");
2946829468
emitDeclarationName(node);
29469-
write(")");
29469+
write(");");
2947029470
}
2947129471
emitExportMemberAssignments(node.name);
2947229472
}
@@ -29576,7 +29576,7 @@ var ts;
2957629576
emitDeclarationName(node);
2957729577
write("\", ");
2957829578
emitDeclarationName(node);
29579-
write(")");
29579+
write(");");
2958029580
}
2958129581
emitExportMemberAssignments(node.name);
2958229582
}

0 commit comments

Comments
 (0)