Merge branch 'main' into parsedPatternsOptimization

Author: DanielRosenwasser

.github/actions/setup-go/action.yml

@@ -20,7 +20,7 @@ runs:
         cache: false
 
     - name: Go cache
-      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+      uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
       with:
         # There is more code downloaded and built than is covered by '**/go.sum',
         # so give each job its own cache to try and not end up sharing the wrong

.github/workflows/ci.yml

@@ -40,13 +40,19 @@ jobs:
           - os: windows-latest
           - os: macos-latest
           - os: ubuntu-latest
+            name: 'no submodules'
             no-submodules: true
-          - os: ubuntu-latest
+          - os: ['self-hosted', '1ES.Pool=TypeScript-1ES-GitHub-XL', '1ES.ImageOverride=mariner-2.0']
+            name: 'race mode'
             race: true
           - os: ubuntu-latest
+            name: 'noembed'
             noembed: true
+          - os: ubuntu-latest
+            name: 'concurrent test programs'
+            concurrent-test-program: true
 
-    name: test (${{ matrix.os }}${{ (matrix.no-submodules && ' without submodules') || '' }}${{ (matrix.race && ' in race mode') || '' }}${{ (matrix.noembed && ' with noembed') || '' }})
+    name: test (${{ matrix.name || matrix.os }})
 
     runs-on: ${{ matrix.os }}
 
@@ -58,6 +64,8 @@ jobs:
         with:
           submodules: ${{ !matrix.no-submodules }}
       - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        with:
+          node-version: 'lts/*'
       - uses: ./.github/actions/setup-go
         with:
           cache-name: test
@@ -71,10 +79,11 @@ jobs:
 
       - name: Tests
         id: test
-        run: npx hereby test:all ${RACE_FLAG:+"$RACE_FLAG"} ${NOEMBED_FLAG:+"$NOEMBED_FLAG"}
+        run: npx hereby test:all ${RACE_FLAG:+"$RACE_FLAG"} ${NOEMBED_FLAG:+"$NOEMBED_FLAG"} ${CONCURRENTTESTPROGRAM_FLAG:+"$CONCURRENTTESTPROGRAM_FLAG"}
         env:
           RACE_FLAG: ${{ (matrix.race && '--race') || '' }}
           NOEMBED_FLAG: ${{ (matrix.noembed && '--noembed') || '' }}
+          CONCURRENTTESTPROGRAM_FLAG: ${{ (matrix.concurrent-test-program && '--concurrentTestPrograms') || '' }}
 
       - run: git add .
       - run: git diff --staged --exit-code --stat
@@ -85,6 +94,11 @@ jobs:
           npx hereby baseline-accept
           git add testdata/baselines/reference
           git diff --staged --exit-code
+      - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        if: ${{ failure() && steps.test.conclusion == 'failure' }}
+        with:
+          name: ${{ matrix.os }}-${{ (matrix.race && 'race') || 'norace' }}-new-baselines-artifact
+          path: testdata/baselines/local
 
   lint:
     runs-on: ubuntu-latest

.github/workflows/codeql.yml

@@ -48,7 +48,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
+        uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.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@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
+        uses: github/codeql-action/autobuild@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.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@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
+        uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10

.github/workflows/merge-queue.yml

@@ -0,0 +1,43 @@
+name: Merge Queue Checks
+
+on:
+  merge_group:
+
+permissions:
+  contents: read
+
+# Ensure scripts are run with pipefail. See:
+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  test:
+    runs-on: ['self-hosted', '1ES.Pool=TypeScript-1ES-GitHub-XL', '1ES.ImageOverride=mariner-2.0']
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          submodules: true
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        with:
+          node-version: 'lts/*'
+      - uses: ./.github/actions/setup-go
+        with:
+          cache-name: merge-queue-test
+
+      - run: npm ci
+      - run: npx hereby test:all
+
+  required:
+    runs-on: ubuntu-latest
+    if: ${{ always() }}
+    needs:
+      - test
+
+    steps:
+      - name: Check required jobs
+        env:
+          NEEDS: ${{ toJson(needs) }}
+        run: |
+          ! echo $NEEDS | jq -e 'to_entries[] | { job: .key, result: .value.result } | select(.result != "success")'

CHANGES.md

