Merge remote-tracking branch 'origin/main' into organize-imports

Author: johnfav03

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
           swap-storage: false
           dotnet: false
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
       - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
       - uses: ./.github/actions/setup-go
 
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
       - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
 
       - run: npm ci
@@ -71,7 +71,8 @@ jobs:
             skip: ${{ github.event_name == 'merge_group' }}
           - os: macos-latest
             coverage: true
-            skip: ${{ github.event_name == 'merge_group' }}
+            # There aren't enough macOS runners; skip in PRs and rely on main branch runs.
+            skip: ${{ github.event_name == 'merge_group' || github.event_name == 'pull_request' }}
           - os: ubuntu-latest
             name: 'no submodules'
             no-submodules: true
@@ -118,7 +119,7 @@ jobs:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           submodules: ${{ !matrix.config.no-submodules }}
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 'lts/*'
       - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
@@ -211,7 +212,7 @@ jobs:
           swap-storage: false
           dotnet: false
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
       - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
       - uses: ./.github/actions/setup-go
         with:
@@ -234,7 +235,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
       - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
       - uses: ./.github/actions/setup-go
 
@@ -254,7 +255,7 @@ jobs:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           submodules: true
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: '>=22.16.0'
       - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
@@ -301,7 +302,7 @@ jobs:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           submodules: true
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
       - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
       - uses: ./.github/actions/setup-go
 
@@ -343,7 +344,7 @@ jobs:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           submodules: true
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
       - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
       - uses: ./.github/actions/setup-go
 

.github/workflows/codeql.yml

@@ -48,7 +48,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+        uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
         with:
           config-file: ./.github/codeql/codeql-configuration.yml
         # Override language selection by uncommenting this and choosing your languages
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below).
       - name: Autobuild
-        uses: github/codeql-action/autobuild@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+        uses: github/codeql-action/autobuild@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -72,4 +72,4 @@ jobs:
       #     make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+        uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10

.github/workflows/copilot-setup-steps.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           submodules: true
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: '>=22.16.0'
       - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable

.github/workflows/create-cache.yml

@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           submodules: true
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
       - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
 
       - uses: ./.github/actions/setup-go

.vscode/tasks.json

@@ -49,7 +49,28 @@
                 "reveal": "never"
             },
             "problemMatcher": [
-                "$tsc"
+                "$tsc",
+                // Copy-paste from https://github.com/connor4312/esbuild-problem-matchers to avoid the extension dependency
+                {
+                    "owner": "esbuild",
+                    "severity": "error",
+                    "applyTo": "closedDocuments",
+                    "source": "esbuild",
+                    "fileLocation": "relative",
+                    "pattern": [
+                        {
+                            "regexp": "^[✘▲] \\[([A-Z]+)\\] (.+)",
+                            "severity": 1,
+                            "message": 2
+                        },
+                        {
+                            "regexp": "^(?:\\t| {4})(?!\\s)([^:]+)(?::([0-9]+))?(?::([0-9]+))?:$",
+                            "file": 1,
+                            "line": 2,
+                            "column": 3
+                        }
+                    ]
+                }
             ]
         },
         {
@@ -65,9 +86,36 @@
                 "panel": "dedicated",
                 "reveal": "never"
             },
