strictre

Author: dsherret

src/parser.rs

@@ -766,6 +766,14 @@ fn parse_word_parts(
     )
   }
 
+  fn append_char(result: &mut Vec<WordPart>, c: char) {
+    if let Some(WordPart::Text(text)) = result.last_mut() {
+      text.push(c);
+    } else {
+      result.push(WordPart::Text(c.to_string()));
+    }
+  }
+
   move |input| {
     enum PendingPart<'a> {
       Char(char),
@@ -775,6 +783,7 @@ fn parse_word_parts(
       Parts(Vec<WordPart>),
     }
 
+    let original_input = input;
     let (input, parts) = many0(or7(
       or3(
         map(tag("$?"), |_| PendingPart::Variable("?")),
@@ -819,23 +828,32 @@ fn parse_word_parts(
     ))(input)?;
 
     let mut result = Vec::new();
-    for part in parts {
+    let mut parts = parts.into_iter().enumerate().peekable();
+    while let Some((i, part)) = parts.next() {
       match part {
         PendingPart::Char(c) => {
-          if let Some(WordPart::Text(text)) = result.last_mut() {
-            text.push(c);
+          append_char(&mut result, c);
+        }
+        PendingPart::Tilde => {
+          if i == 0 {
+            if matches!(parts.peek(), None | Some((_, PendingPart::Char('/'))))
+            {
+              result.push(WordPart::Tilde);
+            } else {
+              return ParseError::fail(
+                original_input,
+                "Unsupported tilde expansion.",
+              );
+            }
           } else {
-            result.push(WordPart::Text(c.to_string()));
+            append_char(&mut result, '~');
           }
         }
-        PendingPart::Tilde => result.push(WordPart::Tilde),
         PendingPart::Command(s) => result.push(WordPart::Command(s)),
         PendingPart::Variable(v) => {
-          result.push(WordPart::Variable(v.to_string()))
-        }
-        PendingPart::Parts(parts) => {
-          result.extend(parts);
+          result.push(WordPart::Variable(v.to_string()));
         }
+        PendingPart::Parts(parts) => result.extend(parts),
       }
     }
 
@@ -1435,6 +1453,25 @@ mod test {
     );
   }
 
+  #[test]
+  fn tilde_expansion() {
+    run_test(
+      parse_word_parts(ParseWordPartsMode::Unquoted),
+      r#"~test"#,
+      Err("Unsupported tilde expansion."),
+    );
+    run_test(
+      parse_word_parts(ParseWordPartsMode::Unquoted),
+      r#"~+/test"#,
+      Err("Unsupported tilde expansion."),
+    );
+    run_test(
+      parse_word_parts(ParseWordPartsMode::Unquoted),
+      r#"~/test"#,
+      Ok(vec![WordPart::Tilde, WordPart::Text("/test".to_string())]),
+    );
+  }
+
   #[test]
   fn test_parse_word() {
     run_test(parse_unquoted_word, "if", Err("Unsupported reserved word."));

tests/integration_test.rs

@@ -1431,14 +1431,24 @@ async fn paren_escapes() {
 
 #[tokio::test]
 async fn tilde_expansion() {
+  let text = concat!(
+    r"export HOME=/home/dir && echo ~/test && echo ~ && ",
+    r"echo \~ && export HOME=/test && echo ~ && ",
+    r"HOME=/nope echo ~ && ",
+    r"HOME=/nope $(echo echo ~) && ",
+    r"echo ~/sub/~/sub"
+  );
+  let text = if cfg!(windows) {
+    // windows uses a different env var
+    text.replace("HOME", "USERPROFILE")
+  } else {
+    text.to_string()
+  };
   TestBuilder::new()
-    .command(concat!(
-      r"export HOME=/home/dir && echo ~/test && echo ~ && ",
-      r"echo \~ && export HOME=/test && echo ~ && ",
-      r"HOME=/nope echo ~ && ",
-      r"HOME=/nope $(echo echo ~)"
-    ))
-    .assert_stdout("/home/dir/test\n/home/dir\n~\n/test\n/test\n/test\n")
+    .command(&text)
+    .assert_stdout(
+      "/home/dir/test\n/home/dir\n~\n/test\n/test\n/test\n/test/sub/~/sub\n",
+    )
     .run()
     .await;
 }