Show bundled TypeScript version for packaged servers

Author: jakebailey

tsc/_extension/src/util.ts

@@ -55,7 +55,7 @@ export async function getBuiltinExePath(context: vscode.ExtensionContext): Promi
         }
         catch {}
     }
-    return getPackagedExePath(context.extension.extensionUri, context.extension.packageJSON.version);
+    return getPackagedExePath(context.extension.extensionUri, getBundledTypeScriptVersion(context.extension.packageJSON));
 }
 
 export async function getNightlyExePath(): Promise<ExeInfo | undefined> {
@@ -64,7 +64,7 @@ export async function getNightlyExePath(): Promise<ExeInfo | undefined> {
         return undefined;
     }
 
-    return tryGetPackagedExePath(extension.extensionUri, extension.packageJSON?.version);
+    return tryGetPackagedExePath(extension.extensionUri, getBundledTypeScriptVersion(extension.packageJSON));
 }
 
 export async function getDefaultExePath(context: vscode.ExtensionContext): Promise<ExeInfo> {
@@ -85,6 +85,16 @@ async function getPackagedExePath(extensionUri: vscode.Uri, version: unknown): P
     throw new Error(vscode.l10n.t("Could not find a TypeScript executable in the extension package."));
 }
 
+function getBundledTypeScriptVersion(packageJSON: unknown): string {
+    if (packageJSON && typeof packageJSON === "object" && "bundledTypeScriptVersion" in packageJSON) {
+        const version = packageJSON.bundledTypeScriptVersion;
+        if (typeof version === "string") {
+            return version;
+        }
+    }
+    return "unknown";
+}
+
 async function tryGetPackagedExePath(extensionUri: vscode.Uri, version: unknown): Promise<ExeInfo | undefined> {
     for (const baseName of packagedExeBaseNames) {
         const exeName = `${baseName}${process.platform === "win32" ? ".exe" : ""}`;