From d3927d8da3eb1964647380bfb5c09efb16560180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Daron?= Date: Sat, 16 Nov 2024 13:29:34 +0100 Subject: [PATCH] renaming git_repo to repo --- book/src/commands.md | 4 ++-- helix-view/src/editor/variable_expansion.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/book/src/commands.md b/book/src/commands.md index a57769757..913090713 100644 --- a/book/src/commands.md +++ b/book/src/commands.md @@ -12,10 +12,10 @@ ## Using variables in typed commands and mapped shortcuts | `%{basename}` or `%{b}` | The name and extension of the currently focused file. | | `%{dirname}` or `%{d}` | The absolute path of the parent directory of the currently focused file. | | `%{cwd}` | The absolute path of the current working directory of Helix. | -| `%{git_repo}` | The absolute path of the git repository helix is opened in. Fallback to `cwd` if not inside a git repository| +| `%{repo}` | The absolute path of the VCS repository helix is opened in. Fallback to `cwd` if not inside a VCS repository| | `%{filename}` or `%{f}` | The absolute path of the currently focused file. | | `%{filename:rel}` | The relative path of the file according to `cwd` (will give absolute path if the file is not a child of the current working directory) | -| `%{filename:git_rel}` | The relative path of the file according to `git_repo` (will give absolute path if the file is not a child of the git directory or the cwd) | +| `%{filename:repo_rel}` | The relative path of the file according to `repo` (will give absolute path if the file is not a child of the VCS directory or the cwd) | | `%{ext}` | The extension of the current file | | `%{lang}` | The language of the current file | | `%{linenumber}` | The line number where the primary cursor is positioned. | diff --git a/helix-view/src/editor/variable_expansion.rs b/helix-view/src/editor/variable_expansion.rs index ace1f1a14..9d1b5f53c 100644 --- a/helix-view/src/editor/variable_expansion.rs +++ b/helix-view/src/editor/variable_expansion.rs @@ -53,8 +53,8 @@ pub fn expand_variable_in_string<'a>(&self, input: &'a str) -> anyhow::Result { - // This will get git repo root or cwd if not inside a git repo. + "filename:repo_rel" => { + // This will get repo root or cwd if not inside a git repo. let workspace_path = helix_loader::find_workspace().0; doc.path() .and_then(|p| { @@ -80,7 +80,7 @@ pub fn expand_variable_in_string<'a>(&self, input: &'a str) -> anyhow::Result helix_loader::find_workspace() + "repo" => helix_loader::find_workspace() .0 .to_str() .unwrap_or("")