Merge branch 'main' into jabaile/lsp-fs-cache

Author: jakebailey

.vscode/tasks.json

@@ -17,7 +17,7 @@
         {
             "label": "Watch",
             "type": "npm",
-            "script": "build:watch",
+            "script": "build:watch:debug",
             "group": "build",
             "presentation": {
                 "panel": "dedicated",

Herebyfile.mjs

@@ -75,11 +75,7 @@ const { values: rawOptions } = parseArgs({
 
 // We can't use parseArgs' strict mode as it errors on hereby's --tasks flag.
 /**
- * @typedef {{ [K in keyof T as {} extends Record<K, 1> ? never : K]: T[K] }} RemoveIndex<T>
- * @template T
- */
-/**
- * @typedef {RemoveIndex<typeof rawOptions>} Options
+ * @typedef {{ [K in keyof typeof rawOptions as {} extends Record<K, 1> ? never : K]: typeof rawOptions[K] }} Options
  */
 const options = /** @type {Options} */ (rawOptions);
 
@@ -107,9 +103,12 @@ const goBuildFlags = [
 ];
 
 /**
- * @type {<T>(fn: () => T) => (() => T)}
+ * @template T
+ * @param {() => T} fn
+ * @returns {() => T}
  */
 function memoize(fn) {
+    /** @type {T} */
     let value;
     return () => {
         if (fn !== undefined) {
@@ -842,21 +841,20 @@ const mainNativePreviewPackage = {
  * @typedef {"win32" | "linux" | "darwin"} OS
  * @typedef {"x64" | "arm" | "arm64"} Arch
  * @typedef {"Microsoft400" | "LinuxSign" | "MacDeveloperHarden" | "8020" | "VSCodePublisher"} Cert
- * @typedef {`${OS}-${Exclude<Arch, "arm"> | "armhf"}`} VSCodeTarget
+ * @typedef {`${OS | "alpine"}-${Exclude<Arch, "arm"> | "armhf"}`} VSCodeTarget
  */
 void 0;
 
 const nativePreviewPlatforms = memoize(() => {
-    /** @type {[OS, Arch, Cert][]} */
+    /** @type {[os: OS, arch: Arch, cert: Cert, alpine?: boolean][]} */
     let supportedPlatforms = [
         ["win32", "x64", "Microsoft400"],
         ["win32", "arm64", "Microsoft400"],
-        ["linux", "x64", "LinuxSign"],
+        ["linux", "x64", "LinuxSign", true],
         ["linux", "arm", "LinuxSign"],
-        ["linux", "arm64", "LinuxSign"],
+        ["linux", "arm64", "LinuxSign", true],
         ["darwin", "x64", "MacDeveloperHarden"],
         ["darwin", "arm64", "MacDeveloperHarden"],
-        // Alpine?
         // Wasm?
     ];
 
@@ -865,17 +863,32 @@ const nativePreviewPlatforms = memoize(() => {
         assert.equal(supportedPlatforms.length, 1, "No supported platforms found");
     }
 
-    return supportedPlatforms.map(([os, arch, cert]) => {
+    return supportedPlatforms.map(([os, arch, cert, alpine]) => {
         const npmDirName = `native-preview-${os}-${arch}`;
         const npmDir = path.join(builtNpm, npmDirName);
         const npmTarball = `${npmDir}.tgz`;
         const npmPackageName = `@typescript/${npmDirName}`;
-        /** @type {VSCodeTarget} */
-        const vscodeTarget = `${os}-${arch === "arm" ? "armhf" : arch}`;
-        const extensionDir = path.join(builtVsix, `typescript-native-preview-${vscodeTarget}`);
-        const vsixPath = extensionDir + ".vsix";
-        const vsixManifestPath = extensionDir + ".manifest";
-        const vsixSignaturePath = extensionDir + ".signature.p7s";
+
+        /** @type {VSCodeTarget[]} */
+        const vscodeTargets = [`${os}-${arch === "arm" ? "armhf" : arch}`];
+        if (alpine) {
+            vscodeTargets.push(`alpine-${arch === "arm" ? "armhf" : arch}`);
+        }
+
+        const extensions = vscodeTargets.map(vscodeTarget => {
+            const extensionDir = path.join(builtVsix, `typescript-native-preview-${vscodeTarget}`);
+            const vsixPath = extensionDir + ".vsix";
+            const vsixManifestPath = extensionDir + ".manifest";
+            const vsixSignaturePath = extensionDir + ".signature.p7s";
+            return {
+                vscodeTarget,
+                extensionDir,
+                vsixPath,
+                vsixManifestPath,
+                vsixSignaturePath,
+            };
+        });
+
         return {
             nodeOs: os,
             nodeArch: arch,
@@ -885,11 +898,7 @@ const nativePreviewPlatforms = memoize(() => {
             npmDirName,
             npmDir,
             npmTarball,
-            vscodeTarget,
-            extensionDir,
-            vsixPath,
-            vsixManifestPath,
-            vsixSignaturePath,
+            extensions,
             cert,
         };
     });
@@ -1040,6 +1049,7 @@ export const signNativePreviewPackages = task({
             SignFileRecordList: [],
         };
 
+        /** @type {{ path: string; unsignedZipPath: string; signedZipPath: string; notarizedZipPath: string; }[]} */
         const macZips = [];
 
         // First, sign the files.
@@ -1175,8 +1185,9 @@ export const packNativePreviewExtensions = task({
         console.log("Version:", version);
 
         const platforms = nativePreviewPlatforms();
+        const extensions = platforms.flatMap(({ npmDir, extensions }) => extensions.map(e => ({ npmDir, ...e })));
 
-        await Promise.all(platforms.map(async ({ npmDir, vscodeTarget, extensionDir: thisExtensionDir, vsixPath, vsixManifestPath, vsixSignaturePath }) => {
+        await Promise.all(extensions.map(async ({ npmDir, vscodeTarget, extensionDir: thisExtensionDir, vsixPath, vsixManifestPath, vsixSignaturePath }) => {
             const npmLibDir = path.join(npmDir, "lib");
             const extensionLibDir = path.join(thisExtensionDir, "lib");
             await fs.promises.mkdir(extensionLibDir, { recursive: true });
@@ -1211,10 +1222,12 @@ export const signNativePreviewExtensions = task({
         }
 
         const platforms = nativePreviewPlatforms();
+        const extensions = platforms.flatMap(({ npmDir, extensions }) => extensions.map(e => ({ npmDir, ...e })));
+
         await sign({
             SignFileRecordList: [
                 {
-                    SignFileList: platforms.map(({ vsixSignaturePath }) => ({ SrcPath: vsixSignaturePath, DstPath: null })),
+                    SignFileList: extensions.map(({ vsixSignaturePath }) => ({ SrcPath: vsixSignaturePath, DstPath: null })),
                     Certs: "VSCodePublisher",
                 },
             ],
@@ -1244,7 +1257,7 @@ export const installExtension = task({
             throw new Error(`No platform found for ${process.platform}-${process.arch}`);
         }
 
-        await $`${options.insiders ? "code-insiders" : "code"} --install-extension ${myPlatform.vsixPath}`;
+        await $`${options.insiders ? "code-insiders" : "code"} --install-extension ${myPlatform.extensions[0].vsixPath}`;
         console.log(pc.yellowBright("\nExtension installed. ") + "To enable this extension, set:\n");
         console.log(pc.whiteBright(`    "typescript.experimental.useTsgo": true\n`));
         console.log("To configure the extension to use built/local instead of its bundled tsgo, set:\n");

_extension/src/extension.ts

@@ -6,6 +6,8 @@ import { setupStatusBar } from "./statusBar";
 import { setupVersionStatusItem } from "./versionStatusItem";
 
 export async function activate(context: vscode.ExtensionContext) {
+    await vscode.commands.executeCommand("setContext", "typescript.native-preview.serverRunning", false);
+
     const output = vscode.window.createOutputChannel("typescript-native-preview", "log");
     const traceOutput = vscode.window.createOutputChannel("typescript-native-preview (LSP)");
     const client = new Client(output, traceOutput);

cmd/tsgo/lsp.go

@@ -4,11 +4,13 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"runtime"
 
 	"github.com/microsoft/typescript-go/internal/bundled"
 	"github.com/microsoft/typescript-go/internal/core"
 	"github.com/microsoft/typescript-go/internal/lsp"
 	"github.com/microsoft/typescript-go/internal/pprof"
+	"github.com/microsoft/typescript-go/internal/tspath"
 	"github.com/microsoft/typescript-go/internal/vfs/osvfs"
 )
 
@@ -37,6 +39,7 @@ func runLSP(args []string) int {
 
 	fs := bundled.WrapFS(osvfs.FS())
 	defaultLibraryPath := bundled.LibPath()
+	typingsLocation := getGlobalTypingsCacheLocation()
 
 	s := lsp.NewServer(&lsp.ServerOptions{
 		In:                 os.Stdin,
@@ -45,10 +48,78 @@ func runLSP(args []string) int {
 		Cwd:                core.Must(os.Getwd()),
 		FS:                 fs,
 		DefaultLibraryPath: defaultLibraryPath,
+		TypingsLocation:    typingsLocation,
 	})
 
 	if err := s.Run(); err != nil {
 		return 1
 	}
 	return 0
 }
+
+func getGlobalTypingsCacheLocation() string {
+	switch runtime.GOOS {
+	case "windows":
+		return tspath.CombinePaths(tspath.CombinePaths(getWindowsCacheLocation(), "Microsoft/TypeScript"), core.VersionMajorMinor())
+	case "openbsd", "freebsd", "netbsd", "darwin", "linux", "android":
+		return tspath.CombinePaths(tspath.CombinePaths(getNonWindowsCacheLocation(), "typescript"), core.VersionMajorMinor())
+	default:
+		panic("unsupported platform: " + runtime.GOOS)
+	}
+}
+
+func getWindowsCacheLocation() string {
+	basePath, err := os.UserCacheDir()
+	if err != nil {
+		if basePath, err = os.UserConfigDir(); err != nil {
+			if basePath, err = os.UserHomeDir(); err != nil {
+				if userProfile := os.Getenv("USERPROFILE"); userProfile != "" {
+					basePath = userProfile
+				} else if homeDrive, homePath := os.Getenv("HOMEDRIVE"), os.Getenv("HOMEPATH"); homeDrive != "" && homePath != "" {
+					basePath = homeDrive + homePath
+				} else {
+					basePath = os.TempDir()
+				}
+			}
+		}
+	}
+	return basePath
+}
+
+func getNonWindowsCacheLocation() string {
+	if xdgCacheHome := os.Getenv("XDG_CACHE_HOME"); xdgCacheHome != "" {
+		return xdgCacheHome
+	}
+	const platformIsDarwin = runtime.GOOS == "darwin"
+	var usersDir string
+	if platformIsDarwin {
+		usersDir = "Users"
+	} else {
+		usersDir = "home"
+	}
+	homePath, err := os.UserHomeDir()
+	if err != nil {
+		if home := os.Getenv("HOME"); home != "" {
+			homePath = home
+		} else {
+			var userName string
+			if logName := os.Getenv("LOGNAME"); logName != "" {
+				userName = logName
+			} else if user := os.Getenv("USER"); user != "" {
+				userName = user
+			}
+			if userName != "" {
+				homePath = "/" + usersDir + "/" + userName
+			} else {
+				homePath = os.TempDir()
+			}
+		}
+	}
+	var cacheFolder string
+	if platformIsDarwin {
+		cacheFolder = "Library/Caches"
+	} else {
+		cacheFolder = ".cache"
+	}
+	return tspath.CombinePaths(homePath, cacheFolder)
+}

internal/api/api.go

@@ -73,6 +73,11 @@ func (api *API) DefaultLibraryPath() string {
 	return api.host.DefaultLibraryPath()
 }
 
+// TypingsInstaller implements ProjectHost
+func (api *API) TypingsInstaller() *project.TypingsInstaller {
+	return nil
+}
+
 // DocumentRegistry implements ProjectHost.
 func (api *API) DocumentRegistry() *project.DocumentRegistry {
 	return api.documentRegistry

internal/checker/checker.go

@@ -18114,7 +18114,7 @@ func (c *Checker) areAllOuterTypeParametersApplied(t *Type) bool {
 }
 
 func (c *Checker) reportCircularBaseType(node *ast.Node, t *Type) {
-	c.error(node, diagnostics.Type_0_recursively_references_itself_as_a_base_type, c.typeToStringEx(t, nil, TypeFormatFlagsWriteArrayAsGenericType, nil))
+	c.error(node, diagnostics.Type_0_recursively_references_itself_as_a_base_type, c.typeToStringEx(t, nil, TypeFormatFlagsWriteArrayAsGenericType))
 }
 
 // A valid base type is `any`, an object type or intersection of object types.
@@ -20387,11 +20387,11 @@ func (c *Checker) elaborateNeverIntersection(chain *ast.Diagnostic, node *ast.No
 	if t.flags&TypeFlagsIntersection != 0 && t.objectFlags&ObjectFlagsIsNeverIntersection != 0 {
 		neverProp := core.Find(c.getPropertiesOfUnionOrIntersectionType(t), c.isDiscriminantWithNeverType)
 		if neverProp != nil {
-			return NewDiagnosticChainForNode(chain, node, diagnostics.The_intersection_0_was_reduced_to_never_because_property_1_has_conflicting_types_in_some_constituents, c.typeToStringEx(t, nil, TypeFormatFlagsNoTypeReduction, nil), c.symbolToString(neverProp))
+			return NewDiagnosticChainForNode(chain, node, diagnostics.The_intersection_0_was_reduced_to_never_because_property_1_has_conflicting_types_in_some_constituents, c.typeToStringEx(t, nil, TypeFormatFlagsNoTypeReduction), c.symbolToString(neverProp))
 		}
 		privateProp := core.Find(c.getPropertiesOfUnionOrIntersectionType(t), isConflictingPrivateProperty)
 		if privateProp != nil {
-			return NewDiagnosticChainForNode(chain, node, diagnostics.The_intersection_0_was_reduced_to_never_because_property_1_exists_in_multiple_constituents_and_is_private_in_some, c.typeToStringEx(t, nil, TypeFormatFlagsNoTypeReduction, nil), c.symbolToString(privateProp))
+			return NewDiagnosticChainForNode(chain, node, diagnostics.The_intersection_0_was_reduced_to_never_because_property_1_exists_in_multiple_constituents_and_is_private_in_some, c.typeToStringEx(t, nil, TypeFormatFlagsNoTypeReduction), c.symbolToString(privateProp))
 		}
 	}
 	return chain