From b572688d1fd4b026db66c0c945ab3c7ae3b8dbfa Mon Sep 17 00:00:00 2001 From: Chad Norvell Date: Mon, 12 Aug 2024 23:43:54 +0000 Subject: [PATCH] pw_ide: Disable Bazelisk auto-activation by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The terminal "activation" process just sends text to the terminal, ending with `\n\r` to "execute" it. This is fine for launching general purpose terminals and for non-interactive tasks, but for interactive tasks this interferes with user input. Fixes: b/358384211 Change-Id: Ic7a381443f1c7b1989a5f20ed8a8f5cd5684ceb0 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/228493 Lint: Lint 🤖 Presubmit-Verified: CQ Bot Account Reviewed-by: Keir Mierle Reviewed-by: Amit Uttamchandani Commit-Queue: Auto-Submit Pigweed-Auto-Submit: Chad Norvell --- pw_ide/ts/pigweed-vscode/CHANGELOG.md | 6 ++++++ pw_ide/ts/pigweed-vscode/package-lock.json | 4 ++-- pw_ide/ts/pigweed-vscode/package.json | 4 ++-- pw_ide/ts/pigweed-vscode/src/settings.ts | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pw_ide/ts/pigweed-vscode/CHANGELOG.md b/pw_ide/ts/pigweed-vscode/CHANGELOG.md index 929f432e9b..58f8278714 100644 --- a/pw_ide/ts/pigweed-vscode/CHANGELOG.md +++ b/pw_ide/ts/pigweed-vscode/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## [1.3.3] + +- The `pigweed.activateBazeliskInNewTerminals` option has been set to a default + of `false` because, as currently implemented, this feature interferes with + interactive tasks like flashing scripts and `pw_console`. + ## [1.3.2] - When you manually run `Pigweed: Refresh Compile Commands`, we now show a diff --git a/pw_ide/ts/pigweed-vscode/package-lock.json b/pw_ide/ts/pigweed-vscode/package-lock.json index 38d45dc9c1..7b117e9502 100644 --- a/pw_ide/ts/pigweed-vscode/package-lock.json +++ b/pw_ide/ts/pigweed-vscode/package-lock.json @@ -1,12 +1,12 @@ { "name": "pigweed", - "version": "1.3.2", + "version": "1.3.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pigweed", - "version": "1.3.2", + "version": "1.3.3", "license": "Apache-2.0", "dependencies": { "@bazel/bazelisk": "^1.19.0", diff --git a/pw_ide/ts/pigweed-vscode/package.json b/pw_ide/ts/pigweed-vscode/package.json index 477b0effd6..c372cb2bff 100644 --- a/pw_ide/ts/pigweed-vscode/package.json +++ b/pw_ide/ts/pigweed-vscode/package.json @@ -8,7 +8,7 @@ "type": "git", "url": "https://pigweed.googlesource.com/pigweed/pigweed" }, - "version": "1.3.2", + "version": "1.3.3", "license": "Apache-2.0", "engines": { "vscode": "^1.75.0" @@ -89,7 +89,7 @@ "properties": { "pigweed.activateBazeliskInNewTerminals": { "type": "boolean", - "default": "true", + "default": "false", "description": "When enabled, the path to Bazelisk will be added to the integrated terminal when launched" }, "pigweed.codeAnalysisTarget": { diff --git a/pw_ide/ts/pigweed-vscode/src/settings.ts b/pw_ide/ts/pigweed-vscode/src/settings.ts index 480b92a9ee..cd87ca3cc5 100644 --- a/pw_ide/ts/pigweed-vscode/src/settings.ts +++ b/pw_ide/ts/pigweed-vscode/src/settings.ts @@ -124,7 +124,7 @@ function activateBazeliskInNewTerminals( value?: boolean, ): boolean | undefined | Thenable { const { get, update } = boolSettingFor('activateBazeliskInNewTerminals'); - if (value === undefined) return get() ?? true; + if (value === undefined) return get() ?? false; return update(value); }