Don't depend on typescript protocol.d.ts

microsoft · Oct 11, 2022 · ec7dc98 · ec7dc98
1 parent 43957cc
commit ec7dc98
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/extensions/package.json b/extensions/package.json
@@ -4,7 +4,7 @@
   "license": "MIT",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "4.8.4"
+    "typescript": "npm:@typescript-deploys/[email protected]"
   },
   "scripts": {
     "postinstall": "node ./postinstall.mjs"

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 change
@@ Expand Up / @@ -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;
     	}
@@ Expand Down @@