Merge branch 'main' into jabaile/optimize-bin

Author: jakebailey

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
     "image": "mcr.microsoft.com/devcontainers/go:dev-1.26-bookworm",
     // Features to add to the dev container. More info: https://containers.dev/features.
     "features": {
-        "ghcr.io/devcontainers/features/node:1": {
+        "ghcr.io/devcontainers/features/node:2": {
             "version": "lts",
             "pnpmVersion": "latest",
             "nvmVersion": "latest"

.dprint.jsonc

@@ -46,6 +46,7 @@
         "**/node_modules",
         "**/*-lock.json",
         "**/testdata",
+        "_extension/l10n/**",
         "_submodules/**",
         "internal/bundled/libs/**",
         "internal/lsp/lsproto/_generate/*.json",
@@ -60,6 +61,6 @@
         "https://plugins.dprint.dev/typescript-0.96.1.wasm",
         "https://plugins.dprint.dev/json-0.21.3.wasm",
         "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.6.0.wasm",
-        "https://plugins.dprint.dev/jakebailey/gofumpt-v0.0.11.wasm"
+        "https://plugins.dprint.dev/jakebailey/gofumpt-v0.0.12.wasm"
     ]
 }

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
           docker-images: false
           swap-storage: false
           dotnet: false
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
       - uses: ./.github/actions/setup-go
 
@@ -50,7 +50,7 @@ jobs:
     if: ${{ github.repository == 'microsoft/typescript-go' && github.event_name != 'merge_group' }}
     runs-on: TypeScript-1ES-GitHub-XL-2
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: 'lts/*'
@@ -72,7 +72,7 @@ jobs:
   extension:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
 
       - run: npm ci
@@ -137,7 +137,7 @@ jobs:
       - run: git config --system core.longpaths true
         if: ${{ matrix.config.os == 'windows-latest' }}
 
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: ${{ !matrix.config.no-submodules }}
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
@@ -176,7 +176,7 @@ jobs:
 
       - run: git add .
 
-      - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
+      - uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
         if: ${{ always() && matrix.config.coverage && github.event_name != 'merge_group' }}
         with:
           use_oidc: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork) }}
@@ -231,7 +231,7 @@ jobs:
           docker-images: false
           swap-storage: false
           dotnet: false
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
       - uses: ./.github/actions/setup-go
 
@@ -251,7 +251,7 @@ jobs:
   format:
     runs-on: ubuntu-slim
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
       - uses: ./.github/actions/setup-go
 
@@ -268,7 +268,7 @@ jobs:
           docker-images: false
           swap-storage: false
           dotnet: false
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: true
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
@@ -281,10 +281,14 @@ jobs:
       - run: npx hereby generate
       - run: npx hereby generate:enums
       - run: npx hereby generate:ast
+      - run: npx hereby generate:vendor
 
       - run: node --experimental-strip-types ./internal/lsp/lsproto/_generate/fetchModel.mts
       - run: node --experimental-strip-types ./internal/lsp/lsproto/_generate/generate.mts
 
+      - name: generate files for extension
+        run: npx hereby generate:extension
+
       - name: Regenerate fourslash tests and update failing test list
         run: |
           set -x
@@ -303,7 +307,7 @@ jobs:
   tidy:
     runs-on: ubuntu-slim
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - uses: ./.github/actions/setup-go
 
       - run: go mod tidy -diff
@@ -318,7 +322,7 @@ jobs:
           docker-images: false
           swap-storage: false
           dotnet: false
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: true
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
@@ -345,7 +349,7 @@ jobs:
   misc:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
       - uses: ./.github/actions/setup-go
 

.github/workflows/codeql.yml

@@ -44,11 +44,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
+        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
         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@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
+        uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
 
       # ℹ️ 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@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
+        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2

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

@@ -26,7 +26,7 @@ jobs:
           docker-images: false
           swap-storage: false
           dotnet: false
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: true
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0

.gitignore

@@ -178,6 +178,9 @@ go.work.sum
 # Re-add baseline references
 !testdata/baselines/reference/**/*.txt
 
+# Re-add vendored license/notice files (see hereby generate:vendor)
+!_packages/native-preview/vendor/**/*.txt
+
 # Local baselines
 testdata/baselines/local
 testdata/baselines/tmp

CHANGES.md

@@ -126,6 +126,31 @@ Corsa no longer parses the following JSDoc tags with a specific node type. They
 
 ### Miscellaneous
 
