Skip to content

Commit 8281d9b

Browse files
committed
fix(shell): Add shellcheck SC2329 disable directives
- Add SC2329 to bash-preexec.sh __bp_adjust_histcontrol function - Add SC2329 disable before override function in shell integration generator - Add cfg_attr to suppress dead_code warning on Windows for list_profiles_blocking - Regenerate test snapshots with updated shellcheck directives SC2329 warns about functions defined after being called, which is intentional in our bash-preexec override pattern. 🤖 Assisted by Amazon Q Developer
1 parent 56f2180 commit 8281d9b

File tree

7 files changed

+16
-9
lines changed

7 files changed

+16
-9
lines changed

crates/chat-cli/src/cli/chat/context.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ impl ContextManager {
251251
///
252252
/// # Returns
253253
/// A Result containing a vector of profile names, with "default" always first
254+
#[cfg_attr(target_os = "windows", allow(dead_code))]
254255
pub fn list_profiles_blocking(&self, os: &Os) -> Result<Vec<String>> {
255256
let _ = self;
256257

crates/fig_integrations/src/shell/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ impl ShellExt for Shell {
198198
include_str!("scripts/bash-preexec.sh"),
199199
"}\n",
200200
"__fig_source_bash_preexec\n",
201+
"# shellcheck disable=SC2329\n",
201202
"function __bp_adjust_histcontrol() { :; }\n",
202203
include_str!("scripts/pre.sh")
203204
)
@@ -208,6 +209,7 @@ impl ShellExt for Shell {
208209
include_str!("scripts/bash-preexec.sh"),
209210
"}\n",
210211
"__fig_source_bash_preexec\n",
212+
"# shellcheck disable=SC2329\n",
211213
"function __bp_adjust_histcontrol() { :; }\n",
212214
include_str!("scripts/post.bash")
213215
)

crates/fig_integrations/src/shell/scripts/bash-preexec.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ __bp_require_not_readonly() {
8888
# Remove ignorespace and or replace ignoreboth from HISTCONTROL
8989
# so we can accurately invoke preexec with a command from our
9090
# history even if it starts with a space.
91-
# shellcheck disable=SC2317
91+
# shellcheck disable=SC2317,SC2329
9292
__bp_adjust_histcontrol() {
9393
local histcontrol
9494
histcontrol="${HISTCONTROL:-}"

crates/q_cli/tests/snapshots/init__init_snapshot_bash_post_bash_profile.snap

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
source: q_cli/tests/init.rs
2+
source: crates/q_cli/tests/init.rs
33
expression: init
44
---
55
Q_SHELL="/bin/zsh"
@@ -94,7 +94,7 @@ __bp_require_not_readonly() {
9494
# Remove ignorespace and or replace ignoreboth from HISTCONTROL
9595
# so we can accurately invoke preexec with a command from our
9696
# history even if it starts with a space.
97-
# shellcheck disable=SC2317
97+
# shellcheck disable=SC2317,SC2329
9898
__bp_adjust_histcontrol() {
9999
local histcontrol
100100
histcontrol="${HISTCONTROL:-}"
@@ -387,6 +387,7 @@ if [[ -z "${__bp_delay_install:-}" ]]; then
387387
fi;
388388
}
389389
__fig_source_bash_preexec
390+
# shellcheck disable=SC2329
390391
function __bp_adjust_histcontrol() { :; }
391392
if [[ -n "${BASH:-}" ]]; then
392393

crates/q_cli/tests/snapshots/init__init_snapshot_bash_post_bashrc.snap

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
source: q_cli/tests/init.rs
2+
source: crates/q_cli/tests/init.rs
33
expression: init
44
---
55
Q_SHELL="/bin/zsh"
@@ -94,7 +94,7 @@ __bp_require_not_readonly() {
9494
# Remove ignorespace and or replace ignoreboth from HISTCONTROL
9595
# so we can accurately invoke preexec with a command from our
9696
# history even if it starts with a space.
97-
# shellcheck disable=SC2317
97+
# shellcheck disable=SC2317,SC2329
9898
__bp_adjust_histcontrol() {
9999
local histcontrol
100100
histcontrol="${HISTCONTROL:-}"
@@ -387,6 +387,7 @@ if [[ -z "${__bp_delay_install:-}" ]]; then
387387
fi;
388388
}
389389
__fig_source_bash_preexec
390+
# shellcheck disable=SC2329
390391
function __bp_adjust_histcontrol() { :; }
391392
if [[ -n "${BASH:-}" ]]; then
392393

crates/q_cli/tests/snapshots/init__init_snapshot_bash_pre_bash_profile.snap

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
source: q_cli/tests/init.rs
2+
source: crates/q_cli/tests/init.rs
33
expression: init
44
---
55
Q_SHELL="/bin/zsh"
@@ -95,7 +95,7 @@ __bp_require_not_readonly() {
9595
# Remove ignorespace and or replace ignoreboth from HISTCONTROL
9696
# so we can accurately invoke preexec with a command from our
9797
# history even if it starts with a space.
98-
# shellcheck disable=SC2317
98+
# shellcheck disable=SC2317,SC2329
9999
__bp_adjust_histcontrol() {
100100
local histcontrol
101101
histcontrol="${HISTCONTROL:-}"
@@ -388,6 +388,7 @@ if [[ -z "${__bp_delay_install:-}" ]]; then
388388
fi;
389389
}
390390
__fig_source_bash_preexec
391+
# shellcheck disable=SC2329
391392
function __bp_adjust_histcontrol() { :; }
392393
#!/usr/bin/env bash
393394

crates/q_cli/tests/snapshots/init__init_snapshot_bash_pre_bashrc.snap

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
source: q_cli/tests/init.rs
2+
source: crates/q_cli/tests/init.rs
33
expression: init
44
---
55
Q_SHELL="/bin/zsh"
@@ -95,7 +95,7 @@ __bp_require_not_readonly() {
9595
# Remove ignorespace and or replace ignoreboth from HISTCONTROL
9696
# so we can accurately invoke preexec with a command from our
9797
# history even if it starts with a space.
98-
# shellcheck disable=SC2317
98+
# shellcheck disable=SC2317,SC2329
9999
__bp_adjust_histcontrol() {
100100
local histcontrol
101101
histcontrol="${HISTCONTROL:-}"
@@ -388,6 +388,7 @@ if [[ -z "${__bp_delay_install:-}" ]]; then
388388
fi;
389389
}
390390
__fig_source_bash_preexec
391+
# shellcheck disable=SC2329
391392
function __bp_adjust_histcontrol() { :; }
392393
#!/usr/bin/env bash
393394

0 commit comments

Comments
 (0)