update rustyline

denoland · bartlomieju · Dec 13, 2023 · Apr 3, 2023 · Apr 6, 2023 · Apr 11, 2023
commit 6778a125645319b2ed4a117d9b1d848901a53c5b
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -132,7 +132,7 @@ rustls = "0.21.8"
 rustls-pemfile = "1.0.0"
 rustls-tokio-stream = "=0.2.16"
 rustls-webpki = "0.101.4"
-rustyline = { version = "=10.0.0", default-features = false, features = ["custom-bindings"] }
+rustyline = { version = "=13.0.0", default-features = false, features = ["custom-bindings"] }
 webpki-roots = "0.25.2"
 scopeguard = "1.2.0"
 saffron = "=0.1.0"

diff --git a/cli/tools/repl/editor.rs b/cli/tools/repl/editor.rs
@@ -341,7 +341,7 @@ impl Highlighter for EditorHelper {
     }
   }
 
-  fn highlight_char(&self, line: &str, _: usize) -> bool {
+  fn highlight_char(&self, line: &str, _: usize, _: bool) -> bool {
     !line.is_empty()
   }
 
@@ -422,7 +422,7 @@ impl Highlighter for EditorHelper {
 
 #[derive(Clone)]
 pub struct ReplEditor {
-  inner: Arc<Mutex<Editor<EditorHelper>>>,
+  inner: Arc<Mutex<Editor<EditorHelper, rustyline::history::MemHistory>>>,
   history_file_path: Option<PathBuf>,
   errored_on_history_save: Arc<AtomicBool>,
   should_exit_on_interrupt: Arc<AtomicBool>,
@@ -482,7 +482,7 @@ impl ReplEditor {
   }
 
   pub fn update_history(&self, entry: String) {
-    self.inner.lock().add_history_entry(entry);
+    let _ = self.inner.lock().add_history_entry(entry);
     if let Some(history_file_path) = &self.history_file_path {
       if let Err(e) = self.inner.lock().append_history(history_file_path) {
         if self.errored_on_history_save.load(Relaxed) {

diff --git a/runtime/ops/tty.rs b/runtime/ops/tty.rs
@@ -339,7 +339,8 @@ pub fn op_read_line_prompt(
   #[string] prompt_text: String,
   #[string] default_value: String,
 ) -> Result<Option<String>, AnyError> {
-  let mut editor = Editor::<()>::new().expect("Failed to create editor.");
+  let mut editor = Editor::<(), rustyline::history::MemHistory>::new()
+    .expect("Failed to create editor.");
 
   editor.set_keyseq_timeout(1);
   editor