Merge branch 'main' into gabritto/issue3676pt2

Author: gabritto

README.md

@@ -32,9 +32,9 @@ This is still a work in progress and is not yet at full feature parity with Type
 | Commandline and `tsconfig.json` parsing | done | Done, though `tsconfig` errors may not be as helpful. |
 | Type resolution | done | Same types as TS 6.0. |
 | Type checking | done | Same errors, locations, and messages as TS 6.0. Types printback in errors may display differently. |
-| JavaScript-specific inference and JSDoc | in progress | Mostly complete, but intentionally lacking some features. Declaration emit not complete. |
+| JavaScript-specific inference and JSDoc | done | Complete, but intentionally lacking some features. Declaration emit differs greatly, intentionally, to be closer to TS declarations. |
 | JSX | done | - |
-| Declaration emit | in progress | Done for TypeScript files. Not yet complete for JavaScript files. |
+| Declaration emit | done | - |
 | Emit (JS output) | done | - |
 | Watch mode | prototype | Watches files and rebuilds, but no incremental rechecking. Not optimized. |
 | Build mode / project references | done | - |

_extension/src/client.ts

@@ -49,6 +49,7 @@ export class Client implements vscode.Disposable {
     isInitialized = false;
 
     private exe: ExeInfo | undefined;
+    private errorHandler: ReportingErrorHandler;
 
     constructor(
         outputChannel: vscode.LogOutputChannel,
@@ -60,6 +61,17 @@ export class Client implements vscode.Disposable {
         this.traceOutputChannel = traceOutputChannel;
         this.initializedEventEmitter = initializedEventEmitter;
         this.telemetryReporter = telemetryReporter;
+        this.errorHandler = new ReportingErrorHandler(this.telemetryReporter, 5);
+
+        // Monkey-patch the output channel's error method to capture recent stderr lines.
+        // When the server crashes, vscode-languageclient pipes stderr to outputChannel.error(),
+        // so the error handler can include the last N lines in crash telemetry.
+        const originalError = this.outputChannel.error.bind(this.outputChannel);
+        this.outputChannel.error = (...args: Parameters<typeof this.outputChannel.error>) => {
+            originalError(...args);
+            this.errorHandler.pushStderrLine(String(args[0]));
+        };
+
         this.documentSelector = [
             ...jsTsLanguageModes.map(language => ({ scheme: "file", language })),
             ...jsTsLanguageModes.map(language => ({ scheme: "untitled", language })),
@@ -72,7 +84,7 @@ export class Client implements vscode.Disposable {
                 codeLensShowLocationsCommandName,
                 enableTelemetry: true,
             },
-            errorHandler: new ReportingErrorHandler(this.telemetryReporter, 5),
+            errorHandler: this.errorHandler,
             middleware: {
                 workspace: {
                     ...configurationMiddleware,
@@ -345,13 +357,45 @@ class ReportingErrorHandler implements ErrorHandler {
     telemetryReporter: tr.TelemetryReporter;
     maxRestartCount: number;
     restarts: number[];
+    private stderrBuffer: string[] = [];
+    private capturingPanic = false;
+    private static readonly maxStderrLines = 40;
+    private static readonly maxStderrLength = 8192;
 
     constructor(telemetryReporter: tr.TelemetryReporter, maxRestartCount: number) {
         this.telemetryReporter = telemetryReporter;
         this.maxRestartCount = maxRestartCount;
         this.restarts = [];
     }
 
+    pushStderrLine(line: string): void {
+        for (const l of line.split("\n")) {
+            if (!this.capturingPanic) {
+                if (/^panic:/.test(l.trimStart())) {
+                    // Clear any stale data from a previous session/panic.
+                    this.stderrBuffer = [];
+                    this.capturingPanic = true;
+                }
+                else {
+                    continue;
+                }
+            }
+            if (this.stderrBuffer.length < ReportingErrorHandler.maxStderrLines) {
+                this.stderrBuffer.push(l);
+            }
+            else {
+                this.capturingPanic = false;
+            }
+        }
+    }
+
+    private consumeStderrBuffer(): string {
+        const raw = this.stderrBuffer.join("\n");
+        this.stderrBuffer = [];
+        this.capturingPanic = false;
+        return sanitizeStderr(raw).slice(0, ReportingErrorHandler.maxStderrLength);
+    }
+
     error(_error: Error, _message: Message | undefined, count: number | undefined): ErrorHandlerResult | Promise<ErrorHandlerResult> {
         let errorAction = ErrorAction.Shutdown;
         if (count && count <= 3) {
@@ -405,8 +449,10 @@ class ReportingErrorHandler implements ErrorHandler {
             default:
                 const _: never = resultingAction;
         }
+        const lastStderr = this.consumeStderrBuffer();
         this.telemetryReporter.sendTelemetryErrorEvent("languageServer.connectionClosed", {
             resultingAction: actionString,
+            lastStderr,
         });
 
         if (resultingAction === CloseAction.DoNotRestart) {
@@ -419,3 +465,59 @@ class ReportingErrorHandler implements ErrorHandler {
         return { action: resultingAction };
     }
 }
+
+// Matches the server-side sanitizeStackTrace in internal/lsp/stack_sanitizer.go.
+// Strips file path prefixes that may contain PII and redacts frames outside of our module.
+const genericSecretKeywordRegex = /\b(key|token|signature|sig|pwd)([(\[.|])/gi;
+
+function sanitizeStderr(stderr: string): string {
+    if (!stderr) {
+        return "";
+    }
+    return stderr.split("\n").map(sanitizeStderrLine).join("\n");
+}
+
+function sanitizeStderrLine(line: string): string {
+    // Keep "goroutine N [status]:" headers as-is.
+    if (/^goroutine \d+/.test(line)) {
+        return line;
+    }
+    // Redact the panic message itself — assert messages may contain user data.
+    // Keep only "panic:" as a marker.
+    if (/^panic:/.test(line.trimStart())) {
+        return "panic: (REDACTED)";
+    }
+    // Keep "Server process exited" messages from vscode-languageclient.
+    if (line.includes("Server process exited")) {
+        return line;
+    }
+
+    const leadingWhitespace = line.match(/^(\s*)/)?.[1] ?? "";
+
+    // Stack frame file path lines look like: \t/full/path/to/file.go:123 +0x40
+    // Function lines look like: github.com/microsoft/typescript-go/internal/foo.Bar(...)
+    const ourModuleMarker = "typescript-go/internal";
+    const idx = line.indexOf(ourModuleMarker);
+    if (idx >= 0) {
+        let relevantPart = line.slice(idx);
+        // Strip hex offset suffixes like " +0x40"
+        relevantPart = relevantPart.replace(/ \+0x[0-9a-fA-F]+$/, "");
+        // Strip " in goroutine N" suffixes
+        relevantPart = relevantPart.replace(/ in goroutine \d+$/, "");
+        // Strip function arguments (keep parens empty)
+        relevantPart = relevantPart.replace(/\([^)]*\)$/, "()");
+        // Replace / with |> to defeat path-based secret detection
+        relevantPart = relevantPart.replace(/\//g, "|>");
+        // Defeat generic secret keyword regex
+        relevantPart = relevantPart.replace(genericSecretKeywordRegex, "$1X_X$2");
+        return leadingWhitespace + relevantPart;
+    }
+
+    // Preserve completely blank lines.
+    if (line.trim() === "") {
+        return "";
+    }
+
+    // Non-internal frames get fully redacted.
+    return leadingWhitespace + "(REDACTED)";
+}

_extension/src/telemetryReporting.ts

@@ -81,6 +81,7 @@ export type LSConnectionError = {
 
 export type LSServerConnectionClosed = {
     resultingAction: string;
+    lastStderr: string;
 };
 
 export type LSErrorResponse = {

_extension/src/util.ts

@@ -147,9 +147,11 @@ export async function restartExtHostOnChangeIfNeeded(): Promise<void> {
  * `typescript.experimental.useTsgo`, using `inspect()` to only consider
  * explicitly set values (ignoring VS Code defaults).
  *
- * Returns `true` if either setting is explicitly `true`, `false` if either
- * is explicitly `false` (and neither is `true`), or `undefined` if neither
- * setting has been explicitly configured.
+ * Each setting key is resolved using standard VS Code precedence (workspace
+ * folder > workspace > global, with language-specific overrides taking
+ * priority within each scope). Returns `true` if either resolved value is
+ * `true`, `false` if either is `false` (and neither is `true`), or
+ * `undefined` if neither setting has been explicitly configured.
  */
 export function getUseTsgo(): boolean | undefined {
     const tsValue = getExplicitUseTsgo("typescript");
@@ -184,8 +186,9 @@ function getExplicitUseTsgo(section: string): boolean | undefined {
         inspected.globalValue,
     ];
 
-    if (explicitValues.some(v => v === true)) return true;
-    if (explicitValues.some(v => v === false)) return false;
+    for (const v of explicitValues) {
+        if (v !== undefined) return v;
+    }
     return undefined;
 }
 

_packages/native-preview/package.json

@@ -40,47 +40,47 @@
     },
     "exports": {
         "./package.json": "./package.json",
-        "./sync": {
+        "./unstable/sync": {
             "@typescript/source": "./src/api/sync/api.ts",
             "default": "./dist/api/sync/api.js"
         },
-        "./async": {
+        "./unstable/async": {
             "@typescript/source": "./src/api/async/api.ts",
             "default": "./dist/api/async/api.js"
         },
-        "./fs": {
+        "./unstable/fs": {
             "@typescript/source": "./src/api/fs.ts",
             "default": "./dist/api/fs.js"
         },
-        "./proto": {
+        "./unstable/proto": {
             "@typescript/source": "./src/api/proto.ts",
             "default": "./dist/api/proto.js"
         },
-        "./ast": {
+        "./unstable/ast": {
             "@typescript/source": "./src/ast/index.ts",
             "default": "./dist/ast/index.js"
         },
-        "./ast/is": {
+        "./unstable/ast/is": {
             "@typescript/source": "./src/ast/is.ts",
             "default": "./dist/ast/is.js"
         },
-        "./ast/factory": {
+        "./unstable/ast/factory": {
             "@typescript/source": "./src/ast/factory.generated.ts",
             "default": "./dist/ast/factory.generated.js"
         },
-        "./ast/utils": {
+        "./unstable/ast/utils": {
             "@typescript/source": "./src/ast/utils.ts",
             "default": "./dist/ast/utils.js"
         },
-        "./ast/scanner": {
+        "./unstable/ast/scanner": {
             "@typescript/source": "./src/ast/scanner.ts",
             "default": "./dist/ast/scanner.js"
         },
-        "./ast/visitor": {
+        "./unstable/ast/visitor": {
             "@typescript/source": "./src/ast/visitor.ts",
             "default": "./dist/ast/visitor.js"
         },
-        "./ast/clone": {
+        "./unstable/ast/clone": {
             "@typescript/source": "./src/ast/clone.ts",
             "default": "./dist/ast/clone.js"
         }

_packages/native-preview/test/async/api.bench.ts

@@ -2,12 +2,12 @@ import {
     type Node,
     type SourceFile,
     SyntaxKind,
-} from "@typescript/native-preview/ast";
+} from "@typescript/native-preview/unstable/ast";
 import {
     API,
     type Project,
     type Snapshot,
-} from "@typescript/native-preview/async"; // @sync: } from "@typescript/native-preview/sync";
+} from "@typescript/native-preview/unstable/async"; // @sync: } from "@typescript/native-preview/unstable/sync";
 import {
     existsSync,
     writeFileSync,