+#### Template literal type inference pulls off a full Unicode code point for empty placeholders.
+
+When inferring through a template literal type with an empty delimiter, Corsa consumes a full Unicode code point rather than a single UTF-16 code unit.
+This diverges from Strada, which advances one UTF-16 code unit at a time and therefore splits a supplementary-plane character such as an emoji into its surrogate halves:
+
+```ts
+type Head<S> = S extends `${infer H}${string}` ? H : never;
+type Rest<S> = S extends `${string}${infer R}` ? R : never;
+
+type H = Head<"😀abc">; // Strada: "\uD83D"
+type R = Rest<"😀abc">; // Strada: "\uDE00abc"
+```
+
+In Corsa the emoji stays together:
+
+```ts
+type Head<S> = S extends `${infer H}${string}` ? H : never;
+type Rest<S> = S extends `${string}${infer R}` ? R : never;
+
+type H = Head<"😀abc">; // Corsa: "😀"
+type R = Rest<"😀abc">; // Corsa: "abc"
+```
+
+This means supplementary-plane characters such as emoji are not split into surrogate halves during template literal type inference.
+
 #### With `"strict": false`, Corsa no longer allows omitting arguments for parameters with type `undefined`, `unknown`, or `any`:
 
 ```js

CONTRIBUTING.md

@@ -72,6 +72,50 @@ To debug and run the VS Code extension without installing it globally:
 * Copy `.vscode/launch.template.json` to `.vscode/launch.json`
 * <kbd>F5</kbd> (or `Debug: Start Debugging` from the command palette)
 
-This will launch a new VS Code instance which uses the Corsa LS as the backend. If correctly set up, you should see "tsgo" in the status bar when a TypeScript or JavaScript file is open:
+This will launch a new VS Code instance which uses the Corsa LS as the backend.
 
-![LSP Server Screenshot](.github/ls-screenshot.png)
+#### Collecting Logs
+
+The extension provides a single output channel, **typescript-native-preview**, in VS Code's Output panel. It shows both server log messages and (optionally) LSP protocol traces.
+
+The output channel's **log level** (the gear icon next to the channel dropdown) controls what is visible:
+
+| Log level | What you'll see |
+|---|---|
+| **Error** | Crashes and internal errors while handling requests |
+| **Warning** | Unexpected conditions, e.g. unknown LSP methods |
+| **Info** (default) | Server lifecycle events, project loading, file changes |
+| **Debug** | All of the above, plus verbose server details (cache statistics, project trees) |
+| **Trace** | All of the above, plus full LSP request/response protocol traces |
+
+The **`typescript.native-preview.trace.server`** setting controls the detail level of LSP traces when the log level is set to Trace:
+
+| Setting value | Effect at Trace log level |
+|---|---|
+| `"off"` | No LSP traces |
+| `"messages"` | Request/response names and timing |
+| **`"verbose"`** (default) | Full JSON bodies of every request and response |
+
+When filing an issue, copy the relevant section of log output and include it in your report.
+
+> [!WARNING]
+> Logs contain personally identifiable information (mostly file paths). When the log level is set to Trace and `typescript.native-preview.trace.server` is set to `"verbose"`, this includes the full contents of open files. Always review log content before sharing.
+
+#### Collecting Heap Profiles
+
+Heap profiles are essential for diagnosing high memory usage. When the language server is consuming too much memory:
+
+1. Open the VS Code command palette (<kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd> / <kbd>⌘</kbd>+<kbd>⇧</kbd>+<kbd>P</kbd>).
+2. Run **TypeScript Native Preview: Save Heap Profile**.
+3. Choose a directory to save the profile to.
+4. Attach the resulting `.pb.gz` file to your issue.
+
+#### Collecting CPU Profiles
+
+CPU profiles help diagnose hangs and slow operations:
+
+1. Open the VS Code command palette.
+2. Run **TypeScript Native Preview: Start CPU Profile** and choose a directory.
+3. Reproduce the slow operation.
+4. Run **TypeScript Native Preview: Stop CPU Profile**.
+5. Attach the resulting `.pb.gz` file to your issue.

Herebyfile.mjs

@@ -296,6 +296,14 @@ export const generate = task({
     },
 });
 
+export const generateExtension = task({
+    name: "generate:extension",
+    description: "Generates files in the extension",
+    run: async () => {
+        await $`npm run -w _extension generateLocBundle`;
+    },
+});
+
 // ── Enum generation from Go source ──────────────────────────────
 
 /**
@@ -304,7 +312,6 @@ export const generate = task({
  *   goPrefix: string;
  *   goFile: string;
  *   outDir: string;
- *   constEnum?: boolean;
  * }} EnumDef
  */
 
@@ -322,8 +329,9 @@ const enumDefs = [
     { name: "NodeFlags", goPrefix: "NodeFlags", goFile: "internal/ast/nodeflags.go", outDir: "_packages/native-preview/src/enums" },
     { name: "OuterExpressionKinds", goPrefix: "OEK", goFile: "internal/ast/utilities.go", outDir: "_packages/native-preview/src/enums" },
     { name: "ModifierFlags", goPrefix: "ModifierFlags", goFile: "internal/ast/modifierflags.go", outDir: "_packages/native-preview/src/enums" },
-    { name: "TokenFlags", goPrefix: "TokenFlags", goFile: "internal/ast/tokenflags.go", outDir: "_packages/native-preview/src/enums", constEnum: true },
+    { name: "TokenFlags", goPrefix: "TokenFlags", goFile: "internal/ast/tokenflags.go", outDir: "_packages/native-preview/src/enums" },
     { name: "NodeBuilderFlags", goPrefix: "Flags", goFile: "internal/nodebuilder/types.go", outDir: "_packages/native-preview/src/enums" },
+    { name: "CompletionItemKind", goPrefix: "CompletionItemKind", goFile: "internal/lsp/lsproto/lsp_generated.go", outDir: "_packages/native-preview/src/enums" },
 ];
 
 /**
@@ -442,9 +450,8 @@ function topoSortMembers(members) {
 function renderEnumTS(def, members) {
     const header = `// Code generated by Herebyfile.mjs generate:enums from ${def.goFile}. DO NOT EDIT.\n\n`;
 
