Fix configuration lookups and prefer saving as js/ts (#4054)

Author: DanielRosenwasser

_extension/src/commands.ts

@@ -7,7 +7,10 @@ import type {
 } from "vscode-languageclient";
 
 import type * as tr from "./telemetryReporting";
-import { restartExtHostOnChangeIfNeeded } from "./util";
+import {
+    getExplicitConfigTarget,
+    restartExtHostOnChangeIfNeeded,
+} from "./util";
 
 export function registerEnablementCommands(context: vscode.ExtensionContext, telemetryReporter: tr.TelemetryReporter): void {
     context.subscriptions.push(vscode.commands.registerCommand("typescript.native-preview.enable", () => {
@@ -28,34 +31,34 @@ export function registerEnablementCommands(context: vscode.ExtensionContext, tel
  * Handles both `js/ts.experimental.useTsgo` and `typescript.experimental.useTsgo`.
  */
 export async function updateUseTsgoSetting(enable: boolean): Promise<void> {
-    const tsConfig = vscode.workspace.getConfiguration("typescript");
     const jsTsConfig = vscode.workspace.getConfiguration("js/ts");
+    const tsConfig = vscode.workspace.getConfiguration("typescript");
 
-    const tsTarget = getExplicitConfigTarget(tsConfig, "experimental.useTsgo");
     const jsTsTarget = getExplicitConfigTarget(jsTsConfig, "experimental.useTsgo");
+    const tsTarget = getExplicitConfigTarget(tsConfig, "experimental.useTsgo");
 
-    const updates: Thenable<void>[] = [];
-    if (jsTsTarget !== undefined) {
-        updates.push(jsTsConfig.update("experimental.useTsgo", enable, jsTsTarget));
-    }
-    if (tsTarget !== undefined || jsTsTarget === undefined) {
-        updates.push(tsConfig.update("experimental.useTsgo", enable, tsTarget ?? vscode.ConfigurationTarget.Global));
-    }
-    await Promise.all(updates);
+    // If any are defined, we'll use the most-specific target,
+    // but we'll only set it through `js/ts`.
+    if (jsTsTarget !== undefined || tsTarget !== undefined) {
+        const updates = [];
 
-    await restartExtHostOnChangeIfNeeded();
-}
+        const mostSpecificTarget = Math.max(
+            jsTsTarget ?? vscode.ConfigurationTarget.Global,
+            tsTarget ?? vscode.ConfigurationTarget.Global,
+        );
+        updates.push(jsTsConfig.update("experimental.useTsgo", enable, mostSpecificTarget));
+
+        // If `typescript` had the most-specific target
+        // (or shared the most-specific target), then
+        // we'll erase that since we've just set `js/ts` above.
+        if (tsTarget === mostSpecificTarget) {
+            updates.push(tsConfig.update("experimental.useTsgo", undefined, mostSpecificTarget));
+        }
+
+        await Promise.all(updates);
+    }
 
-function getExplicitConfigTarget(
-    config: vscode.WorkspaceConfiguration,
-    key: string,
-): vscode.ConfigurationTarget | undefined {
-    const inspection = config.inspect(key);
-    if (!inspection) return undefined;
-    if (inspection.workspaceFolderValue !== undefined) return vscode.ConfigurationTarget.WorkspaceFolder;
-    if (inspection.workspaceValue !== undefined) return vscode.ConfigurationTarget.Workspace;
-    if (inspection.globalValue !== undefined) return vscode.ConfigurationTarget.Global;
-    return undefined;
+    return restartExtHostOnChangeIfNeeded();
 }
 
 export const codeLensShowLocationsCommandName = "typescript.native-preview.codeLens.showLocations";

_extension/src/extension.ts

@@ -95,10 +95,11 @@ export async function activate(context: vscode.ExtensionContext): Promise<Extens
                     "The built-in TypeScript extension is disabled. Sync launch.json with launch.template.json to reenable.",
                     "OK",
                 );
+                return;
             }
         }
         else if (useTsgo === false) {
-            const settingName = getUseTsgoFalseSetting() ?? "typescript.experimental.useTsgo";
+            const settingName = getUseTsgoFalseSetting() ?? "js/ts.experimental.useTsgo";
             vscode.window.showWarningMessage(
                 `TypeScript Native Preview is running in development mode with "${settingName}" set to false.`,
                 "Enable Setting",
@@ -108,6 +109,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<Extens
                     vscode.commands.executeCommand("typescript.native-preview.enable");
                 }
             });
+            return;
         }
     }
     else if (useTsgo === false) {

_extension/src/util.ts

@@ -149,15 +149,34 @@ export async function restartExtHostOnChangeIfNeeded(): Promise<void> {
  *
  * Each setting key is resolved using standard VS Code precedence (workspace
  * folder > workspace > global, with language-specific overrides taking
- * priority within each scope). Returns `true` if either resolved value is
- * `true`, `false` if either is `false` (and neither is `true`), or
- * `undefined` if neither setting has been explicitly configured.
+ * priority within each scope). When both keys are explicitly configured, the
+ * value set at the most specific scope wins, and `js/ts` wins over
+ * `typescript` at the same scope. Returns `undefined` if neither setting has
+ * been explicitly configured.
  */
 export function getUseTsgo(): boolean | undefined {
     const tsValue = getExplicitUseTsgo("typescript");
     const jsTsValue = getExplicitUseTsgo("js/ts");
-    if (tsValue === true || jsTsValue === true) return true;
-    if (tsValue === false || jsTsValue === false) return false;
+
+    if (tsValue !== undefined || jsTsValue !== undefined) {
+        const jsTsTarget = getExplicitConfigTarget(vscode.workspace.getConfiguration("js/ts"), "experimental.useTsgo");
+        const tsTarget = getExplicitConfigTarget(vscode.workspace.getConfiguration("typescript"), "experimental.useTsgo");
+        const mostSpecific = Math.max(jsTsTarget ?? vscode.ConfigurationTarget.Global, tsTarget ?? vscode.ConfigurationTarget.Global);
+        return jsTsTarget === mostSpecific ? jsTsValue : tsValue;
+    }
+
+    return undefined;
+}
+
+export function getExplicitConfigTarget(
+    config: vscode.WorkspaceConfiguration,
+    key: string,
+): vscode.ConfigurationTarget | undefined {
+    const inspection = config.inspect(key);
+    if (!inspection) return undefined;
+    if (inspection.workspaceFolderValue !== undefined) return vscode.ConfigurationTarget.WorkspaceFolder;
+    if (inspection.workspaceValue !== undefined) return vscode.ConfigurationTarget.Workspace;
+    if (inspection.globalValue !== undefined) return vscode.ConfigurationTarget.Global;
     return undefined;
 }