Merge branch 'main' into fix-api-owner-cache-panic

Author: cplieger

.github/workflows/ci.yml

@@ -2,11 +2,11 @@ name: CI
 
 on:
   push:
-    branches: [main, main-ts7, ts7-release, 'release-*']
+    branches: [main, main-ts7, ts7-release, 'release-*', 'weswigham/*']
   pull_request:
-    branches: [main, main-ts7, ts7-release, 'release-*']
+    branches: [main, main-ts7, ts7-release, 'release-*', 'weswigham/*']
   merge_group:
-    branches: [main, main-ts7, ts7-release, 'release-*']
+    branches: [main, main-ts7, ts7-release, 'release-*', 'weswigham/*']
 
 permissions:
   contents: read

.github/workflows/create-cherry-pick-pr.yml

@@ -66,11 +66,13 @@ jobs:
         run: git switch --detach "origin/$TARGET_BRANCH"
       - run: npm ci
       - uses: azure/login@a641126d1b8aa4d1fa005f4f92df94a3a4c4c906 # v3.1.0
+        if: ${{ !cancelled() }}
         with:
           client-id: ${{ vars.AZURE_CLIENT_ID }}
           tenant-id: ${{ vars.AZURE_TENANT_ID }}
           subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }}
       - name: Create GitHub App token
+        if: ${{ !cancelled() }}
         id: app-token
         uses: microsoft/create-github-app-token-via-key-vault@5ba0d436e9c3cac52feff4d1f2f66f9698ce4a2d # v1
         with:

.github/workflows/new-release-branch.yaml

@@ -95,7 +95,6 @@ jobs:
           PACKAGE_VERSION: ${{ inputs.package_version }}
         run: |
           set -euo pipefail
-          git diff --check
           mapfile -t changedFiles < <(git diff --name-only)
           expectedFiles=("Herebyfile.mjs" "tsc/internal/core/version.go")
           if [ "${changedFiles[*]}" != "${expectedFiles[*]}" ]; then
@@ -108,11 +107,13 @@ jobs:
           git config core.hooksPath /dev/null
           git commit -m "Bump version to $PACKAGE_VERSION"
       - uses: azure/login@a641126d1b8aa4d1fa005f4f92df94a3a4c4c906 # v3.1.0
+        if: ${{ !cancelled() }}
         with:
           client-id: ${{ vars.AZURE_CLIENT_ID }}
           tenant-id: ${{ vars.AZURE_TENANT_ID }}
           subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }}
       - name: Create GitHub App token
+        if: ${{ !cancelled() }}
         id: app-token
         uses: microsoft/create-github-app-token-via-key-vault@5ba0d436e9c3cac52feff4d1f2f66f9698ce4a2d # v1
         with:
@@ -121,6 +122,7 @@ jobs:
           owner: microsoft
           repositories: TypeScript
           permission-contents: write
+          permission-issues: write
       - name: Configure git for GitHub App token
         env:
           GITHUB_APP_TOKEN: ${{ steps.app-token.outputs.token }}

.github/workflows/set-version.yaml

@@ -110,7 +110,6 @@ jobs:
           PACKAGE_VERSION: ${{ inputs.package_version }}
         run: |
           set -euo pipefail
-          git diff --check
           mapfile -t changedFiles < <(git diff --name-only)
           expectedFiles=("Herebyfile.mjs" "tsc/internal/core/version.go")
           for changedFile in "${changedFiles[@]}"; do
@@ -125,11 +124,13 @@ jobs:
           git config core.hooksPath /dev/null
           git commit -m "Bump version to $PACKAGE_VERSION"
       - uses: azure/login@a641126d1b8aa4d1fa005f4f92df94a3a4c4c906 # v3.1.0
+        if: ${{ !cancelled() }}
         with:
           client-id: ${{ vars.AZURE_CLIENT_ID }}
           tenant-id: ${{ vars.AZURE_TENANT_ID }}
           subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }}
       - name: Create GitHub App token
+        if: ${{ !cancelled() }}
         id: app-token
         uses: microsoft/create-github-app-token-via-key-vault@5ba0d436e9c3cac52feff4d1f2f66f9698ce4a2d # v1
         with:
@@ -138,6 +139,7 @@ jobs:
           owner: microsoft
           repositories: TypeScript
           permission-contents: write