@@ -11,9 +11,10 @@ CHANGES.md lists intentional changes between the Strada (Typescript) and Corsa (
 3. Malformed string ImportSpecifiers (`import x as "OOPS" from "y"`) now contain the string's text instead of an empty identifier.
 4. Empty binding elements no longer have a separate kind for OmittedExpression. Instead they have Kind=BindingElement with a nil Initialiser, Name and DotDotDotToken.
 5. ShorthandPropertyAssignment no longer includes an EqualsToken as a child when it has an ObjectAssignmentInitializer.
-6. The parser always parses a JSDocText node for comments in JSDoc. `string` is no longer part of the type of `comment`.
-7. In cases where Strada did produce a JSDocText node, Corsa no longer (incorrectly) includes all leading and trailing whitespace/asterisks, as well as initial `/**`.
-8. JSDocMemberName is now parsed as QualifiedName. These two nodes previously only differed by type, and now QualifiedName has a much less restrictive type for its left child.
+6. JSDoc nodes now include leading whitespace in their location.
+7. The parser always parses a JSDocText node for comments in JSDoc. `string` is no longer part of the type of `comment`.
+8. In cases where Strada did produce a JSDocText node, Corsa no longer (incorrectly) includes all leading and trailing whitespace/asterisks, as well as initial `/**`.
+9. JSDocMemberName is now parsed as QualifiedName. These two nodes previously only differed by type, and now QualifiedName has a much less restrictive type for its left child.
 
 JSDoc types are parsed in normal type annotation position but show a grammar error. Corsa no longer parses the JSDoc types below, giving a parse error instead of a grammar error.
 

Herebyfile.mjs

@@ -28,12 +28,14 @@ const { values: options } = parseArgs({
         fix: { type: "boolean" },
         noembed: { type: "boolean" },
         debug: { type: "boolean" },
+        concurrentTestPrograms: { type: "boolean" },
     },
     strict: false,
     allowPositionals: true,
     allowNegative: true,
     noembed: false,
     debug: false,
+    concurrentTestPrograms: false,
 });
 
 const defaultGoBuildTags = [
@@ -203,6 +205,12 @@ const goTestFlags = [
     ...goBuildTags(),
 ];
 
+const goTestEnv = {
+    ...(options.concurrentTestPrograms ? { TS_TEST_PROGRAM_SINGLE_THREADED: "false" } : {}),
+};
+
+const $test = $({ env: goTestEnv });
+
 const gotestsum = memoize(() => {
     const args = isInstalled("gotestsum") ? ["gotestsum", "--format-hide-empty-pkg", "--"] : ["go", "test"];
     return args.concat(goTestFlags);
@@ -213,7 +221,7 @@ const goTest = memoize(() => {
 });
 
 async function runTests() {
-    await $`${gotestsum()} ./...`;
+    await $test`${gotestsum()} ./... ${isCI ? ["--timeout=45m"] : []}`;
 }
 
 export const test = task({
@@ -223,7 +231,7 @@ export const test = task({
 
 async function runTestBenchmarks() {
     // Run the benchmarks once to ensure they compile and run without errors.
-    await $`${goTest()} -run=- -bench=. -benchtime=1x ./...`;
+    await $test`${goTest()} -run=- -bench=. -benchtime=1x ./...`;
 }
 
 export const testBenchmarks = task({
@@ -232,7 +240,7 @@ export const testBenchmarks = task({
 });
 
 async function runTestTools() {
-    await $({ cwd: path.join(__dirname, "_tools") })`${gotestsum()} ./...`;
+    await $test({ cwd: path.join(__dirname, "_tools") })`${gotestsum()} ./...`;
 }
 
 export const testTools = task({

_extension/src/extension.ts

@@ -4,7 +4,9 @@ import * as vscode from "vscode";
 import {
     LanguageClient,
     LanguageClientOptions,
+    NotebookDocumentFilter,
     ServerOptions,
+    TextDocumentFilter,
     TransportKind,
 } from "vscode-languageclient/node";
 
@@ -55,11 +57,45 @@ export function activate(context: vscode.ExtensionContext) {
             onSave: true,
             onTabs: true,
             match(documentSelector, resource) {
-                const document = vscode.workspace.textDocuments.find(doc => doc.uri.toString() === resource.toString());
-                if (!document) {
-                    return false;
+                // This function is called when diagnostics are requested but
+                // only the URI itself is known (e.g. open but not yet focused tabs),
+                // so will not be present in vscode.workspace.textDocuments.
+                // See if this file matches without consulting vscode.languages.match
+                // (which requires a TextDocument).
+
+                const language = getLanguageForUri(resource);
+
+                for (const selector of documentSelector) {
+                    if (typeof selector === "string") {
+                        if (selector === language) {
+                            return true;
+                        }
+                        continue;
+                    }
+                    if (NotebookDocumentFilter.is(selector)) {
+                        continue;
+                    }
+                    if (TextDocumentFilter.is(selector)) {
+                        if (selector.language !== undefined && selector.language !== language) {
+                            continue;
+                        }
+
+                        if (selector.scheme !== undefined && selector.scheme !== resource.scheme) {
+                            continue;
+                        }
+
+                        if (selector.pattern !== undefined) {
+                            // VS Code's glob matcher is not available via the API;
+                            // see: https://github.com/microsoft/vscode/issues/237304
+                            // But, we're only called on selectors passed above, so just ignore this for now.
+                            throw new Error("Not implemented");
+                        }
+
+                        return true;
+                    }
                 }
-                return vscode.languages.match(documentSelector, document) > 0;
+
+                return false;
             },
         },
     };
@@ -81,3 +117,23 @@ export function deactivate(): Thenable<void> | undefined {
     }
     return client.stop();
 }
+
+function getLanguageForUri(uri: vscode.Uri): string | undefined {
+    const ext = path.posix.extname(uri.path);
+    switch (ext) {
+        case ".ts":
+        case ".mts":
+        case ".cts":
+            return "typescript";
+        case ".js":
+        case ".mjs":
+        case ".cjs":
+            return "javascript";
+        case ".tsx":
+            return "typescriptreact";
+        case ".jsx":
+            return "javascriptreact";
+        default:
+            return undefined;
+    }
+}

cmd/tsgo/main.go

@@ -10,6 +10,7 @@ import (
 	"runtime"
 	"runtime/pprof"
 	"slices"
+	"strconv"
 	"strings"
 	"time"
 
@@ -141,25 +142,25 @@ func main() {
 	fs := bundled.WrapFS(osvfs.FS())
 	defaultLibraryPath := bundled.LibPath()
 
-	configFilePath := tspath.ResolvePath(currentDirectory, opts.tsc.project)
-	if !fs.FileExists(configFilePath) {
-		configFilePath = tspath.CombinePaths(configFilePath, "tsconfig.json")
-		if !fs.FileExists(configFilePath) {
-			fmt.Fprintf(os.Stderr, "Error: The file %v does not exist.\n", configFilePath)
+	configFileName := tspath.ResolvePath(currentDirectory, opts.tsc.project)
+	if !fs.FileExists(configFileName) {
+		configFileName = tspath.CombinePaths(configFileName, "tsconfig.json")
+		if !fs.FileExists(configFileName) {
+			fmt.Fprintf(os.Stderr, "Error: The file %v does not exist.\n", configFileName)
 			os.Exit(1)
 		}
 	}
 
 	// Set up CLI option overrides
 	compilerOptions := opts.toCompilerOptions(currentDirectory)
 
-	currentDirectory = tspath.GetDirectoryPath(configFilePath)
+	currentDirectory = tspath.GetDirectoryPath(configFileName)
 	// !!! is the working directory actually the config path?
 	host := ts.NewCompilerHost(compilerOptions, currentDirectory, fs, defaultLibraryPath)
 
 	parseStart := time.Now()
 	program := ts.NewProgram(ts.ProgramOptions{
-		ConfigFilePath: configFilePath,
+		ConfigFileName: configFileName,
 		Options:        compilerOptions,
 		SingleThreaded: opts.devel.singleThreaded,
 		Host:           host,
@@ -248,6 +249,7 @@ func main() {
 	}
 	stats.add("Total time", totalTime)
 	stats.add("Memory used", fmt.Sprintf("%vK", memStats.Alloc/1024))
+	stats.add("Memory allocs", strconv.FormatUint(memStats.Mallocs, 10))
 
 	stats.print()
 }

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/dlclark/regexp2 v1.11.4
 	github.com/go-json-experiment/json v0.0.0-20241127185351-9802db03f36a
 	github.com/google/go-cmp v0.6.0
+	github.com/pkg/diff v0.0.0-20241224192749-4e6772a4315c
 	golang.org/x/sys v0.27.0
 	golang.org/x/tools v0.27.0
 	gotest.tools/v3 v3.5.1

go.sum

@@ -4,6 +4,8 @@ github.com/go-json-experiment/json v0.0.0-20241127185351-9802db03f36a h1:W/o3DbE
 github.com/go-json-experiment/json v0.0.0-20241127185351-9802db03f36a/go.mod h1:BWmvoE1Xia34f3l/ibJweyhrT+aROb/FQ6d+37F0e2s=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/pkg/diff v0.0.0-20241224192749-4e6772a4315c h1:8TRxBMS/YsupXoOiGKHr9ZOXo+5DezGWPgBAhBHEHto=
+github.com/pkg/diff v0.0.0-20241224192749-4e6772a4315c/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
 golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=