From a651ce19614a427e8ffe8a2d8fb42be4a6de06ab Mon Sep 17 00:00:00 2001 From: Jon Ross-Perkins Date: Wed, 18 Dec 2024 09:43:47 -0800 Subject: [PATCH] Fix default for Carbon Path (#4705) The extension.ts tries to provide a default, but it's not working the way I expect. So in addition, provide it in properties, which seems to work better. --- utils/vscode/package-lock.json | 4 ++-- utils/vscode/package.json | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/utils/vscode/package-lock.json b/utils/vscode/package-lock.json index bd71f33eaeb7..f584eb2f3a9f 100644 --- a/utils/vscode/package-lock.json +++ b/utils/vscode/package-lock.json @@ -1,12 +1,12 @@ { "name": "carbon-vscode", - "version": "0.0.3", + "version": "0.0.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "carbon-vscode", - "version": "0.0.3", + "version": "0.0.4", "dependencies": { "vscode-languageclient": "^9.0.1" }, diff --git a/utils/vscode/package.json b/utils/vscode/package.json index 5da8255e9d9a..41db15032d47 100644 --- a/utils/vscode/package.json +++ b/utils/vscode/package.json @@ -1,7 +1,7 @@ { "name": "carbon-vscode", "displayName": "Carbon Language", - "version": "0.0.3", + "version": "0.0.4", "publisher": "carbon-lang", "description": "Carbon language support for Visual Studio Code.", "repository": { @@ -42,7 +42,8 @@ "properties": { "carbon.carbonPath": { "type": "string", - "description": "The path to the 'carbon' binary." + "description": "The path to the 'carbon' binary.", + "default": "./bazel-bin/toolchain/install/run_carbon" } } }