From 21eb6c4c475ca57b41f2a8fc8004e97ba2ffd684 Mon Sep 17 00:00:00 2001 From: Mattia Manzati Date: Mon, 13 Jul 2026 09:22:24 +0200 Subject: [PATCH] Update setup command VS Code settings --- .changeset/modern-vscode-setup.md | 5 +++++ .../__snapshots__/setup-cli.test.ts.snap | 12 ++++++------ .../__snapshots__/setup-cli.test.ts.snap | 12 ++++++------ packages/language-service/src/cli/setup/changes.ts | 4 ++-- packages/language-service/test/setup-cli.test.ts | 4 ++-- 5 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 .changeset/modern-vscode-setup.md diff --git a/.changeset/modern-vscode-setup.md b/.changeset/modern-vscode-setup.md new file mode 100644 index 00000000..e96902c8 --- /dev/null +++ b/.changeset/modern-vscode-setup.md @@ -0,0 +1,5 @@ +--- +"@effect/language-service": patch +--- + +Update the setup command to configure VS Code with the unified `js/ts` TypeScript settings. diff --git a/packages/harness-effect-v3/__snapshots__/setup-cli.test.ts.snap b/packages/harness-effect-v3/__snapshots__/setup-cli.test.ts.snap index 1de6fe11..22a1c721 100644 --- a/packages/harness-effect-v3/__snapshots__/setup-cli.test.ts.snap +++ b/packages/harness-effect-v3/__snapshots__/setup-cli.test.ts.snap @@ -96,8 +96,8 @@ exports[`Setup CLI > should add LSP plugin alongside existing plugins > tsconfig exports[`Setup CLI > should add LSP with VS Code editor selected and configure VS Code settings > .vscode/settings.json 1`] = ` "{ - "typescript.tsdk": "./node_modules/typescript/lib", - "typescript.enablePromptUseWorkspaceTsdk": true + "js/ts.tsdk.path": "./node_modules/typescript/lib", + "js/ts.tsdk.promptToUseWorkspaceVersion": true }" `; @@ -112,7 +112,7 @@ exports[`Setup CLI > should add LSP with VS Code editor selected and configure V "file": "tsconfig.json", }, { - "description": "Add typescript.tsdk setting; Add typescript.enablePromptUseWorkspaceTsdk setting", + "description": "Add js/ts.tsdk.path setting; Add js/ts.tsdk.promptToUseWorkspaceVersion setting", "file": ".vscode/settings.json", }, ] @@ -568,8 +568,8 @@ exports[`Setup CLI > should preserve existing VSCode settings when adding LSP-sp "editor.formatOnSave": true, "editor.tabSize": 2, "files.autoSave": "onFocusChange", -"typescript.enablePromptUseWorkspaceTsdk": true, -"typescript.tsdk": "./node_modules/typescript/lib" +"js/ts.tsdk.promptToUseWorkspaceVersion": true, +"js/ts.tsdk.path": "./node_modules/typescript/lib" }" `; @@ -584,7 +584,7 @@ exports[`Setup CLI > should preserve existing VSCode settings when adding LSP-sp "file": "tsconfig.json", }, { - "description": "Add typescript.tsdk setting; Add typescript.enablePromptUseWorkspaceTsdk setting", + "description": "Add js/ts.tsdk.path setting; Add js/ts.tsdk.promptToUseWorkspaceVersion setting", "file": ".vscode/settings.json", }, ] diff --git a/packages/harness-effect-v4/__snapshots__/setup-cli.test.ts.snap b/packages/harness-effect-v4/__snapshots__/setup-cli.test.ts.snap index 1de6fe11..22a1c721 100644 --- a/packages/harness-effect-v4/__snapshots__/setup-cli.test.ts.snap +++ b/packages/harness-effect-v4/__snapshots__/setup-cli.test.ts.snap @@ -96,8 +96,8 @@ exports[`Setup CLI > should add LSP plugin alongside existing plugins > tsconfig exports[`Setup CLI > should add LSP with VS Code editor selected and configure VS Code settings > .vscode/settings.json 1`] = ` "{ - "typescript.tsdk": "./node_modules/typescript/lib", - "typescript.enablePromptUseWorkspaceTsdk": true + "js/ts.tsdk.path": "./node_modules/typescript/lib", + "js/ts.tsdk.promptToUseWorkspaceVersion": true }" `; @@ -112,7 +112,7 @@ exports[`Setup CLI > should add LSP with VS Code editor selected and configure V "file": "tsconfig.json", }, { - "description": "Add typescript.tsdk setting; Add typescript.enablePromptUseWorkspaceTsdk setting", + "description": "Add js/ts.tsdk.path setting; Add js/ts.tsdk.promptToUseWorkspaceVersion setting", "file": ".vscode/settings.json", }, ] @@ -568,8 +568,8 @@ exports[`Setup CLI > should preserve existing VSCode settings when adding LSP-sp "editor.formatOnSave": true, "editor.tabSize": 2, "files.autoSave": "onFocusChange", -"typescript.enablePromptUseWorkspaceTsdk": true, -"typescript.tsdk": "./node_modules/typescript/lib" +"js/ts.tsdk.promptToUseWorkspaceVersion": true, +"js/ts.tsdk.path": "./node_modules/typescript/lib" }" `; @@ -584,7 +584,7 @@ exports[`Setup CLI > should preserve existing VSCode settings when adding LSP-sp "file": "tsconfig.json", }, { - "description": "Add typescript.tsdk setting; Add typescript.enablePromptUseWorkspaceTsdk setting", + "description": "Add js/ts.tsdk.path setting; Add js/ts.tsdk.promptToUseWorkspaceVersion setting", "file": ".vscode/settings.json", }, ] diff --git a/packages/language-service/src/cli/setup/changes.ts b/packages/language-service/src/cli/setup/changes.ts index 7062f9a6..352f9d2c 100644 --- a/packages/language-service/src/cli/setup/changes.ts +++ b/packages/language-service/src/cli/setup/changes.ts @@ -73,8 +73,8 @@ export const computeChanges = ( if (Option.isSome(target.packageJson.lspVersion) && Option.isSome(assessment.vscodeSettings)) { const vscodeTarget: Target.VSCodeSettings = { settings: { - "typescript.tsdk": "./node_modules/typescript/lib", - "typescript.enablePromptUseWorkspaceTsdk": true + "js/ts.tsdk.path": "./node_modules/typescript/lib", + "js/ts.tsdk.promptToUseWorkspaceVersion": true } } diff --git a/packages/language-service/test/setup-cli.test.ts b/packages/language-service/test/setup-cli.test.ts index e488a8aa..4087b7a2 100644 --- a/packages/language-service/test/setup-cli.test.ts +++ b/packages/language-service/test/setup-cli.test.ts @@ -754,9 +754,9 @@ describe("Setup CLI", () => { } }, { - "typescript.tsdk": "./packages/core/node_modules/typescript/lib", + "js/ts.tsdk.path": "./packages/core/node_modules/typescript/lib", "typescript.preferences.importModuleSpecifier": "non-relative", - "typescript.enablePromptUseWorkspaceTsdk": true, + "js/ts.tsdk.promptToUseWorkspaceVersion": true, "editor.formatOnSave": true, "eslint.format.enable": true, "editor.acceptSuggestionOnCommitCharacter": true,