Merge main into deno-tsgo

Author: nathanwhit

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

@@ -18,7 +18,7 @@ runs:
   steps:
     - name: Install Go
       id: install-go
-      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
         go-version: ${{ inputs.go-version }}
         cache: false
@@ -39,15 +39,15 @@ runs:
 
     - if: ${{ inputs.create != 'true' }}
       name: Restore Go modules
-      uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       with:
         key: ${{ steps.cache-info.outputs.modules-key }}
         path: |
           ~/go/pkg/mod
 
     - if: ${{ inputs.create != 'true' }}
       name: Restore Go build cache
-      uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       with:
         key: unused-key-${{ github.run_id }}
         restore-keys: ${{ steps.cache-info.outputs.build-key }}-
@@ -58,7 +58,7 @@ runs:
 
     - if: ${{ inputs.create != 'true' && inputs.lint-cache == 'true' }}
       name: Restore golangci-lint cache
-      uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       with:
         key: unused-key-${{ github.run_id }}
         restore-keys: ${{ steps.cache-info.outputs.lint-key }}-
@@ -114,15 +114,15 @@ runs:
 
     - if: ${{ inputs.create == 'true' }}
       name: Save Go modules
-      uses: actions/cache/save@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       with:
         key: ${{ steps.cache-info.outputs.modules-key }}
         path: |
           ~/go/pkg/mod
 
     - if: ${{ inputs.create == 'true' }}
       name: Save Go build cache
-      uses: actions/cache/save@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       with:
         key: ${{ steps.cache-info.outputs.build-key }}-${{ github.run_id }}
         path: |
@@ -132,7 +132,7 @@ runs:
 
     - if: ${{ inputs.create == 'true' }}
       name: Save golangci-lint cache
-      uses: actions/cache/save@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       with:
         key: ${{ steps.cache-info.outputs.lint-key }}-${{ github.run_id }}
         path: ${{ env.GOLANGCI_LINT_CACHE }}

.github/workflows/codeql.yml

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

_extension/src/client.ts

@@ -81,12 +81,12 @@ export class Client {
         };
     }
 
