Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-09 22:49:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from Pluriscient/2406-v1.2

Browse Source 
update rustyline and attempt to add test
This commit is contained in:
TheOnlyError
2021-03-19 09:52:01 +01:00
committed by GitHub
parent 3087d48f09 29a69b8958
commit e5e251e986
5 changed files with 117 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
Cargo.lock generated
View File

@@ -653,6 +653,16 @@ dependencies = [
"dirs-sys-next",
]
[[package]]
name = "dirs-next"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
dependencies = [
"cfg-if 1.0.0",
"dirs-sys-next",
]
[[package]]
name = "dirs-sys-next"
version = "0.1.1"
@@ -703,6 +713,12 @@ version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
[[package]]
name = "endian-type"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
[[package]]
name = "env_logger"
version = "0.7.1"
@@ -825,6 +841,16 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "fs2"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
dependencies = [
"libc",
"winapi",
]
[[package]]
name = "gcc"
version = "0.3.55"
@@ -1055,9 +1081,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.81"
version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
checksum = "538c092e5586f4cdd7dd8078c4a79220e3e168880218124dcbce860f0ea938c6"
[[package]]
name = "libffi"
@@ -1200,15 +1226,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
[[package]]
name = "nix"
version = "0.18.0"
name = "nibble_vec"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055"
checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
dependencies = [
"bitflags",
"cc",
"cfg-if 0.1.10",
"libc",
"smallvec",
]
[[package]]
@@ -1223,6 +1246,18 @@ dependencies = [
"libc",
]
[[package]]
name = "nix"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
dependencies = [
"bitflags",
"cc",
"cfg-if 1.0.0",
"libc",
]
[[package]]
name = "num-bigint"
version = "0.3.1"
@@ -1580,6 +1615,16 @@ dependencies = [
"proc-macro2",
]
[[package]]
name = "radix_trie"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
dependencies = [
"endian-type",
"nibble_vec",
]
[[package]]
name = "rand"
version = "0.7.3"
@@ -1828,7 +1873,7 @@ dependencies = [
"clap",
"cpython",
"criterion",
"dirs-next",
"dirs-next 1.0.2",
"env_logger",
"flame",
"flamescope",
@@ -2081,17 +2126,21 @@ dependencies = [
[[package]]
name = "rustyline"
version = "6.3.0"
version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f0d5e7b0219a3eadd5439498525d4765c59b7c993ef0c12244865cd2d988413"
checksum = "b9e1b597fcd1eeb1d6b25b493538e5aa19629eb08932184b85fef931ba87e893"
dependencies = [
"cfg-if 0.1.10",
"dirs-next",
"bitflags",
"cfg-if 1.0.0",
"dirs-next 2.0.0",
"fs2",
"libc",
"log",
"memchr",
"nix 0.18.0",
"nix 0.20.0",
"radix_trie",
"scopeguard",
"smallvec",
"unicode-segmentation",
"unicode-width",
"utf8parse",
@@ -2254,9 +2303,9 @@ checksum = "fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7"
[[package]]
name = "smallvec"
version = "1.5.1"
version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"
checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
[[package]]
name = "socket2"

2
Cargo.toml
View File

@@ -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"

5
src/shell/helper.rs
View File

@@ -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<'_> {}

2
vm/Cargo.toml
View File

@@ -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 }

58
vm/src/readline.rs
View File

@@ -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)
}
}