1
0
mirror of https://github.com/chylex/dotfiles.git synced 2025-04-09 08:15:44 +02:00

Update .vimrc & .ideavimrc (reduce mappings interfering with select mode)

This commit is contained in:
chylex 2023-11-08 02:35:21 +01:00
parent f700848658
commit 3286d65e8d
Signed by: chylex
GPG Key ID: 4DE42C8F19A80548
2 changed files with 35 additions and 33 deletions

View File

@ -89,8 +89,8 @@ map § %
" Camel humps
noremap L [w
noremap H [b
vnoremap L ]w
vnoremap H ]b
xnoremap L ]w
xnoremap H ]b
" Navigate to end of previous word
noremap <A-b> ge
@ -116,17 +116,17 @@ nnoremap d( c[((<ESC>l
" Delete lines
nnoremap C cc
xnoremap C cc
nnoremap D dd
vnoremap C cc
vnoremap D dd
xnoremap D dd
" Enter visual block mode
noremap <Bar>v <C-V>
" Indent keeping selection
vnoremap < <gv
vnoremap > >gv
vnoremap = =gv
xnoremap < <gv
xnoremap > >gv
xnoremap = =gv
" Turn capital letters into opposite actions
" nnoremap U :redo<CR> " Handled by custom version of IdeaVim
@ -245,23 +245,23 @@ nmap mS :action NewScratchFile<CR>
" Repurpose 'm' for refactoring (normal / visual mode)
nmap mc :action IntroduceConstant<CR>
vmap mc :action IntroduceConstant<CR>
xmap mc :action IntroduceConstant<CR>
nmap mf :action IntroduceField<CR>
vmap mf :action IntroduceField<CR>
xmap mf :action IntroduceField<CR>
nmap mm :action ExtractMethod<CR>
vmap mm :action ExtractMethod<CR>
xmap mm :action ExtractMethod<CR>
nmap mM :action ExtractFunction<CR>
vmap mM :action ExtractFunction<CR>
xmap mM :action ExtractFunction<CR>
nmap mp :action IntroduceParameter<CR>
vmap mp :action IntroduceParameter<CR>
xmap mp :action IntroduceParameter<CR>
nmap mP :action IntroduceProperty<CR>
vmap mP :action IntroduceProperty<CR>
xmap mP :action IntroduceProperty<CR>
nmap mr :action Refactorings.QuickListPopupAction<CR>
vmap mr :action Refactorings.QuickListPopupAction<CR>
xmap mr :action Refactorings.QuickListPopupAction<CR>
nmap mv :action IntroduceVariable<CR>
vmap mv :action IntroduceVariable<CR>
xmap mv :action IntroduceVariable<CR>
nmap mw :action SurroundWith<CR>
vmap mw :action SurroundWith<CR>
xmap mw :action SurroundWith<CR>
" Actions for custom version of AceJump
set acejump

36
.vimrc
View File

@ -57,6 +57,18 @@ map é 0
nnoremap ú @@
noremap ů ;
map § %
sunmap §
" Camel humps (https://github.com/vim-scripts/camelcasemotion)
map L <Plug>CamelCaseMotion_w
map H <Plug>CamelCaseMotion_b
sunmap L
sunmap H
omap iL <Plug>CamelCaseMotion_iw
xmap iL <Plug>CamelCaseMotion_iw
omap iH <Plug>CamelCaseMotion_ib
xmap iH <Plug>CamelCaseMotion_ib
" Navigate to end of previous word
noremap <A-b> ge
@ -64,19 +76,9 @@ noremap <A-S-b> gE
" Navigate soft-wrapped lines
nnoremap <expr> j v:count ? 'j' : 'gj'
vnoremap <expr> j v:count ? 'j' : 'gj'
xnoremap <expr> j v:count ? 'j' : 'gj'
nnoremap <expr> k v:count ? 'k' : 'gk'
vnoremap <expr> k v:count ? 'k' : 'gk'
" Navigate camel humps (https://github.com/vim-scripts/camelcasemotion)
map L <Plug>CamelCaseMotion_w
map H <Plug>CamelCaseMotion_b
" Edit camel humps (https://github.com/vim-scripts/camelcasemotion)
omap iL <Plug>CamelCaseMotion_iw
xmap iL <Plug>CamelCaseMotion_iw
omap iH <Plug>CamelCaseMotion_ib
xmap iH <Plug>CamelCaseMotion_ib
xnoremap <expr> k v:count ? 'k' : 'gk'
" Edit from cursor to start/end of parenthesized block
nnoremap c) c])
@ -86,17 +88,17 @@ nnoremap d( c[((<ESC>l
" Delete lines
nnoremap C cc
xnoremap C cc
nnoremap D dd
vnoremap C cc
vnoremap D dd
xnoremap D dd
" Enter visual block mode
noremap <Bar>v <C-V>
" Indent keeping selection
vnoremap < <gv
vnoremap > >gv
vnoremap = =gv
xnoremap < <gv
xnoremap > >gv
xnoremap = =gv
" Turn capital letters into opposite actions
nnoremap U :redo<CR>