+          permission-issues: write
       - name: Configure git for GitHub App token
         if: steps.configure.outputs.changed == 'true'
         env:

.github/workflows/sync-branch.yaml

@@ -109,18 +109,19 @@ jobs:
       - name: Verify clean merge
         run: |
           set -euo pipefail
-          git diff --check
           if ! git diff --quiet || ! git diff --cached --quiet; then
             echo "Validation modified the worktree; refusing to push the merge." >&2
             git status --short
             exit 1
           fi
       - uses: azure/login@a641126d1b8aa4d1fa005f4f92df94a3a4c4c906 # v3.1.0
+        if: ${{ !cancelled() }}
         with:
           client-id: ${{ vars.AZURE_CLIENT_ID }}
           tenant-id: ${{ vars.AZURE_TENANT_ID }}
           subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }}
       - name: Create GitHub App token
+        if: ${{ !cancelled() }}
         id: app-token
         uses: microsoft/create-github-app-token-via-key-vault@5ba0d436e9c3cac52feff4d1f2f66f9698ce4a2d # v1
         with:
@@ -129,6 +130,7 @@ jobs:
           owner: microsoft
           repositories: TypeScript
           permission-contents: write
+          permission-issues: write
       - name: Configure git for GitHub App token
         env:
           GITHUB_APP_TOKEN: ${{ steps.app-token.outputs.token }}

Herebyfile.mjs

@@ -745,7 +745,7 @@ export const generateAPI = task({
 const vendorJsonrpcDir = "packages/typescript/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`
+// vendored copy. Only the runtime files needed by the API's vscode-jsonrpc
 // import (lib + typings + package.json) plus license/readme are vendored.
 const vendorJsonrpcFiles = ["package.json", "README.md", "License.txt", "lib", "typings"];
 

…script/src/enums/caseSensitivity.enum.ts …es/typescript/enums/caseSensitivity.d.tspackages/typescript/src/enums/caseSensitivity.enum.ts renamed to packages/typescript/enums/caseSensitivity.d.ts packages/typescript/src/enums/caseSensitivity.enum.ts renamed to packages/typescript/enums/caseSensitivity.d.ts

@@ -1,6 +1,6 @@
 // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/tspath/path.go. DO NOT EDIT.
 
-export enum CaseSensitivity {
+export declare enum CaseSensitivity {
     Insensitive = 0,
     Sensitive = 1,
 }

…/typescript/src/enums/caseSensitivity.ts …ages/typescript/enums/caseSensitivity.jspackages/typescript/src/enums/caseSensitivity.ts renamed to packages/typescript/enums/caseSensitivity.js packages/typescript/src/enums/caseSensitivity.ts renamed to packages/typescript/enums/caseSensitivity.js

@@ -1,5 +1,5 @@
 // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/tspath/path.go. DO NOT EDIT.
-export var CaseSensitivity: any;
+export var CaseSensitivity;
 (function (CaseSensitivity) {
     CaseSensitivity[CaseSensitivity["Insensitive"] = 0] = "Insensitive";
     CaseSensitivity[CaseSensitivity["Sensitive"] = 1] = "Sensitive";

…escript/src/enums/characterCodes.enum.ts …ges/typescript/enums/characterCodes.d.tspackages/typescript/src/enums/characterCodes.enum.ts renamed to packages/typescript/enums/characterCodes.d.ts packages/typescript/src/enums/characterCodes.enum.ts renamed to packages/typescript/enums/characterCodes.d.ts

@@ -1,4 +1,4 @@
-export enum CharacterCodes {
+export declare enum CharacterCodes {
     EOF = -1,
     nullCharacter = 0,
     maxAsciiCharacter = 0x7F,

…s/typescript/src/enums/characterCodes.ts …kages/typescript/enums/characterCodes.jspackages/typescript/src/enums/characterCodes.ts renamed to packages/typescript/enums/characterCodes.js packages/typescript/src/enums/characterCodes.ts renamed to packages/typescript/enums/characterCodes.js

@@ -1,4 +1,4 @@
-export var CharacterCodes: any;
+export var CharacterCodes;
 (function (CharacterCodes) {
     CharacterCodes[CharacterCodes["EOF"] = -1] = "EOF";
     CharacterCodes[CharacterCodes["nullCharacter"] = 0] = "nullCharacter";