Don't depend on typescript protocol.d.ts (#163365)

jakebailey · web-flow · commit 07b87405e7a3 · 2022-10-12T16:03:07.000-07:00
diff --git a/extensions/typescript-language-features/src/languageFeatures/completions.ts b/extensions/typescript-language-features/src/languageFeatures/completions.ts
@@ -521,7 +521,7 @@ class MyCompletionItem extends vscode.CompletionItem {
 	}
 }
 
-function getScriptKindDetails(tsEntry: protocol.CompletionEntry,): string | undefined {
+function getScriptKindDetails(tsEntry: Proto.CompletionEntry,): string | undefined {
 	if (!tsEntry.kindModifiers || tsEntry.kind !== PConst.Kind.script) {
 		return;
 	}
diff --git a/extensions/typescript-language-features/src/protocol.d.ts b/extensions/typescript-language-features/src/protocol.d.ts
@@ -1,13 +1,19 @@
-import * as Proto from 'typescript/lib/protocol';
-export = Proto;
+import * as ts from 'typescript/lib/tsserverlibrary';
+export = ts.server.protocol;
+
 
 declare enum ServerType {
 	Syntax = 'syntax',
 	Semantic = 'semantic',
 }
-declare module 'typescript/lib/protocol' {
 
-	interface Response {
-		readonly _serverType?: ServerType;
+declare module 'typescript/lib/tsserverlibrary' {
+	namespace server.protocol {
+		type TextInsertion = ts.TextInsertion;
+		type ScriptElementKind = ts.ScriptElementKind;
+
+		interface Response {
+			readonly _serverType?: ServerType;
+		}
 	}
 }
diff --git a/extensions/typescript-language-features/src/utils/configuration.ts b/extensions/typescript-language-features/src/utils/configuration.ts
@@ -5,6 +5,7 @@
 
 import * as vscode from 'vscode';
 import * as objects from '../utils/objects';
+import * as Proto from '../protocol';
 
 export enum TsServerLogLevel {
 	Off,
@@ -112,7 +113,7 @@ export interface TypeScriptServiceConfiguration {
 	readonly enableProjectDiagnostics: boolean;
 	readonly maxTsServerMemory: number;
 	readonly enablePromptUseWorkspaceTsdk: boolean;
-	readonly watchOptions: protocol.WatchOptions | undefined;
+	readonly watchOptions: Proto.WatchOptions | undefined;
 	readonly includePackageJsonAutoImports: 'auto' | 'on' | 'off' | undefined;
 	readonly enableTsServerTracing: boolean;
 }
@@ -196,8 +197,8 @@ export abstract class BaseServiceConfigurationProvider implements ServiceConfigu
 		return configuration.get<boolean>('typescript.tsserver.experimental.enableProjectDiagnostics', false);
 	}
 
-	protected readWatchOptions(configuration: vscode.WorkspaceConfiguration): protocol.WatchOptions | undefined {
-		return configuration.get<protocol.WatchOptions>('typescript.tsserver.watchOptions');
+	protected readWatchOptions(configuration: vscode.WorkspaceConfiguration): Proto.WatchOptions | undefined {
+		return configuration.get<Proto.WatchOptions>('typescript.tsserver.watchOptions');
 	}
 
 	protected readIncludePackageJsonAutoImports(configuration: vscode.WorkspaceConfiguration): 'auto' | 'on' | 'off' | undefined {
diff --git a/extensions/typescript-language-features/src/utils/tsconfig.ts b/extensions/typescript-language-features/src/utils/tsconfig.ts
@@ -163,7 +163,7 @@ export async function openProjectConfigForFile(
 		return;
 	}
 
-	let res: ServerResponse.Response<protocol.ProjectInfoResponse> | undefined;
+	let res: ServerResponse.Response<Proto.ProjectInfoResponse> | undefined;
 	try {
 		res = await client.execute('projectInfo', { file, needFileNameList: false }, nulToken);
 	} catch {

Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,7 @@ class MyCompletionItem extends vscode.CompletionItem {`
`521`	`521`	`}`
`522`	`522`	`}`
`523`	`523`
`524`		`-function getScriptKindDetails(tsEntry: protocol.CompletionEntry,): string \| undefined {`
	`524`	`+function getScriptKindDetails(tsEntry: Proto.CompletionEntry,): string \| undefined {`
`525`	`525`	`if (!tsEntry.kindModifiers \|\| tsEntry.kind !== PConst.Kind.script) {`
`526`	`526`	`return;`
`527`	`527`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ export async function openProjectConfigForFile(`
`163`	`163`	`return;`
`164`	`164`	`}`
`165`	`165`
`166`		`- let res: ServerResponse.Response<protocol.ProjectInfoResponse> \| undefined;`
	`166`	`+ let res: ServerResponse.Response<Proto.ProjectInfoResponse> \| undefined;`
`167`	`167`	`try {`
`168`	`168`	`res = await client.execute('projectInfo', { file, needFileNameList: false }, nulToken);`
`169`	`169`	`} catch {`