update rustyline

Author: Pluriscient

Cargo.lock

@@ -41,7 +41,7 @@ flame = { version = "0.2", optional = true }
 flamescope = { version = "0.1", optional = true }
 
 [target.'cfg(not(target_os = "wasi"))'.dependencies]
-rustyline = "6.0"
+rustyline = "8.0"
 
 [dev-dependencies]
 cpython = "0.5.0"

Cargo.toml

@@ -163,8 +163,9 @@ cfg_if::cfg_if! {
                     .unwrap_or_else(|| (line.len(), vec!["\t".to_owned()])))
             }
         }
-
-        impl Hinter for ShellHelper<'_> {}
+        impl Hinter for ShellHelper<'_> {
+                type Hint = String;
+        }
         impl Highlighter for ShellHelper<'_> {}
         impl Validator for ShellHelper<'_> {}
         impl Helper for ShellHelper<'_> {}

src/shell/helper.rs

@@ -122,7 +122,7 @@ uname = "0.1.1"
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 gethostname = "0.2.0"
 socket2 = "0.3.19"
-rustyline = "6.0"
+rustyline = "8.0"
 openssl = { version = "0.10.32", features = ["vendored"], optional = true }
 openssl-sys = { version = "0.9", optional = true }
 openssl-probe = { version = "0.1", optional = true }

vm/Cargo.toml

@@ -68,30 +68,21 @@ mod rustyline_readline {
     pub trait Helper: rustyline::Helper {}
     impl<T: rustyline::Helper> Helper for T {}
 
+    /// Readline: the REPL
     pub struct Readline<H: Helper> {
         repl: rustyline::Editor<H>,
     }
 
     impl<H: Helper> Readline<H> {
         pub fn new(helper: H) -> Self {
-            use rustyline::{At, Cmd, CompletionType, Config, Editor, KeyPress, Movement, Word};
+            use rustyline::*;
             let mut repl = Editor::with_config(
                 Config::builder()
                     .completion_type(CompletionType::List)
                     .tab_stop(8)
+                    .bracketed_paste(false) // multi-line paste
                     .build(),
             );
-            // Parse multiple lines correctly
-            repl.bind_sequence(KeyPress::BracketedPasteStart, Cmd::Noop);
-
-            repl.bind_sequence(
-                KeyPress::ControlLeft,
-                Cmd::Move(Movement::BackwardWord(1, Word::Vi)),
-            );
-            repl.bind_sequence(
-                KeyPress::ControlRight,
-                Cmd::Move(Movement::ForwardWord(1, At::AfterEnd, Word::Vi)),
-            );
             repl.set_helper(Some(helper));
             Readline { repl }
         }
@@ -131,6 +122,48 @@ mod rustyline_readline {
             }
         }
     }
+
+    #[cfg(test)]
+    mod test_rusty_readline {
+        use super::*;
+        use rustyline::{completion::Completer, highlight::Highlighter,
+                        validate::Validator, Context, hint::Hinter};
+        use rustyline::error::ReadlineError;
+        use crate::readline::ReadlineResult::Line;
+
+        struct HelperShim {
+
+        }
+        impl rustyline::Helper for HelperShim {}
+        impl Highlighter for HelperShim {}
+        impl Validator for HelperShim {}
+        impl Completer for HelperShim {
+            type Candidate = String;
+
+            fn complete(
+                &self,
+                line: &str,
+                pos: usize,
+                _ctx: &Context,
+            ) -> rustyline::Result<(usize, Vec<String>)> {
+                Err(ReadlineError::Interrupted)
+            }
+        }
+        impl Hinter for HelperShim {
+            type Hint = String;
+        }
+        // impl Helper for ShellHelper<'_> {}
+        #[test]
+        fn test_multi_read_line() {
+
+            let mut repl = Readline::new(HelperShim { });
+            if let Line(line) = repl.readline("print('hello')\nprint('hello2')\n") {
+                assert_eq!(line, "print('hello')");
+            }
+
+        }
+
+    }
 }
 
 #[cfg(target_arch = "wasm32")]
@@ -159,3 +192,4 @@ impl<H: Helper> Readline<H> {
         self.0.readline(prompt)
     }
 }
+