Merge pull request RustPython#2519 from TheOnlyError/2406-parse-multiple-lines-REPL

coolreader18 · web-flow · commit 163cd1953377 · 2021-03-25T08:04:07.000-05:00
2406 parse multiple lines REPL
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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"
diff --git a/src/shell/helper.rs b/src/shell/helper.rs
@@ -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<'_> {}
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -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 }
diff --git a/vm/src/readline.rs b/vm/src/readline.rs
@@ -68,27 +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(),
             );
-            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 }
         }

Original file line number	Diff line number	Diff line change
`@@ -163,8 +163,9 @@ cfg_if::cfg_if! {`
`163`	`163`	`.unwrap_or_else(\|\| (line.len(), vec!["\t".to_owned()])))`
`164`	`164`	`}`
`165`	`165`	`}`
`166`		`-`
`167`		`- impl Hinter for ShellHelper<'_> {}`
	`166`	`+ impl Hinter for ShellHelper<'_> {`
	`167`	`+ type Hint = String;`
	`168`	`+ }`
`168`	`169`	`impl Highlighter for ShellHelper<'_> {}`
`169`	`170`	`impl Validator for ShellHelper<'_> {}`
`170`	`171`	`impl Helper for ShellHelper<'_> {}`