From 0e5f4d88c58e6c3c81b13368f087fde9e2696b99 Mon Sep 17 00:00:00 2001 From: Darren Schroeder <343840+fdncred@users.noreply.github.com> Date: Thu, 10 Feb 2022 15:22:39 -0600 Subject: [PATCH] turn down the volume a little bit (#4412) --- src/reedline_config.rs | 50 ++---------------------------------- src/repl.rs | 58 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 56 insertions(+), 52 deletions(-) diff --git a/src/reedline_config.rs b/src/reedline_config.rs index 135377467..8fac3046b 100644 --- a/src/reedline_config.rs +++ b/src/reedline_config.rs @@ -1,6 +1,4 @@ -use crate::is_perf_true; use crossterm::event::{KeyCode, KeyModifiers}; -use log::info; use nu_color_config::lookup_ansi_color_style; use nu_protocol::{extract_value, Config, ParsedKeybinding, ShellError, Span, Type, Value}; use reedline::{ @@ -66,12 +64,7 @@ pub(crate) fn add_completion_menu(line_editor: Reedline, config: &Config) -> Ree None => completion_menu, }; - let ret_val = line_editor.with_menu(Box::new(completion_menu)); - if is_perf_true() { - info!("add_completion_menu {}:{}:{}", file!(), line!(), column!()); - } - - ret_val + line_editor.with_menu(Box::new(completion_menu)) } // Creates an input object for the history menu based on the dictionary @@ -127,12 +120,7 @@ pub(crate) fn add_history_menu(line_editor: Reedline, config: &Config) -> Reedli None => history_menu, }; - let ret_val = line_editor.with_menu(Box::new(history_menu)); - if is_perf_true() { - info!("add_history_menu {}:{}:{}", file!(), line!(), column!()); - } - - ret_val + line_editor.with_menu(Box::new(history_menu)) } fn add_menu_keybindings(keybindings: &mut Keybindings) { @@ -165,10 +153,6 @@ fn add_menu_keybindings(keybindings: &mut Keybindings) { KeyCode::BackTab, ReedlineEvent::MenuPrevious, ); - - if is_perf_true() { - info!("add_menu_keybindings {}:{}:{}", file!(), line!(), column!()); - } } pub enum KeybindingsMode { @@ -202,15 +186,6 @@ pub(crate) fn create_keybindings(config: &Config) -> Result { @@ -228,15 +203,6 @@ pub(crate) fn create_keybindings(config: &Config) -> Result Result { @@ -423,10 +381,6 @@ fn parse_event(value: Value, config: &Config) -> Result, ShellError>>()?; - if is_perf_true() { - info!("parse_event (list) {}:{}:{}", file!(), line!(), column!()); - } - if until_found { Ok(ReedlineEvent::UntilFound(events)) } else { diff --git a/src/repl.rs b/src/repl.rs index 0cf81307d..071a6ce49 100644 --- a/src/repl.rs +++ b/src/repl.rs @@ -41,9 +41,17 @@ pub(crate) fn evaluate(engine_state: &mut EngineState) -> Result<()> { }, ); + if is_perf_true() { + info!("read_plugin_file {}:{}:{}", file!(), line!(), column!()); + } + #[cfg(feature = "plugin")] config_files::read_plugin_file(engine_state, &mut stack); + if is_perf_true() { + info!("read_config_file {}:{}:{}", file!(), line!(), column!()); + } + config_files::read_config_file(engine_state, &mut stack); let history_path = config_files::create_history_path(); @@ -66,6 +74,15 @@ pub(crate) fn evaluate(engine_state: &mut EngineState) -> Result<()> { // Ok(()) // })?; + if is_perf_true() { + info!( + "translate environment vars {}:{}:{}", + file!(), + line!(), + column!() + ); + } + // Translate environment variables from Strings to Values if let Some(e) = convert_env_values(engine_state, &stack, &config) { let working_set = StateWorkingSet::new(engine_state); @@ -82,6 +99,15 @@ pub(crate) fn evaluate(engine_state: &mut EngineState) -> Result<()> { ); loop { + if is_perf_true() { + info!( + "load config each loop {}:{}:{}", + file!(), + line!(), + column!() + ); + } + let config = match stack.get_config() { Ok(config) => config, Err(e) => { @@ -97,6 +123,10 @@ pub(crate) fn evaluate(engine_state: &mut EngineState) -> Result<()> { ctrlc.store(false, Ordering::SeqCst); } + if is_perf_true() { + info!("setup line editor {}:{}:{}", file!(), line!(), column!()); + } + let mut line_editor = Reedline::create() .into_diagnostic()? .with_highlighter(Box::new(NuHighlighter { @@ -111,14 +141,30 @@ pub(crate) fn evaluate(engine_state: &mut EngineState) -> Result<()> { .with_quick_completions(config.quick_completions) .with_ansi_colors(config.use_ansi_coloring); + if is_perf_true() { + info!("setup reedline {}:{}:{}", file!(), line!(), column!()); + } + line_editor = add_completion_menu(line_editor, &config); line_editor = add_history_menu(line_editor, &config); + if is_perf_true() { + info!("setup colors {}:{}:{}", file!(), line!(), column!()); + } //FIXME: if config.use_ansi_coloring is false then we should // turn off the hinter but I don't see any way to do that yet. let color_hm = get_color_config(&config); + if is_perf_true() { + info!( + "setup history and hinter {}:{}:{}", + file!(), + line!(), + column!() + ); + } + line_editor = if let Some(history_path) = history_path.clone() { let history = std::fs::read_to_string(&history_path); if history.is_ok() { @@ -141,6 +187,10 @@ pub(crate) fn evaluate(engine_state: &mut EngineState) -> Result<()> { line_editor }; + if is_perf_true() { + info!("setup keybindings {}:{}:{}", file!(), line!(), column!()); + } + // Changing the line editor based on the found keybindings line_editor = match reedline_config::create_keybindings(&config) { Ok(keybindings) => match keybindings { @@ -164,22 +214,22 @@ pub(crate) fn evaluate(engine_state: &mut EngineState) -> Result<()> { }; if is_perf_true() { - info!("setup line editor {}:{}:{}", file!(), line!(), column!()); + info!("prompt_update {}:{}:{}", file!(), line!(), column!()); } let prompt = prompt_update::update_prompt(&config, engine_state, &stack, &mut nu_prompt); + entry_num += 1; + if is_perf_true() { info!( - "finished prompt update {}:{}:{}", + "finished setup, starting repl {}:{}:{}", file!(), line!(), column!() ); } - entry_num += 1; - let input = line_editor.read_line(prompt); match input { Ok(Signal::Success(s)) => {