fix

ttak0422 · Jul 28, 2024 · 3177c5d · 3177c5d
1 parent 30ab559
commit 3177c5d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/fnl/hook-cmdline.fnl b/fnl/hook-cmdline.fnl
@@ -1,3 +1,5 @@
+(local cabbrev_path args.cabbrev_path)
+
 (let [cmd vim.api.nvim_create_user_command]
   (cmd :SearchToQf (fn [opts]
                      (let [command (if opts.bang :vimgrepadd :vimgrep)
@@ -27,6 +29,4 @@
   (each [_ k (ipairs N)]
     (vim.keymap.set :n (. k 1) (. k 2) (or (. k 3) opts))))
 
-(vim.cmd "
-  cabbrev <expr> r getcmdtype() .. getcmdline() ==# ':r' ? [getchar(), ''][1] .. '%s//g<Left><Left>' : (getcmdline() ==# ''<,'>r' ?  [getchar(), ''][1] .. 's//g<Left><Left>' : 'r')
-")
+(vim.cmd (.. "source " cabbrev_path))
diff --git a/lua/autogen/hook-cmdline.lua b/lua/autogen/hook-cmdline.lua
diff --git a/main/hook.nix b/main/hook.nix
@@ -17,7 +17,12 @@ with pkgs.vimPlugins;
     hooks.userEvents = [ "SpecificFileEnter" ];
   };
   hookCmdline = {
-    postConfig = read ../lua/autogen/hook-cmdline.lua;
+    postConfig = {
+      code = read ../lua/autogen/hook-cmdline.lua;
+      args = {
+        cabbrev_path = ../vim/cabbrev.vim;
+      };
+    };
     hooks.events = [ "CmdlineEnter" ];
   };
   hookEdit = {

diff --git a/vim/cabbrev.vim b/vim/cabbrev.vim
@@ -0,0 +1 @@
+cabbrev <expr> r getcmdtype() .. getcmdline() ==# ":r" ? [getchar(), ""][1] .. "%s//g<Left><Left>" : (getcmdline() ==# "'<,'>r" ?  [getchar(), ""][1] .. "s//g<Left><Left>" : "r")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		cabbrev <expr> r getcmdtype() .. getcmdline() ==# ":r" ? [getchar(), ""][1] .. "%s//g<Left><Left>" : (getcmdline() ==# "'<,'>r" ? [getchar(), ""][1] .. "s//g<Left><Left>" : "r")