-            "problemMatcher": [
-                "$tsc-watch"
-            ]
+            // Copy-paste from https://github.com/connor4312/esbuild-problem-matchers to avoid the extension dependency
+            "problemMatcher": {
+                "owner": "esbuild-watch",
+                "severity": "error",
+                "applyTo": "closedDocuments",
+                "source": "esbuild",
+                "fileLocation": "relative",
+                "pattern": [
+                    {
+                        "regexp": "^[✘▲] \\[([A-Z]+)\\] (.+)",
+                        "severity": 1,
+                        "message": 2
+                    },
+                    {
+                        "regexp": "^(?:\\t| {4})(?!\\s)([^:]+)(?::([0-9]+))?(?::([0-9]+))?:$",
+                        "file": 1,
+                        "line": 2,
+                        "column": 3
+                    }
+                ],
+                "background": {
+                    "activeOnStart": true,
+                    "beginsPattern": {
+                        "regexp": "\\[watch\\] build started"
+                    },
+                    "endsPattern": {
+                        "regexp": "\\[watch\\] build finished"
+                    }
+                }
+            }
         },
         {
             "label": "Watch for extension run",

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## How to Build and Run
 
-This repo uses [Go 1.25 or higher](https://go.dev/dl/), [Rust 1.85 or higher](https://www.rust-lang.org/tools/install), [Node.js with npm](https://nodejs.org/), and [`hereby`](https://www.npmjs.com/package/hereby).
+This repo uses [Go 1.25 or higher](https://go.dev/dl/), [Rust 1.88 or higher](https://www.rust-lang.org/tools/install), [Node.js with npm](https://nodejs.org/), and [`hereby`](https://www.npmjs.com/package/hereby).
 
 For tests and code generation, this repo contains a git submodule to the main TypeScript repo pointing to the commit being ported.
 When cloning, you'll want to clone with submodules:

Herebyfile.mjs

@@ -1307,7 +1307,8 @@ export const packNativePreviewExtensions = task({
         await rimraf(builtVsix);
         await fs.promises.mkdir(builtVsix, { recursive: true });
 
-        await $({ cwd: extensionDir })`npm run bundle`;
+        // We don't use vscode:prepublish, as that would run the build for each package below.
+        await $({ cwd: extensionDir })`npm run bundle:release`;
 
         let version = "0.0.0";
         if (options.forRelease) {
@@ -1341,7 +1342,6 @@ export const packNativePreviewExtensions = task({
             const packageJsonPath = path.join(thisExtensionDir, "package.json");
             const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
             packageJson.version = version;
-            packageJson.main = "dist/extension.bundle.js";
             fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, undefined, 4));
 
             await fs.promises.copyFile("NOTICE.txt", path.join(thisExtensionDir, "NOTICE.txt"));

_extension/package.json

@@ -144,7 +144,7 @@
             }
         ]
     },
-    "main": "./dist/extension.js",
+    "main": "./dist/extension.bundle.js",
     "files": [
         "dist/extension.bundle.js",
         "lib",
@@ -153,9 +153,11 @@
         "logo.png"
     ],
     "scripts": {
-        "build": "tsc",
-        "watch": "tsc --watch",
-        "bundle": "esbuild src/extension.ts --bundle --external:vscode --platform=node --format=cjs --outfile=dist/extension.bundle.js --minify"
+        "build": "tsc && npm run bundle",
+        "bundle": "esbuild src/extension.ts --bundle --external:vscode --platform=node --format=cjs --outfile=dist/extension.bundle.js --sourcemap",
+        "watch": "npm run bundle -- --watch",
+        "//vscode:prepublish": "we do not use this hook; the Herebyfile runs bundle:release once instead",
+        "bundle:release": "npm run bundle -- --minify"
     },
     "dependencies": {
         "vscode-languageclient": "^10.0.0-next.19"

_extension/tsconfig.json

@@ -8,7 +8,8 @@
         "strict": true,
         "skipLibCheck": true,
         "resolveJsonModule": true,
-        "sourceMap": true
+        "sourceMap": true,
+        "noEmit": true
     },
     "include": ["./src/**/*"]
 }

cmd/tsgo/lsp.go

@@ -71,68 +71,16 @@ func runLSP(args []string) int {
 }
 
 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()
+	cacheDir, 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()
-				}
-			}
-		}
+		cacheDir = 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"
+	var subdir string
+	if runtime.GOOS == "windows" {
+		subdir = "Microsoft/TypeScript"
 	} else {
-		cacheFolder = ".cache"
+		subdir = "typescript"
 	}
-	return tspath.CombinePaths(homePath, cacheFolder)
+	return tspath.CombinePaths(cacheDir, subdir, core.VersionMajorMinor())
 }