Merge branch 'main' into jabaile/gofumpt-go-tool

Author: jakebailey

.custom-gcl.yml

@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=https://golangci-lint.run/jsonschema/custom-gcl.jsonschema.json
 
-version: v1.64.6
+version: v2.0.2
 
 destination: ./_tools
 

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

@@ -14,13 +14,13 @@ runs:
   steps:
     - name: Install Go
       id: install-go
-      uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
+      uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
       with:
         go-version: ${{ inputs.go-version }}
         cache: false
 
     - name: Go cache
-      uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
+      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       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/codecov.yml

@@ -0,0 +1,14 @@
+comment: false
+
+coverage:
+  precision: 5
+  status:
+    patch:
+      default:
+        informational: true
+    project:
+      default:
+        informational: true
+
+github_checks:
+  annotations: false

.github/workflows/ci.yml

@@ -31,14 +31,27 @@ jobs:
 
       - run: npx hereby build
 
+  extension:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+
+      - run: npm ci
+
+      - run: npm run extension:build
+
   test:
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: ubuntu-latest
+            coverage: true
           - os: windows-latest
+            coverage: true
           - os: macos-latest
+            coverage: true
           - os: ubuntu-latest
             name: 'no submodules'
             no-submodules: true
@@ -50,12 +63,23 @@ jobs:
             noembed: true
           - os: ubuntu-latest
             name: 'concurrent test programs'
-            concurrent-test-program: true
+            concurrent-test-programs: true
+            coverage: true
 
     name: test (${{ matrix.name || matrix.os }})
 
     runs-on: ${{ matrix.os }}
 
+    permissions:
+      id-token: write
+      contents: read
+
+    env:
+      TSGO_HEREBY_RACE: ${{ (matrix.race && 'true') || 'false' }}
+      TSGO_HEREBY_NOEMBED: ${{ (matrix.noembed && 'true') || 'false' }}
+      TSGO_HEREBY_CONCURRENT_TEST_PROGRAMS: ${{ (matrix.concurrent-test-programs && 'true') || 'false' }}
+      TSGO_HEREBY_COVERAGE: ${{ (matrix.coverage && 'true') || 'false' }}
+
     steps:
       - run: git config --system core.longpaths true
         if: ${{ matrix.os == 'windows-latest' }}
@@ -79,13 +103,17 @@ jobs:
 
       - name: Tests
         id: test
-        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: npx hereby test:all
 
       - run: git add .
+
+      - uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
+        if: ${{ always() && matrix.coverage }}
+        with:
+          use_oidc: true
+          name: ${{ matrix.name || matrix.os }}
+          directory: ./coverage
+
       - run: git diff --staged --exit-code --stat
 
       - name: Print baseline diff on failure
@@ -94,7 +122,7 @@ jobs:
           npx hereby baseline-accept
           git add testdata/baselines/reference
           git diff --staged --exit-code
-      - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: ${{ failure() && steps.test.conclusion == 'failure' }}
         with:
           name: ${{ matrix.os }}-${{ (matrix.race && 'race') || 'norace' }}-new-baselines-artifact
@@ -116,6 +144,9 @@ jobs:
 
     runs-on: ${{ matrix.os }}
 
+    env:
+      TSGO_HEREBY_NOEMBED: ${{ (matrix.noembed && 'true') || 'false' }}
+
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
@@ -125,10 +156,7 @@ jobs:
 
       - run: npm ci
 
-      - run: npx hereby install-tools
-      - run: npx hereby lint ${NOEMBED_FLAG:+"$NOEMBED_FLAG"}
-        env:
-          NOEMBED_FLAG: ${{ (matrix.noembed && '--noembed') || '' }}
+      - run: npx hereby lint
 
   format:
     runs-on: ubuntu-latest
@@ -204,6 +232,58 @@ jobs:
 
       - run: go -C ./_tools run ./cmd/checkmodpaths $PWD
 
+  baselines:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          submodules: true
+      - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+      - uses: ./.github/actions/setup-go
+        with:
+          cache-name: baselines
+
+      - run: npm ci
+
+      - name: Remove all baselines
+        run: rm -rf testdata/baselines/reference
+
+      - name: Run tests
+        run: npx hereby test &> /dev/null || exit 0
+
+      - name: Accept baselines
+        run: |
+          npx hereby baseline-accept
+          git add testdata/baselines/reference
+
+      - name: Run tests
+        run: npx hereby test
+
+      - name: Check baselines
+        id: check-baselines
+        run: |
+          function print_diff() {
+            if ! git diff --staged --exit-code --quiet --diff-filter=$1; then
+              echo "$2:"
+              git diff --staged --name-only --diff-filter=$1
+            fi
+          }
+
+          if ! git diff --staged --exit-code --quiet; then
+            print_diff ACR "Missing baselines"
+            print_diff MTUXB "Modified baselines"
+            print_diff D "Unused baselines"
+            git diff --staged > fix_baselines.patch
+            exit 1
+          fi
+
+      - name: Upload baseline diff artifact
+        if: ${{ failure() && steps.check-baselines.conclusion == 'failure' }}
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: fix_baselines.patch
+          path: fix_baselines.patch
+
   required:
     runs-on: ubuntu-latest
     if: ${{ always() }}

.github/workflows/codeql.yml

@@ -48,7 +48,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
+        uses: github/codeql-action/init@fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2 # v3.28.14
         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@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
+        uses: github/codeql-action/autobuild@fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2 # v3.28.14
 
       # ℹ️ 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@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
+        uses: github/codeql-action/analyze@fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2 # v3.28.14

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "_submodules/TypeScript"]
 	path = _submodules/TypeScript
 	url = https://github.com/microsoft/TypeScript.git
+	branch = tsgo-port

.golangci.yml

@@ -1,21 +1,20 @@
 # yaml-language-server: $schema=https://golangci-lint.run/jsonschema/golangci.jsonschema.json
 
+version: '2'
+
 run:
   allow-parallel-runners: true
-  timeout: 180s
 
 linters:
-  disable-all: true
+  default: none
   enable:
     # Enabled
     - asasalint
-    - inamedparam
-    - nakedret
-    - govet
     - bidichk
     - bodyclose
     - canonicalheader
     - copyloopvar
+    - customlint
     - durationcheck
     - errcheck
     - errchkjson
@@ -24,14 +23,16 @@ linters:
     - fatcontext
     - gocheckcompilerdirectives
     - goprintffuncname
-    - gosimple
+    - govet
     - grouper
+    - inamedparam
     - ineffassign
     - intrange
     - makezero
     - mirror
     - misspell
     - musttag
+    - nakedret
     - nolintlint
     - paralleltest
     - perfsprint
@@ -42,9 +43,6 @@ linters:
     - unconvert
     - usestdlibvars
     - usetesting
-    - whitespace
-
-    - customlint
 
     # Need to add headers
     # - goheader
@@ -55,27 +53,20 @@ linters:
     # - gosec
     # - revive
     # - staticcheck
-    # - stylecheck
     # - testifylint
     # - unparam
     # - unused
 
-linters-settings:
-  custom:
-    customlint:
-      type: module
+  settings:
+    custom:
+      customlint:
+        type: module
 
-#   revive:
-#     enable-all-rules: true
-#     rules:
-#       - name: unused-parameter
-#         disabled: true
+  exclusions:
+    presets:
+      - comments
+      - std-error-handling
 
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
-
-  exclude:
-    - '^could not import'
-    - '^: #'
-    - 'imported and not used$'