Merge branch 'main' into jabaile/symbol-tweaks

Author: jakebailey

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

@@ -3,8 +3,10 @@ description: Setup Go
 
 inputs:
   go-version:
+    description: Go version range to set up.
     default: '>=1.23.0'
   cache-name:
+    description: Name of scoped cache for this set up.
     default: 'cache'
 
 runs:
@@ -18,12 +20,12 @@ runs:
         cache: false
 
     - name: Go cache
-      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+      uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
       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
         # cache between jobs.
-        key: ts-setup-go-${{ runner.os }}-${{ steps.install-go.outputs.go-version }}-${{ github.workflow }}-${{ inputs.cache-name }}-${{ hashFiles('**/go.sum', '**/Herebyfile.mjs') }}
+        key: ts-setup-go-${{ runner.os }}-${{ steps.install-go.outputs.go-version }}-${{ github.workflow }}-${{ inputs.cache-name }}-${{ hashFiles('**/go.sum', '**/Herebyfile.mjs', '**/.custom-gcl.yml') }}
         path: |
           ~/go/pkg/mod
           ~/.cache/go-build

.github/workflows/ci.yml

@@ -35,23 +35,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-          - macos-latest
-        no-submodules:
-          - false
-        race:
-          - false
         include:
           - os: ubuntu-latest
-            no-submodules: true
+          - os: windows-latest
+          - os: macos-latest
           - os: ubuntu-latest
+            name: 'no submodules'
+            no-submodules: true
+          - 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 }}
 
@@ -63,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,14 +74,16 @@ jobs:
 
       - run: go install gotest.tools/gotestsum@latest
         # Installing gotestsum is super slow on Windows.
-        if: ${{ matrix.os != 'windows-latest' }}
+        # Also, avoid using it in race mode so we get the full output.
+        if: ${{ matrix.os != 'windows-latest' && !matrix.race }}
 
       - 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
@@ -89,6 +94,11 @@ jobs:
           npx hereby baseline-accept
           git add testdata/baselines/reference
           git diff --staged --exit-code
+      - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        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")'

.golangci.yml

@@ -1,5 +1,9 @@
 # yaml-language-server: $schema=https://golangci-lint.run/jsonschema/golangci.jsonschema.json
 
+run:
+  allow-parallel-runners: true
+  timeout: 180s
+
 linters:
   disable-all: true
   enable:
@@ -18,7 +22,6 @@ linters:
     - errname
     - errorlint
     - fatcontext
-    - gci
     - gocheckcompilerdirectives
     - goprintffuncname
     - gosimple

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({
@@ -305,7 +313,19 @@ export const lint = task({
     name: "lint",
     run: async () => {
         await buildCustomLinter();
-        await $`${customLinterPath} run ${options.fix ? ["--fix"] : []} ${isCI ? ["--timeout=5m"] : []}`;
+
+        const lintArgs = ["run", "--sort-results"];
+        if (isCI) {
+            lintArgs.push("--timeout=5m");
+        }
+        if (options.fix) {
+            lintArgs.push("--fix");
+        }
+
+        const resolvedCustomLinterPath = path.resolve(customLinterPath);
+        await $`${resolvedCustomLinterPath} ${lintArgs}`;
+        console.log("Linting _tools");
+        await $({ cwd: "./_tools" })`${resolvedCustomLinterPath} ${lintArgs}`;
     },
 });
 

_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;
+    }
+}

_tools/customlint/emptycase.go

@@ -61,7 +61,7 @@ func checkCases(pass *analysis.Pass, file *ast.File, clause *ast.BlockStmt) {
 
 func checkCaseStatement(pass *analysis.Pass, file *ast.File, stmt ast.Stmt, nextCasePos token.Pos) {
 	var body []ast.Stmt
-	colon := token.NoPos
+	var colon token.Pos
 
 	switch stmt := stmt.(type) {
 	case *ast.CaseClause:

_tools/customlint/plugin.go

@@ -16,6 +16,7 @@ type plugin struct{}
 func (f *plugin) BuildAnalyzers() ([]*analysis.Analyzer, error) {
 	return []*analysis.Analyzer{
 		emptyCaseAnalyzer,
+		shadowAnalyzer,
 	}, nil
 }