Skip to content

Commit b1871a5

Browse files
vladimavladima
committed
[WIP] pass ITypingsInstaller to ProjectService
1 parent 51e2b02 commit b1871a5

15 files changed

Lines changed: 113 additions & 85 deletions

‎Jakefile.js‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ var runTestsInParallel = require("./scripts/mocha-parallel").runTestsInParallel;
1111
var compilerDirectory = "src/compiler/";
1212
var servicesDirectory = "src/services/";
1313
var serverDirectory = "src/server/";
14+
var typingsInstallerDirectory = "src/server/typingsInstaller";
1415
var harnessDirectory = "src/harness/";
1516
var libraryDirectory = "src/lib/";
1617
var scriptsDirectory = "scripts/";
@@ -102,6 +103,7 @@ var servicesSources = [
102103
}));
103104

104105
var serverCoreSources = [
106+
"types.d.ts",
105107
"utilities.ts",
106108
"scriptVersionCache.ts",
107109
"scriptInfo.ts",
@@ -121,6 +123,14 @@ var cancellationTokenSources = [
121123
return path.join(serverDirectory, f);
122124
});
123125

126+
var typingsInstallerSources = [
127+
"../types.d.ts",
128+
"typingsInstaller.ts",
129+
"nodeTypingsInstaller.ts"
130+
].map(function (f) {
131+
return path.join(typingsInstallerDirectory, f);
132+
});
133+
124134
var serverSources = serverCoreSources.concat(servicesSources);
125135

126136
var languageServiceLibrarySources = [
@@ -571,8 +581,12 @@ compileFile(
571581
var cancellationTokenFile = path.join(builtLocalDirectory, "cancellationToken.js");
572582
compileFile(cancellationTokenFile, cancellationTokenSources, [builtLocalDirectory].concat(cancellationTokenSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true, { outDir: builtLocalDirectory, noOutFile: true });
573583

584+
var typingsInstallerFile = path.join(builtLocalDirectory, "typingsInstaller.js");
585+
compileFile(typingsInstallerFile, typingsInstallerSources, [builtLocalDirectory].concat(typingsInstallerSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true, { outDir: builtLocalDirectory, noOutFile: false });
586+
574587
var serverFile = path.join(builtLocalDirectory, "tsserver.js");
575-
compileFile(serverFile, serverSources,[builtLocalDirectory, copyright, cancellationTokenFile].concat(serverSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true, { types: ["node"] });
588+
compileFile(serverFile, serverSources,[builtLocalDirectory, copyright, cancellationTokenFile, typingsInstallerFile].concat(serverSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true, { types: ["node"] });
589+
576590
var tsserverLibraryFile = path.join(builtLocalDirectory, "tsserverlibrary.js");
577591
var tsserverLibraryDefinitionFile = path.join(builtLocalDirectory, "tsserverlibrary.d.ts");
578592
compileFile(

‎src/harness/harnessLanguageService.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,7 @@ namespace Harness.LanguageService {
692692
const server = new ts.server.Session(serverHost,
693693
{ isCancellationRequested: () => false },
694694
/*useOneInferredProject*/ false,
695+
/*typingsInstaller*/ undefined,
695696
Utils.byteLength,
696697
Utils.maxUncompressedMessageSize,
697698
Utils.compress,

‎src/harness/unittests/cachingInServerLSHost.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ namespace ts {
8484
msg: (s: string, type?: string) => { }
8585
};
8686

87-
const projectService = new server.ProjectService(serverHost, logger, { isCancellationRequested: () => false }, /*useOneInferredProject*/ false);
87+
const projectService = new server.ProjectService(serverHost, logger, { isCancellationRequested: () => false }, /*useOneInferredProject*/ false, /*typingsInstaller*/ undefined);
8888
const rootScriptInfo = projectService.getOrCreateScriptInfo(rootFile, /* openedByClient */true, /*containingProject*/ undefined);
8989
const project = projectService.createInferredProjectWithRootFileIfNecessary(rootScriptInfo);
9090
project.setCompilerOptions({ module: ts.ModuleKind.AMD } );

‎src/harness/unittests/session.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace ts.server {
4343
let lastSent: protocol.Message;
4444

4545
beforeEach(() => {
46-
session = new Session(mockHost, nullCancellationToken, /*useOneInferredProject*/ false, Utils.byteLength, Utils.maxUncompressedMessageSize, Utils.compress, process.hrtime, mockLogger);
46+
session = new Session(mockHost, nullCancellationToken, /*useOneInferredProject*/ false, /*typingsInstaller*/ undefined, Utils.byteLength, Utils.maxUncompressedMessageSize, Utils.compress, process.hrtime, mockLogger);
4747
session.send = (msg: protocol.Message) => {
4848
lastSent = msg;
4949
};
@@ -268,7 +268,7 @@ namespace ts.server {
268268
lastSent: protocol.Message;
269269
customHandler = "testhandler";
270270
constructor() {
271-
super(mockHost, nullCancellationToken, /*useOneInferredProject*/ false, Utils.byteLength, Utils.maxUncompressedMessageSize, Utils.compress, process.hrtime, mockLogger);
271+
super(mockHost, nullCancellationToken, /*useOneInferredProject*/ false, /*typingsInstaller*/ undefined, Utils.byteLength, Utils.maxUncompressedMessageSize, Utils.compress, process.hrtime, mockLogger);
272272
this.addProtocolHandler(this.customHandler, () => {
273273
return { response: undefined, responseRequired: true };
274274
});
@@ -326,7 +326,7 @@ namespace ts.server {
326326
class InProcSession extends Session {
327327
private queue: protocol.Request[] = [];
328328
constructor(private client: InProcClient) {
329-
super(mockHost, nullCancellationToken, /*useOneInferredProject*/ false, Utils.byteLength, Utils.maxUncompressedMessageSize, Utils.compress, process.hrtime, mockLogger);
329+
super(mockHost, nullCancellationToken, /*useOneInferredProject*/ false, /*typingsInstaller*/ undefined, Utils.byteLength, Utils.maxUncompressedMessageSize, Utils.compress, process.hrtime, mockLogger);
330330
this.addProtocolHandler("echo", (req: protocol.Request) => ({
331331
response: req.arguments,
332332
responseRequired: true

0 commit comments

Comments
 (0)