3 files changed, 25 insertions, 9 deletions

diff --git a/alias b/alias
index 6b7ca7b..2046d75 100644
--- a/alias
+++ b/alias
@@ -54,17 +54,12 @@ fi
 alias vu='vim -u NONE'
 alias vr='vim -R'
 # Edit last file
-alias vl="vim -c 'norm '"
+alias vl="vim -c 'norm '"
 # Use Telescope to select recent files
-vll() {
-  nvim -c 'Telescope oldfiles'
-}
+vll() { nvim -c 'Telescope oldfiles'; }
 # Apply defaut session
 alias vS="vim -S /tmp/vim.session"
-#alias vl="vim $(sed -n '/^[^#]/{p;q}' ~/.vim_mru_files)"
-alias ve="vim ~/helper/vim/init.vim"
-alias vq='vim ~/buffer'
-alias cdv='cd ~/.vim/vim-init'
+alias cdv='cd ~/.config/nvim'
 vs() { which $1 && vim $(which $1); }
 [ "$shell" = zsh ] && compdef vs=which
 alias vim.dos2unix="vim '+set ff=unix' '+x'"
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index 3c3ebc8..68103a1 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -11,6 +11,7 @@
 "   - MANAGE_BUFFERS
 "   - SURROURD_WITH_CHAR
 "   - REDIRECTION_WITH_BUFFER
+"   - QUICK_SUBSTITUTE
 "   - 终端支持
 "   - 编译运行
 "   - 符号搜索
@@ -262,6 +263,7 @@ noremap <leader><leader>fm :set foldmethod=
 let g:lastbuffer = 1
 au BufLeave * let g:lastbuffer = bufnr()
 
+
 "----------------------------------------------------------------------
 " SURROURD_WITH_CHAR
 "----------------------------------------------------------------------
@@ -305,6 +307,26 @@ endfunction
 command! -nargs=1 -complete=command Redir silent call Redir(<q-args>)
 nnoremap <leader>rr :Redir
 
+
+"----------------------------------------------------------------------
+" QUICK_SUBSTITUTE
+"----------------------------------------------------------------------
+function! IsSubstituteTextSelected()
+  execute "norm \<ESC>"
+  " Get position of the first/last char
+  echo col("'<") col("'>") len(getline('.'))+1
+  return col("'<") != 1 || col("'>") != len(getline('.')) + 1
+endfunction
+function! SelectAreaOrDoSubstitute()
+  if IsSubstituteTextSelected()
+    call feedkeys('gv"aygv*NVL')
+  else
+    call feedkeys("gv:s//\<C-R>a/g\<Left>\<Left>")
+  endif
+endfunction
+vnoremap <CR> <Cmd>call SelectAreaOrDoSubstitute()<CR>
+
+
 "----------------------------------------------------------------------
 " Markdown items (temproray solution)
 "----------------------------------------------------------------------
diff --git a/vim/lua/mappings.lua b/vim/lua/mappings.lua
index 3451ddf..d3cfda0 100644
--- a/vim/lua/mappings.lua
+++ b/vim/lua/mappings.lua
@@ -25,7 +25,6 @@ vim.keymap.set("n", "<leader>ds", vim.diagnostic.setloclist, { desc = "lsp diagn
 
 -- nvimtree
 vim.keymap.set("n", "<C-n>", "<cmd>NvimTreeToggle<CR>", { desc = "nvimtree toggle window" })
-vim.keymap.set("n", "<leader>nf", "<cmd>NvimTreeFocus<CR>", { desc = "nvimtree focus window" })
 
 -- telescope
 vim.keymap.set("n", "<leader>f", "<cmd>Telescope oldfiles<CR>", { desc = "telescope find oldfiles" })