Merge branch 'main' into fuzzy-underline

Author: ysthakur

Cargo.lock

@@ -71,6 +71,17 @@ impl Command for History {
                     })
                     .ok()
             }
+            // this variant should never happen, the config value is handled in the `UpdateFromValue` impl
+            #[cfg(not(feature = "sqlite"))]
+            HistoryFileFormat::Sqlite => {
+                return Err(ShellError::GenericError {
+                    error: "Could not open history reader".into(),
+                    msg: "SQLite is not supported".to_string(),
+                    span: Some(call.head),
+                    help: "Compile Nushell with `sqlite` feature".to_string().into(),
+                    inner: vec![],
+                });
+            }
             HistoryFileFormat::Plaintext => {
                 FileBackedHistory::with_file(history.max_size as usize, history_path.clone())
                     .map(|inner| {
@@ -104,6 +115,17 @@ impl Command for History {
                     history_path,
                 ))?
                 .into_pipeline_data(head, signals)),
+            // this variant should never happen, the config value is handled in the `UpdateFromValue` impl
+            #[cfg(not(feature = "sqlite"))]
+            HistoryFileFormat::Sqlite => {
+                return Err(ShellError::GenericError {
+                    error: "Could not open history reader".into(),
+                    msg: "SQLite is not supported".to_string(),
+                    span: Some(call.head),
+                    help: "Compile Nushell with `sqlite` feature".to_string().into(),
+                    inner: vec![],
+                });
+            }
             #[cfg(feature = "sqlite")]
             HistoryFileFormat::Sqlite => Ok(history_reader
                 .and_then(|h| {

crates/nu-cli/src/commands/history/history_.rs

@@ -7,7 +7,7 @@ use crate::completions::{
 use nu_color_config::{color_record_to_nustyle, lookup_ansi_color_style};
 use nu_parser::{parse, parse_module_file_or_dir};
 use nu_protocol::{
-    CommandWideCompleter, Completion, Span, Type, Value,
+    CommandWideCompleter, Completion, GetSpan, Span, Type, Value,
     ast::{
         Argument, Block, Expr, Expression, FindMapResult, ListItem, PipelineRedirection,
         RedirectionTarget, Traverse,
@@ -55,14 +55,25 @@ fn find_pipeline_element_by_position<'a>(
         Expr::ExternalCall(head, arguments) => arguments
             .iter()
             .find_map(|arg| arg.expr().find_map(working_set, &closure))
-            .or(head.as_ref().find_map(working_set, &closure))
+            .or_else(|| {
+                // For aliased external_call, the span of original external command head should fail the
+                // contains(pos) check, thus avoiding recursion into its head expression.
+                // See issue #7648 for details.
+                let span = working_set.get_span(head.span_id);
+                if span.contains(pos) {
+                    // This is for complicated external head expressions, e.g. `^(echo<tab> foo)`
+                    head.as_ref().find_map(working_set, &closure)
+                } else {
+                    None
+                }
+            })
             .or(Some(expr))
             .map(FindMapResult::Found)
             .unwrap_or_default(),
         // complete the operator
         Expr::BinaryOp(lhs, _, rhs) => lhs
             .find_map(working_set, &closure)
-            .or(rhs.find_map(working_set, &closure))
+            .or_else(|| rhs.find_map(working_set, &closure))
             .or(Some(expr))
             .map(FindMapResult::Found)
             .unwrap_or_default(),

crates/nu-cli/src/completions/completer.rs

@@ -1235,6 +1235,14 @@ fn update_line_editor_history(
             FileBackedHistory::with_file(history.max_size as usize, history_path)
                 .into_diagnostic()?,
         ),
+        // this path should not happen as the config setting is captured by `nu-protocol` already
+        #[cfg(not(feature = "sqlite"))]
+        HistoryFileFormat::Sqlite => {
+            return Err(miette::miette!(
+                help = "compile Nushell with the `sqlite` feature to use this",
+                "Unsupported history file format",
+            ));
+        }
         #[cfg(feature = "sqlite")]
         HistoryFileFormat::Sqlite => Box::new(
             SqliteBackedHistory::with_file(

crates/nu-cli/src/repl.rs

@@ -760,17 +760,13 @@ fn dotnu_completions_const_nu_lib_dirs() {
 }
 
 #[test]
-#[ignore]
 fn external_completer_trailing_space() {
     // https://github.com/nushell/nushell/issues/6378
     let block = "{|spans| $spans}";
     let input = "gh alias ";
 
     let suggestions = run_external_completion(block, input);
-    assert_eq!(3, suggestions.len());
-    assert_eq!("gh", suggestions.first().unwrap().value);
-    assert_eq!("alias", suggestions.get(1).unwrap().value);
-    assert_eq!("", suggestions.get(2).unwrap().value);
+    match_suggestions(&vec!["gh", "alias", ""], &suggestions);
 }
 
 #[test]
@@ -2640,7 +2636,6 @@ fn exact_match_case_insensitive() {
     });
 }
 
-#[ignore = "was reverted, still needs fixing"]
 #[rstest]
 fn alias_offset_bug_7648() {
     let (_, _, mut engine, mut stack) = new_engine();
@@ -2650,16 +2645,15 @@ fn alias_offset_bug_7648() {
     assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+    let suggestions = completer.complete("e", 1);
+    assert!(!suggestions.is_empty());
 
-    // Issue #7648
-    // Nushell crashes when an alias name is shorter than the alias command
-    // and the alias command is a external command
-    // This happens because of offset is not correct.
-    // This crashes before PR #7779
-    let _suggestions = completer.complete("e", 1);
+    // Make sure completion in complicated external head expression still works
+    let input = "^(ls | e";
+    let suggestions = completer.complete(input, input.len());
+    assert!(!suggestions.is_empty());
 }
 
-#[ignore = "was reverted, still needs fixing"]
 #[rstest]
 fn alias_offset_bug_7754() {
     let (_, _, mut engine, mut stack) = new_engine();
@@ -2669,12 +2663,8 @@ fn alias_offset_bug_7754() {
     assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
-
-    // Issue #7754
-    // Nushell crashes when an alias name is shorter than the alias command
-    // and the alias command contains pipes.
-    // This crashes before PR #7756
-    let _suggestions = completer.complete("ll -a | c", 9);
+    let suggestions = completer.complete("ll -a | c", 9);
+    assert!(!suggestions.is_empty());
 }
 
 #[rstest]

crates/nu-cli/tests/completions/mod.rs

@@ -25,7 +25,7 @@ impl Command for VersionCheck {
     fn signature(&self) -> Signature {
         Signature::build("version check")
             .category(Category::Platform)
-            .input_output_types(vec![(Type::Nothing, Type::String)])
+            .input_output_types(vec![(Type::Nothing, Type::record())])
     }
 
     fn examples(&self) -> Vec<Example<'_>> {

crates/nu-command/src/network/version_check.rs

@@ -51,19 +51,37 @@ impl Command for AnsiStrip {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
+        let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
         let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let config = stack.get_config(engine_state);
         let args = Arguments { cell_paths, config };
         operate(action, args, input, call.head, engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example<'_>> {
-        vec![Example {
-            description: "Strip ANSI escape sequences from a string",
-            example: r#"$'(ansi green)(ansi cursor_on)hello' | ansi strip"#,
-            result: Some(Value::test_string("hello")),
-        }]
+        vec![
+            Example {
+                description: "Strip ANSI escape sequences from a string",
+                example: r#"$'(ansi green)(ansi cursor_on)hello' | ansi strip"#,
+                result: Some(Value::test_string("hello")),
+            },
+            Example {
+                description: "Strip ANSI escape sequences from a record field",
+                example: r#"{ greeting: $'hello (ansi red)world' exclamation: false } | ansi strip greeting"#,
+                result: Some(Value::test_record(record! {
+                    "greeting" => Value::test_string("hello world"),
+                    "exclamation" => Value::test_bool(false)
+                })),
+            },
+            Example {
+                description: "Strip ANSI escape sequences from multiple table columns",
+                example: r#"[[language feature]; [$'(ansi red)rust' $'(ansi i)safety']] | ansi strip language feature"#,
+                result: Some(Value::test_list(vec![Value::test_record(record! {
+                    "language" => Value::test_string("rust"),
+                    "feature" => Value::test_string("safety")
+                })])),
+            },
+        ]
     }
 }