Sync changes from upstream

.custom-gcl.yml

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

.github/workflows/codeql.yml

@@ -48,7 +48,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
+        uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
         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@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
+        uses: github/codeql-action/autobuild@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
 
       # ℹ️ 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@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
+        uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5

.github/workflows/create-cache.yml

@@ -1,48 +1,48 @@
-name: Create CI cache
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-  schedule:
-    # Run every day at 10:00 UTC / 03:00 PST
-    - cron: '0 10 * * *'
-
-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:
-  cache:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-          - macos-latest
-        go-version:
-          - '>=1.25.0'
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - run: git config --system core.longpaths true
-        if: ${{ matrix.os == 'windows-latest' }}
-
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          submodules: true
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
-      - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
-
-      - uses: ./.github/actions/setup-go
-        with:
-          go-version: ${{ matrix.go-version }}
-          create: 'true'
+# name: Create CI cache
+
+# on:
+#   workflow_dispatch:
+#   push:
+#     branches:
+#       - main
+#   schedule:
+#     # Run every day at 10:00 UTC / 03:00 PST
+#     - cron: '0 10 * * *'
+
+# 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:
+#   cache:
+#     strategy:
+#       fail-fast: false
+#       matrix:
+#         os:
+#           - ubuntu-latest
+#           - windows-latest
+#           - macos-latest
+#         go-version:
+#           - '>=1.25.0'
+
+#     runs-on: ${{ matrix.os }}
+
+#     steps:
+#       - run: git config --system core.longpaths true
+#         if: ${{ matrix.os == 'windows-latest' }}
+
+#       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+#         with:
+#           submodules: true
+#       - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+#       - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
+
+#       - uses: ./.github/actions/setup-go
+#         with:
+#           go-version: ${{ matrix.go-version }}
+#           create: 'true'

NOTICE.txt

@@ -221,7 +221,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 ---------------------------------------------------------
 
-github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b - BSD-3-Clause
+github.com/go-json-experiment/json v0.0.0-20250910080747-cc2cfa0554c3 - BSD-3-Clause
 
 
 Copyright 2010 The Go Authors

_extension/package.json

@@ -106,7 +106,7 @@
     },
     "devDependencies": {
         "@types/vscode": "^1.100.0",
-        "@vscode/vsce": "^3.6.0",
-        "esbuild": "^0.25.8"
+        "@vscode/vsce": "^3.6.2",
+        "esbuild": "^0.25.10"
     }
 }

_packages/api/src/node.ts

@@ -544,7 +544,6 @@ export class RemoteNode extends RemoteNodeBase implements Node {
     get isTypeOnly(): boolean | undefined {
         switch (this.kind) {
             case SyntaxKind.ImportSpecifier:
-            case SyntaxKind.ImportClause:
             case SyntaxKind.ExportSpecifier:
             case SyntaxKind.ImportEqualsDeclaration:
             case SyntaxKind.ExportDeclaration:
@@ -921,6 +920,18 @@ export class RemoteNode extends RemoteNodeBase implements Node {
         }
     }
 
+    get phaseModifier(): SyntaxKind {
+        switch (this.kind) {
+            case SyntaxKind.ImportClause:
+                const flags = (this.data & (1 << 24 | 1 << 25)) >> 24;
+                if (flags & 1) return SyntaxKind.TypeKeyword;
+                if (flags & 2) return SyntaxKind.DeferKeyword;
+                // fallthrough
+            default:
+                return SyntaxKind.Unknown;
+        }
+    }
+
     get token(): SyntaxKind | undefined {
         switch (this.kind) {
             case SyntaxKind.ImportAttributes:

_packages/ast/src/nodes.ts

@@ -1992,11 +1992,16 @@ export type NamedExportBindings =
 export interface ImportClause extends NamedDeclaration {
     readonly kind: SyntaxKind.ImportClause;
     readonly parent: ImportDeclaration | JSDocImportTag;
-    readonly isTypeOnly: boolean;
+    readonly phaseModifier: ImportPhaseModifierSyntaxKind;
     readonly name?: Identifier; // Default binding
     readonly namedBindings?: NamedImportBindings;
 }
 
+export type ImportPhaseModifierSyntaxKind =
+    | SyntaxKind.Unknown
+    | SyntaxKind.TypeKeyword
+    | SyntaxKind.DeferKeyword;
+
 /** @deprecated */
 export type AssertionKey = ImportAttributeName;
 

_packages/ast/src/syntaxKind.enum.ts

@@ -165,6 +165,7 @@ export enum SyntaxKind {
     BigIntKeyword,
     OverrideKeyword,
     OfKeyword,
+    DeferKeyword,
     QualifiedName,
     ComputedPropertyName,
     TypeParameter,