expand_args to variable::expand

Author: tdaron

helix-term/src/commands.rs

@@ -1,7 +1,7 @@
 pub(crate) mod dap;
-pub(crate) mod expansions;
 pub(crate) mod lsp;
 pub(crate) mod typed;
+pub(crate) mod variables;
 
 pub use dap::*;
 use futures_util::FutureExt;
@@ -252,7 +252,7 @@ impl MappableCommand {
                         scroll: None,
                     };
 
-                    match expand_args(cx.editor, args.into(), true) {
+                    match variables::expand(cx.editor, args.into(), true) {
                         Ok(args) => {
                             if let Err(err) = (command.fun)(
                                 &mut cx,
@@ -724,8 +724,6 @@ fn move_impl(cx: &mut Context, move_fn: MoveFn, dir: Direction, behaviour: Movem
 
 use helix_core::movement::{move_horizontally, move_vertically};
 
-use self::expansions::expand_args;
-
 fn move_char_left(cx: &mut Context) {
     move_impl(cx, move_horizontally, Direction::Backward, Movement::Move)
 }

helix-term/src/commands/typed.rs

@@ -4,7 +4,7 @@ use std::ops::Deref;
 
 use crate::job::Job;
 
-use super::expansions::expand_args;
+use super::variables;
 use super::*;
 
 use helix_core::fuzzy::fuzzy_match;
@@ -3122,7 +3122,7 @@ pub(super) fn command_mode(cx: &mut Context) {
             }
         }, // completion
         move |cx: &mut compositor::Context, input: &str, event: PromptEvent| {
-            match expand_args(cx.editor, input.into(), true) {
+            match variables::expand(cx.editor, input.into(), true) {
                 Ok(args) => {
                     let shellwords = Shellwords::from(args.as_ref());
                     let command = shellwords.command();

helix-term/src/commands/expansions.rs renamed to helix-term/src/commands/variables.rs

@@ -4,11 +4,7 @@ use anyhow::Result;
 use helix_core::coords_at_pos;
 use helix_view::Editor;
 
-pub fn expand_args<'a>(
-    editor: &Editor,
-    input: Cow<'a, str>,
-    expand_sh: bool,
-) -> Result<Cow<'a, str>> {
+pub fn expand<'a>(editor: &Editor, input: Cow<'a, str>, expand_sh: bool) -> Result<Cow<'a, str>> {
     let (view, doc) = current_ref!(editor);
     let shell = &editor.config().shell;
 
@@ -106,7 +102,9 @@ pub fn expand_args<'a>(
                                         .primary()
                                         .fragment(doc.text().slice(..))
                                         .to_string(),
-                                    _ => anyhow::bail!("Unknown variable"),
+                                    _ => {
+                                        anyhow::bail!("Unknown variable {}", &input[index + 2..end])
+                                    }
                                 };
 
                                 o.push_str(value.trim());
@@ -128,7 +126,7 @@ pub fn expand_args<'a>(
                                     }
 
                                     if let Some(o) = output.as_mut() {
-                                        let body = expand_args(
+                                        let body = expand(
                                             editor,
                                             Cow::Borrowed(&input[index + 4..end]),
                                             expand_sh,