Fix broken neovim file paths when using fzf-lua

The issue was fixed by maintainer upstream and I update to latest commit
of the plugin.
This commit is contained in:
Daniel Siepmann 2023-03-08 15:58:46 +01:00
parent 2180d98970
commit 4761283ff7
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4
2 changed files with 12 additions and 18 deletions

View file

@ -162,6 +162,18 @@ let
];
};
# Use custom one until nixpkgs updates to that version
fzf-lua = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
pname = "fzf-lua";
version = "592ab9a26176a7f9ebd43faf91d1f5d066e0aa07";
src = pkgs.fetchFromGitHub {
owner = "ibhagwan";
repo = pname;
rev = version;
sha256 = "m1otYK3LKSRb4zGczyUwexmLuU91eZlrN1mvUCUQ66w=";
};
};
in {
enable = true;
@ -217,7 +229,6 @@ in {
plugin = fzf-lua.overrideAttrs (old: {
patches = (old.patches or []) ++ [
./neovim/patches/fzf-lua-colors.patch
./neovim/patches/fzf-lua-path.patch
];
});

View file

@ -1,17 +0,0 @@
See:
- https://github.com/ibhagwan/fzf-lua/issues/678
- https://github.com/ibhagwan/fzf-lua/pull/679
diff --git a/lua/fzf-lua/path.lua b/lua/fzf-lua/path.lua
index ff5a79b..22b3923 100644
--- a/lua/fzf-lua/path.lua
+++ b/lua/fzf-lua/path.lua
@@ -234,6 +234,7 @@ function M.entry_to_file(entry, opts, force_uri)
if cwd and #cwd > 0 and not isURI and
not M.starts_with_separator(stripped) then
stripped = M.join({ cwd, stripped })
+ stripped = M.relative(stripped, vim.fn.getcwd())
end
-- #336: force LSP jumps using 'vim.lsp.util.jump_to_location'
-- so that LSP entries are added to the tag stack