Skip to content

Commit 1e5fd9d

Browse files
committed
Restore namespace files and pass through namespaces
1 parent a4c977f commit 1e5fd9d

File tree

7 files changed

+180
-117
lines changed

7 files changed

+180
-117
lines changed

src/tsserver/_namespaces/ts.server.ts

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import * as ts from "../../typescript/typescript";
2+
export = ts.server;

src/tsserver/common.ts

+24-16
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1-
import * as ts from "./_namespaces/ts";
1+
import {
2+
LanguageServiceMode,
3+
} from "./_namespaces/ts";
4+
import {
5+
Logger,
6+
LogLevel,
7+
ServerCancellationToken,
8+
SessionOptions,
9+
} from "./_namespaces/ts.server";
210

311
/** @internal */
412
export function getLogLevel(level: string | undefined) {
513
if (level) {
614
const l = level.toLowerCase();
7-
for (const name in ts.server.LogLevel) {
15+
for (const name in LogLevel) {
816
if (isNaN(+name) && l === name.toLowerCase()) {
9-
return ts.server.LogLevel[name] as any as ts.server.LogLevel;
17+
return LogLevel[name] as any as LogLevel;
1018
}
1119
}
1220
}
@@ -15,23 +23,23 @@ export function getLogLevel(level: string | undefined) {
1523

1624
/** @internal */
1725
export interface StartSessionOptions {
18-
globalPlugins: ts.server.SessionOptions["globalPlugins"];
19-
pluginProbeLocations: ts.server.SessionOptions["pluginProbeLocations"];
20-
allowLocalPluginLoads: ts.server.SessionOptions["allowLocalPluginLoads"];
21-
useSingleInferredProject: ts.server.SessionOptions["useSingleInferredProject"];
22-
useInferredProjectPerProjectRoot: ts.server.SessionOptions["useInferredProjectPerProjectRoot"];
23-
suppressDiagnosticEvents: ts.server.SessionOptions["suppressDiagnosticEvents"];
24-
noGetErrOnBackgroundUpdate: ts.server.SessionOptions["noGetErrOnBackgroundUpdate"];
25-
canUseWatchEvents: ts.server.SessionOptions["canUseWatchEvents"];
26-
serverMode: ts.server.SessionOptions["serverMode"];
26+
globalPlugins: SessionOptions["globalPlugins"];
27+
pluginProbeLocations: SessionOptions["pluginProbeLocations"];
28+
allowLocalPluginLoads: SessionOptions["allowLocalPluginLoads"];
29+
useSingleInferredProject: SessionOptions["useSingleInferredProject"];
30+
useInferredProjectPerProjectRoot: SessionOptions["useInferredProjectPerProjectRoot"];
31+
suppressDiagnosticEvents: SessionOptions["suppressDiagnosticEvents"];
32+
noGetErrOnBackgroundUpdate: SessionOptions["noGetErrOnBackgroundUpdate"];
33+
canUseWatchEvents: SessionOptions["canUseWatchEvents"];
34+
serverMode: SessionOptions["serverMode"];
2735
}
2836

2937
/** @internal */
3038
export interface StartInput {
3139
args: readonly string[];
32-
logger: ts.server.Logger;
33-
cancellationToken: ts.server.ServerCancellationToken;
34-
serverMode: ts.LanguageServiceMode | undefined;
40+
logger: Logger;
41+
cancellationToken: ServerCancellationToken;
42+
serverMode: LanguageServiceMode | undefined;
3543
unknownServerMode?: string;
36-
startSession: (option: StartSessionOptions, logger: ts.server.Logger, cancellationToken: ts.server.ServerCancellationToken) => void;
44+
startSession: (option: StartSessionOptions, logger: Logger, cancellationToken: ServerCancellationToken) => void;
3745
}

0 commit comments

Comments
 (0)