extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-16 05:23:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58 from nushell/entry_num

Browse Source 
Show entry number in error
This commit is contained in:
JT 2021-09-22 15:43:39 +12:00 committed by GitHub
commit 9f9bec38e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.rs
View File

@ -58,6 +58,7 @@ fn main() -> Result<()> {
use reedline::{DefaultPrompt, FileBackedHistory, Reedline, Signal}; use reedline::{DefaultPrompt, FileBackedHistory, Reedline, Signal};
let completer = NuCompleter::new(engine_state.clone()); let completer = NuCompleter::new(engine_state.clone());
let mut entry_num = 0;
let mut line_editor = Reedline::create() let mut line_editor = Reedline::create()
.into_diagnostic()? .into_diagnostic()?
@ -76,6 +77,8 @@ fn main() -> Result<()> {
let stack = nu_protocol::engine::Stack::new(); let stack = nu_protocol::engine::Stack::new();
loop { loop {
entry_num += 1;
let input = line_editor.read_line(&prompt); let input = line_editor.read_line(&prompt);
match input { match input {
Ok(Signal::Success(s)) => { Ok(Signal::Success(s)) => {
@ -98,8 +101,12 @@ fn main() -> Result<()> {
let (block, delta) = { let (block, delta) = {
let engine_state = engine_state.borrow(); let engine_state = engine_state.borrow();
let mut working_set = StateWorkingSet::new(&*engine_state); let mut working_set = StateWorkingSet::new(&*engine_state);
let (output, err) = let (output, err) = parse(
parse(&mut working_set, Some("<cli>"), s.as_bytes(), false); &mut working_set,
Some(&format!("entry #{}", entry_num)),
s.as_bytes(),
false,
);
if let Some(err) = err { if let Some(err) = err {
report_error(&working_set, &err); report_error(&working_set, &err);
continue; continue;