Update .ideavimrc (tweak IDEA navigation bindings)

.ideavimrc

@@ -85,6 +85,10 @@ sethandler <C-Left> a:vim
 sethandler <S-Left> a:vim
 sethandler <C-Right> a:vim
 sethandler <S-Right> a:vim
+sethandler <C-Up> a:vim
+sethandler <S-Up> a:vim
+sethandler <C-Down> a:vim
+sethandler <S-Down> a:vim
 
 if &ide =~? 'rider'
   " These shortcuts are broken in Rider for some reason...
@@ -94,6 +98,7 @@ endif
 
 " Enable plugins (https://github.com/JetBrains/ideavim/wiki/IdeaVim-Plugins)
 Plug 'argtextobj.vim'
+Plug 'vim-abolish'
 Plug 'vim-exchange'
 Plug 'vim-highlightedyank'
 Plug 'vim-indent-object'
@@ -102,6 +107,7 @@ Plug 'vim-multiple-cursors'
 Plug 'vim-paragraph-motion'
 Plug 'vim-surround'
 Plug 'vim-textobj-entire'
+Plug 'vim-textobj-function'
 
 " https://vimhelp.org/index.txt.html
 
@@ -167,6 +173,21 @@ xnoremap D dd
 nnoremap < <<
 nnoremap > >>
 
+" Navigate with selection
+nmap <S-Up> v<Up>
+nmap <S-Down> v<Down>
+nmap <S-Left> v<Left>
+nmap <S-Right> v<Right>
+nmap <S-Home> v<Home>
+nmap <S-End> v<End>
+
+vmap <S-Up> <Up>
+vmap <S-Down> <Down>
+vmap <S-Left> <Left>
+vmap <S-Right> <Right>
+vmap <S-Home> <Home>
+vmap <S-End> <End>
+
 " Indent keeping selection
 xnoremap < <gv
 xnoremap > >gv
@@ -235,6 +256,13 @@ imap <expr> <A-k> pumvisible() ? '<Action>(EditorUp)' : '<Action>(EditorCloneCar
 
 xmap gl <Action>(EditorAddCaretPerSelectedLine)
 
+let g:multi_cursor_use_default_mapping = 0
+
+nmap <A-n> <Plug>NextWholeOccurrence
+xmap <A-n> <Plug>NextWholeOccurrence
+xmap <A-x> <Plug>SkipOccurrence
+xmap <A-p> <Plug>RemoveOccurrence
+
 " Manage editor tabs
 map <C-w>m <Action>(MoveEditorToOppositeTabGroup)
 map <C-w>s <Action>(MoveTabDown)
@@ -263,8 +291,8 @@ noremap g[ [
 nnoremap M m
 nnoremap Z z
 
-" Repurpose 'Enter' for statement completion ('isactionenabled' requires a custom version of IdeaVIM)
-nmap <Enter> <Action>(EditorCompleteStatement)
+" Repurpose 'Enter' for statement completion ('isactionenabled' and 'isinplacerenaming' require a custom version of IdeaVIM)
+nmap <expr> <Enter> isinplacerenaming() ? '<Action>(NextTemplateVariable)' : '<Action>(EditorCompleteStatement)'
 
 imap <expr> <C-Enter> isactionenabled('Console.Jdbc.Execute') ? '<Action>(Console.Jdbc.Execute)' : '<Action>(EditorCompleteStatement)'
 imap <expr> <D-Enter> isactionenabled('Console.Jdbc.Execute') ? '<Action>(Console.Jdbc.Execute)' : '<Action>(EditorCompleteStatement)'
@@ -282,14 +310,14 @@ map ge <Action>(VcsShowNextChangeMarker)
 map gE <Action>(VcsShowPrevChangeMarker)
 map gf <Action>(VimJumpToSource)<Action>(HideActiveWindow)
 map gi <Action>(GotoImplementation)
-map gr <Action>(RecentLocations)
-map gR <Action>(RecentChangedFiles)
+map gr <Action>(GotoRelated)
 map gs <Action>(GotoSuperMethod)
 map gS <Action>(ShowSiblings)
 map gt gg<Action>(KM.GotoNextTypeInFile)
 map gT <Action>(KM.GotoNextTypeInFile)
 map gu <Action>(ShowUsages)
 map gU <Action>(FindUsages)
+map g<BS> <Action>(RecentLocations)
 
 " Repurpose 'z' for view actions and debugger
 map za <Action>(Annotate)