Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions crates/bashkit/src/parser/lexer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,19 @@ impl<'a> Lexer<'a> {
continue;
}
}
// Handle $(...) inside double-quoted word segments
// to preserve single-quoted strings within command substitutions
if c == '$' && quote_char == '"' {
word.push(c);
self.advance();
if self.peek_char() == Some('(') {
word.push('(');
self.advance();
self.read_command_subst_into(&mut word);
continue;
}
continue;
}
word.push(c);
self.advance();
}
Expand Down
34 changes: 34 additions & 0 deletions crates/bashkit/tests/cmdsub_quote_test.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
//! Test for issue #803: single-quoted strings inside $() lose double quotes

use bashkit::Bash;

#[tokio::test]
async fn cmdsub_preserves_double_quotes_in_single_quotes() {
let mut bash = Bash::new();
let result = bash
.exec(r#"x="$(echo '{"a":1}')"; echo "${x}""#)
.await
.unwrap();
assert_eq!(result.stdout.trim(), r#"{"a":1}"#);
}

#[tokio::test]
async fn cmdsub_preserves_double_quotes_simple() {
let mut bash = Bash::new();
let result = bash
.exec(r#"y="$(echo 'say "hello" please')"; echo "${y}""#)
.await
.unwrap();
assert_eq!(result.stdout.trim(), r#"say "hello" please"#);
}

/// Without outer double quotes, $() preserves double quotes correctly
#[tokio::test]
async fn cmdsub_without_outer_quotes_works() {
let mut bash = Bash::new();
let result = bash
.exec(r#"x=$(echo '{"a":1}'); echo "$x""#)
.await
.unwrap();
assert_eq!(result.stdout.trim(), r#"{"a":1}"#);
}
Loading