-    async initialize(context: vscode.ExtensionContext): Promise<void> {
+    async initialize(context: vscode.ExtensionContext): Promise<vscode.Disposable> {
         const exe = await getExe(context);
-        this.start(context, exe);
+        return this.start(context, exe);
     }
 
-    async start(context: vscode.ExtensionContext, exe: { path: string; version: string; }): Promise<void> {
+    async start(context: vscode.ExtensionContext, exe: { path: string; version: string; }): Promise<vscode.Disposable> {
         this.exe = exe;
         this.outputChannel.appendLine(`Resolved to ${this.exe.path}`);
 
@@ -119,14 +119,12 @@ export class Client {
         await this.client.start();
         vscode.commands.executeCommand("setContext", "typescript.native-preview.serverRunning", true);
         this.onStartedCallbacks.forEach(callback => callback());
-        context.subscriptions.push(
-            new vscode.Disposable(() => {
-                if (this.client) {
-                    this.client.stop();
-                }
-                vscode.commands.executeCommand("setContext", "typescript.native-preview.serverRunning", false);
-            }),
-        );
+        return new vscode.Disposable(() => {
+            if (this.client) {
+                this.client.stop();
+            }
+            vscode.commands.executeCommand("setContext", "typescript.native-preview.serverRunning", false);
+        });
     }
 
     getCurrentExe(): { path: string; version: string; } | undefined {
@@ -145,7 +143,7 @@ export class Client {
         });
     }
 
-    async restart(context: vscode.ExtensionContext): Promise<void> {
+    async restart(context: vscode.ExtensionContext): Promise<vscode.Disposable> {
         if (!this.client) {
             return Promise.reject(new Error("Language client is not initialized"));
         }
@@ -157,6 +155,7 @@ export class Client {
         }
 
         this.outputChannel.appendLine(`Restarting language server...`);
-        return this.client.restart();
+        this.client.restart();
+        return new vscode.Disposable(() => {});
     }
 }

_extension/src/commands.ts

@@ -1,7 +1,7 @@
 import * as vscode from "vscode";
 import { Client } from "./client";
 
-export function registerCommands(context: vscode.ExtensionContext, client: Client, outputChannel: vscode.OutputChannel, traceOutputChannel: vscode.OutputChannel): void {
+export function registerEnablementCommands(context: vscode.ExtensionContext): void {
     context.subscriptions.push(vscode.commands.registerCommand("typescript.native-preview.enable", () => {
         // Fire and forget, because this will restart the extension host and cause an error if we await
         updateUseTsgoSetting(true);
@@ -11,23 +11,29 @@ export function registerCommands(context: vscode.ExtensionContext, client: Clien
         // Fire and forget, because this will restart the extension host and cause an error if we await
         updateUseTsgoSetting(false);
     }));
+}
+
+export function registerLanguageCommands(context: vscode.ExtensionContext, client: Client, outputChannel: vscode.OutputChannel, traceOutputChannel: vscode.OutputChannel): vscode.Disposable[] {
+    const disposables: vscode.Disposable[] = [];
 
-    context.subscriptions.push(vscode.commands.registerCommand("typescript.native-preview.restart", () => {
+    disposables.push(vscode.commands.registerCommand("typescript.native-preview.restart", () => {
         return client.restart(context);
     }));
 
-    context.subscriptions.push(vscode.commands.registerCommand("typescript.native-preview.output.focus", () => {
+    disposables.push(vscode.commands.registerCommand("typescript.native-preview.output.focus", () => {
         outputChannel.show();
     }));
 
-    context.subscriptions.push(vscode.commands.registerCommand("typescript.native-preview.lsp-trace.focus", () => {
+    disposables.push(vscode.commands.registerCommand("typescript.native-preview.lsp-trace.focus", () => {
         traceOutputChannel.show();
     }));
 
-    context.subscriptions.push(vscode.commands.registerCommand("typescript.native-preview.selectVersion", async () => {
+    disposables.push(vscode.commands.registerCommand("typescript.native-preview.selectVersion", async () => {
     }));
 
-    context.subscriptions.push(vscode.commands.registerCommand("typescript.native-preview.showMenu", showCommands));
+    disposables.push(vscode.commands.registerCommand("typescript.native-preview.showMenu", showCommands));
+
+    return disposables;
 }
 
 /**

_extension/src/extension.ts

@@ -1,28 +1,48 @@
 import * as vscode from "vscode";
 
 import { Client } from "./client";
-import { registerCommands } from "./commands";
+import {
+    registerEnablementCommands,
+    registerLanguageCommands,
+} from "./commands";
 import { setupStatusBar } from "./statusBar";
 import { setupVersionStatusItem } from "./versionStatusItem";
 
 export async function activate(context: vscode.ExtensionContext) {
     await vscode.commands.executeCommand("setContext", "typescript.native-preview.serverRunning", false);
-
+    registerEnablementCommands(context);
     const output = vscode.window.createOutputChannel("typescript-native-preview", "log");
     const traceOutput = vscode.window.createOutputChannel("typescript-native-preview (LSP)");
-    const client = new Client(output, traceOutput);
-    registerCommands(context, client, output, traceOutput);
+    context.subscriptions.push(output, traceOutput);
 
-    context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(event => {
+    const majorVersion = parseInt(vscode.version.split(".")[0]);
+    const minorVersion = parseInt(vscode.version.split(".")[1]);
+    const needsExtHostRestartOnChange = majorVersion <= 1 && minorVersion < 105;
+    let disposeLanguageFeatures: vscode.Disposable | undefined;
+
+    context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(async event => {
         if (event.affectsConfiguration("typescript.experimental.useTsgo")) {
-            // Delay because the command to change the config setting will restart
-            // the extension host, so no need to show a message
-            setTimeout(async () => {
-                const selected = await vscode.window.showInformationMessage("TypeScript Native Preview setting has changed. Restart extensions to apply changes.", "Restart Extensions");
-                if (selected) {
-                    vscode.commands.executeCommand("workbench.action.restartExtensionHost");
+            if (needsExtHostRestartOnChange) {
+                // Delay because the command to change the config setting will restart
+                // the extension host, so no need to show a message
+                setTimeout(async () => {
+                    const selected = await vscode.window.showInformationMessage("TypeScript Native Preview setting has changed. Restart extensions to apply changes.", "Restart Extensions");
+                    if (selected) {
+                        vscode.commands.executeCommand("workbench.action.restartExtensionHost");
+                    }
+                }, 100);
+            }
+            else {
+                const useTsgo = vscode.workspace.getConfiguration("typescript").get<boolean>("experimental.useTsgo");
+                if (useTsgo) {
+                    disposeLanguageFeatures = await activateLanguageFeatures(context, output, traceOutput);
+                    context.subscriptions.push(disposeLanguageFeatures);
                 }
-            }, 100);
+                else {
+                    disposeLanguageFeatures?.dispose();
+                    disposeLanguageFeatures = undefined;
+                }
+            }
         }
     }));
 
@@ -41,10 +61,17 @@ export async function activate(context: vscode.ExtensionContext) {
         }
     }
 
-    await client.initialize(context);
-    setupStatusBar(context);
-    setupVersionStatusItem(context, client);
+    disposeLanguageFeatures = await activateLanguageFeatures(context, output, traceOutput);
+    context.subscriptions.push(disposeLanguageFeatures);
 }
 
-export async function deactivate(): Promise<void> {
+async function activateLanguageFeatures(context: vscode.ExtensionContext, output: vscode.OutputChannel, traceOutput: vscode.OutputChannel): Promise<vscode.Disposable> {
+    const disposables: vscode.Disposable[] = [];
+
+    const client = new Client(output, traceOutput);
+    disposables.push(...registerLanguageCommands(context, client, output, traceOutput));
+    disposables.push(await client.initialize(context));
+    disposables.push(setupStatusBar());
+    disposables.push(...setupVersionStatusItem(client));
+    return vscode.Disposable.from(...disposables);
 }

_extension/src/statusBar.ts

@@ -1,11 +1,11 @@
 import * as vscode from "vscode";
 
-export function setupStatusBar(context: vscode.ExtensionContext): void {
+export function setupStatusBar(): vscode.Disposable {
     const statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 100);
     statusBarItem.text = "$(beaker) tsgo";
     statusBarItem.tooltip = "TypeScript Native Preview Language Server";
     statusBarItem.command = "typescript.native-preview.showMenu";
     statusBarItem.backgroundColor = new vscode.ThemeColor("statusBarItem.warningBackground");
     statusBarItem.show();
-    context.subscriptions.push(statusBarItem);
+    return statusBarItem;
 }

_extension/src/versionStatusItem.ts

@@ -3,14 +3,15 @@ import { Client } from "./client";
 import { jsTsLanguageModes } from "./util";
 
 export function setupVersionStatusItem(
-    context: vscode.ExtensionContext,
     client: Client,
-): void {
+): vscode.Disposable[] {
     const statusItem = vscode.languages.createLanguageStatusItem("typescript.native-preview.version", jsTsLanguageModes);
     statusItem.name = "TypeScript Native Preview version";
     statusItem.detail = "TypeScript Native Preview version";
-    context.subscriptions.push(client.onStarted(() => {
-        statusItem.text = client.getCurrentExe()!.version;
-    }));
-    context.subscriptions.push(statusItem);
+    return [
+        statusItem,
+        client.onStarted(() => {
+            statusItem.text = client.getCurrentExe()!.version;
+        }),
+    ];
 }