add fixes I forgot to commit

KnorrFG · Nov 19, 2023 · 513fa04 · 513fa04
1 parent d61c144
commit 513fa04
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/core.rs b/src/core.rs
@@ -11,7 +11,7 @@ use std::process::Stdio;
 use std::{fs, io};
 
 use crate::outproxy::OutProxy;
-use crate::parser::{self, CommandSetting, Menu, Node, ShellDef, SnippetTable};
+use crate::parser::{self, CommandSetting, Menu, Node, SnippetTable};
 use crate::rt_conf;
 
 #[derive(Debug, Clone)]

diff --git a/src/parser.rs b/src/parser.rs
@@ -67,7 +67,7 @@ pub enum StringExprElem {
     String(String),
 }
 
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Clone)]
 pub struct Settings {
     pub shell_def: Option<ShellDef>,
     pub echo_by_default: bool,
@@ -101,6 +101,15 @@ impl INext for Pair<'_, Rule> {
     }
 }
 
+impl Default for Settings {
+    fn default() -> Self {
+        Settings {
+            shell_def: None,
+            echo_by_default: true,
+        }
+    }
+}
+
 fn from_string(p: Pair<'_, Rule>) -> String {
     p.nnext(2).as_str().to_string()
 }
@@ -123,7 +132,7 @@ pub fn parse(src: &str) -> Result<Config> {
     })
 }
 
-fn parse_settings<'a>(mut entries: Pairs<'a, Rule>) -> (Settings, Pairs<'a, Rule>) {
+fn parse_settings(mut entries: Pairs<Rule>) -> (Settings, Pairs<Rule>) {
     let mut res = Settings::default();
     debug!("Parsing settings: \n{entries:?}");
     while let Some(first_entry) = entries.peek() {
@@ -622,7 +631,7 @@ Config {
     },
     settings: Settings {
         shell_def: None,
-        echo_by_default: false,
+        echo_by_default: true,
     },
     snippet_table: {},
 }
@@ -696,7 +705,7 @@ Ok(
         },
         settings: Settings {
             shell_def: None,
-            echo_by_default: false,
+            echo_by_default: true,
         },
         snippet_table: {},
     },
@@ -748,7 +757,7 @@ Config {
     },
     settings: Settings {
         shell_def: None,
-        echo_by_default: false,
+        echo_by_default: true,
     },
     snippet_table: {},
 }
@@ -802,7 +811,7 @@ Config {
     },
     settings: Settings {
         shell_def: None,
-        echo_by_default: false,
+        echo_by_default: true,
     },
     snippet_table: {},
 }
@@ -846,7 +855,7 @@ Config {
     },
     settings: Settings {
         shell_def: None,
-        echo_by_default: false,
+        echo_by_default: true,
     },
     snippet_table: {},
 }
@@ -891,7 +900,7 @@ Config {
     },
     settings: Settings {
         shell_def: None,
-        echo_by_default: false,
+        echo_by_default: true,
     },
     snippet_table: {},
 }

diff --git a/tests/bash_tests/arg_test.out b/tests/bash_tests/arg_test.out
@@ -1,4 +1,8 @@
-[?25l[?25halpha beta gamma
-[?25l[?25h[1A[2K[1B[1Aalpha beta lala
-[?25l[?25h[1A[2K[1B[1Aalpha beta foo
-[?25l[?25h[3A[2K[1B[2K[1B[2K[1B[3Afoo
+[?25l[?25hecho $a $b $c
+alpha beta gamma
+[?25l[?25h[1A[2K[1B[1Aecho $a $b $c
+alpha beta lala
+[?25l[?25h[1A[2K[1B[1Aecho $a $b $c
+alpha beta foo
+[?25l[?25h[3A[2K[1B[2K[1B[2K[1B[3Aecho $a $b $c
+foo

diff --git a/tests/bash_tests/echo_setting_on.dt b/tests/bash_tests/echo_setting_on.dt
@@ -1,5 +1,3 @@
-echo on
-
 menu root {
 	y: "echo show me"
 	n: @"echo don\'t show me"

diff --git a/tests/bash_tests/string_test.dt b/tests/bash_tests/string_test.dt
@@ -1,3 +1,5 @@
+echo off
+
 snippet vars = !"
 FOO="foo"	
 "!