-    const constKeyword = def.constEnum ? "const " : "";
     const lines = members.map(m => `    ${m.name} = ${m.value},`);
-    return `${header}export ${constKeyword}enum ${def.name} {\n${lines.join("\n")}\n}\n`;
+    return `${header}export enum ${def.name} {\n${lines.join("\n")}\n}\n`;
 }
 
 async function runGenerateEnums() {
@@ -509,6 +516,34 @@ export const generateAST = task({
     run: () => $`node --experimental-strip-types --no-warnings ./_scripts/generate.ts`,
 });
 
+// ── Vendored npm dependencies ───────────────────────────────────
+
+const vendorJsonrpcDir = "_packages/native-preview/vendor/vscode-jsonrpc";
+const vendorJsonrpcSrc = "node_modules/vscode-jsonrpc";
+// Files copied verbatim from the installed vscode-jsonrpc package into the
+// vendored copy. Only the runtime files needed by the `#vscode-jsonrpc/node`
+// import (lib + typings + package.json) plus license/readme are vendored.
+const vendorJsonrpcFiles = ["package.json", "README.md", "License.txt", "lib", "typings"];
+
+async function runGenerateVendor() {
+    const src = path.join(__dirname, vendorJsonrpcSrc);
+    const dest = path.join(__dirname, vendorJsonrpcDir);
+    if (!fs.existsSync(src)) {
+        throw new Error(`${vendorJsonrpcSrc} is not installed; run \`npm ci\` first.`);
+    }
+    await rimraf(dest);
+    await fs.promises.mkdir(dest, { recursive: true });
+    for (const file of vendorJsonrpcFiles) {
+        await cpRecursive(path.join(src, file), path.join(dest, file));
+    }
+}
+
+export const generateVendor = task({
+    name: "generate:vendor",
+    description: "Updates the vendored copy of vscode-jsonrpc from node_modules.",
+    run: runGenerateVendor,
+});
+
 const coverageDir = path.join(__dirname, "coverage");
 
 const ensureCoverageDirExists = memoize(() => {
@@ -1520,6 +1555,7 @@ async function runBuildNativePreviewPackages() {
     const inputPackageJson = JSON.parse(fs.readFileSync(path.join(inputDir, "package.json"), "utf8"));
     inputPackageJson.version = getVersion();
     delete inputPackageJson.private;
+    inputPackageJson.files = [...new Set([...(inputPackageJson.files ?? []), "NOTICE.txt"])];
     stripSourceConditions(inputPackageJson);
 
     const { stdout: gitHead } = await $pipe`git rev-parse HEAD`;
@@ -1543,7 +1579,7 @@ async function runBuildNativePreviewPackages() {
 
     await fs.promises.writeFile(path.join(mainPackageDir, "package.json"), JSON.stringify(mainPackage, undefined, 4));
     await fs.promises.copyFile("LICENSE", path.join(mainPackageDir, "LICENSE"));
-    // No NOTICE.txt here; does not ship the binary or libs. If this changes, we should add it.
+    await fs.promises.copyFile("NOTICE.txt", path.join(mainPackageDir, "NOTICE.txt"));
 
     // Build JS API and copy dist into the package.
     await $`npm run -w @typescript/native-preview build`;
@@ -1579,6 +1615,7 @@ async function runBuildNativePreviewPackages() {
         const packageJson = {
             ...inputPackageJson,
             bin: undefined,
+            files: ["lib", "NOTICE.txt"],
             imports: undefined,
             scripts: undefined,
             dependencies: undefined,