Skip to content

Commit

Permalink
Thread typesMapLocation down to the ProjectService
Browse files Browse the repository at this point in the history
Fixes #22607
  • Loading branch information
amcasey committed Mar 21, 2018
1 parent 6a86534 commit 2e0f325
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/server/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,8 @@ namespace ts.server {
canUseEvents,
globalPlugins: options.globalPlugins,
pluginProbeLocations: options.pluginProbeLocations,
allowLocalPluginLoads: options.allowLocalPluginLoads
allowLocalPluginLoads: options.allowLocalPluginLoads,
typesMapLocation,
});

this.eventPort = eventPort;
Expand Down
4 changes: 3 additions & 1 deletion src/server/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ namespace ts.server {
globalPlugins?: ReadonlyArray<string>;
pluginProbeLocations?: ReadonlyArray<string>;
allowLocalPluginLoads?: boolean;
typesMapLocation?: string;
}

export class Session implements EventSender {
Expand Down Expand Up @@ -354,7 +355,8 @@ namespace ts.server {
eventHandler: this.eventHandler,
globalPlugins: opts.globalPlugins,
pluginProbeLocations: opts.pluginProbeLocations,
allowLocalPluginLoads: opts.allowLocalPluginLoads
allowLocalPluginLoads: opts.allowLocalPluginLoads,
typesMapLocation: opts.typesMapLocation,
};
this.projectService = new ProjectService(settings);
this.gcTimer = new GcTimer(this.host, /*delay*/ 7000, this.logger);
Expand Down
1 change: 1 addition & 0 deletions tests/baselines/reference/api/tsserverlibrary.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7259,6 +7259,7 @@ declare namespace ts.server {
globalPlugins?: ReadonlyArray<string>;
pluginProbeLocations?: ReadonlyArray<string>;
allowLocalPluginLoads?: boolean;
typesMapLocation?: string;
}
class Session implements EventSender {
private readonly gcTimer;
Expand Down

0 comments on commit 2e0f325

Please sign in to comment.