.ideavimrc

@@ -55,7 +55,6 @@ sethandler <C-O> a:vim
 sethandler <C-P> a:vim
 sethandler <C-U> a:vim
 sethandler <C-W> a:vim
-sethandler <C-S-W> a:vim
 
 " Enable plugins (https://github.com/JetBrains/ideavim/wiki/IdeaVim-Plugins)
 Plug 'argtextobj.vim'
@@ -97,15 +96,17 @@ xnoremap H ]b
 noremap <A-b> ge
 noremap <A-S-b> gE
 
-" Navigate editor tabs
+" Navigate and close tabs
 noremap <A-h> gT
 noremap <A-l> gt
 inoremap <A-h> <C-o>gT
 inoremap <A-l> <C-o>gt
 
+noremap <C-w> :action CloseContent<CR>
+
 " Increment/decrement numbers
-noremap <Bar>+ <C-a>
+nnoremap <Bar>+ <C-a>
-noremap <Bar>- <C-x>
+nnoremap <Bar>- <C-x>
 
 " Edit from cursor to start/end of parenthesized block
 nnoremap c) c])
@@ -137,83 +138,53 @@ nnoremap gp `[v`]
 xnoremap p P
 xnoremap P p
 
-" Show parameter info
-nmap <A-p> <Action>(ParameterInfo)
-imap <A-p> <Action>(ParameterInfo)
-
-" Toggle comments
-nmap <C--> <Action>(CommentByLineComment)
-vmap <C--> <Action>(CommentByBlockComment)
-nmap <D--> <C-->
-vmap <D--> <C-->
-
 " Navigate back/forward
 nmap <BS> <Action>(Back)
 nmap <S-BS> <Action>(Forward)
 
-" Navigate to previous/next method
+" Show parameter info
-nnoremap [ [m
+nmap <A-p> <Action>(ParameterInfo)
-xnoremap [ [m
+imap <A-p> <Action>(ParameterInfo)
-nnoremap ] ]m
-xnoremap ] ]m
 
-" Alternative bindings for square bracket commands
+" Rebind commands that will be repurposed
-nnoremap g[ [
-xnoremap g[ [
-nnoremap g] ]
-xnoremap g] ]
-
-" Manage editor tabs
-noremap <C-w> :action CloseContent<CR>
-noremap <C-S-w> :action ReopenClosedTab<CR>
-noremap \\ <C-w>
-
-noremap \\s :action MoveTabDown<CR>
-noremap \\S <C-w>s
-noremap \\u :action Unsplit<CR>
-noremap \\U :action UnsplitAll<CR>
-noremap \\v :action MoveTabRight<CR>
-noremap \\V <C-w>v
-
-noremap \\qa :action CloseAllEditors<CR>
-noremap \\qh :action CloseAllToTheLeft<CR>
-noremap \\ql :action CloseAllToTheRight<CR>
-noremap \\qo :action CloseAllEditorsButActive<CR>
-
-" Rebind repurposed commands
 nnoremap GG G
 nnoremap dG dG
 nnoremap cG cG
 nnoremap M m
 nnoremap Z z
+noremap \\ <C-w>
 
 " Repurpose 'Enter' for statement completion (requires a custom version of IdeaVIM)
-nmap <Enter> <Action>(EditorCompleteStatement)
+nmap <Enter> :action EditorCompleteStatement<CR>
 
 " Repurpose special characters for navigation
 nmap ( :raction GotoPreviousError<CR>
 nmap ) :raction GotoNextError<CR>
+nmap [ :raction MethodUp<CR>
+nmap ] :raction MethodDown<CR>
+nmap { :raction JumpToLastChange<CR>
+nmap } :raction JumpToNextChange<CR>
 
 " Repurpose 'g' for navigation (:raction requires a custom version of IdeaVIM)
 nmap gb :raction GotoNextBookmark<CR>
 nmap gB :raction GotoPreviousBookmark<CR>
-nmap gD <Action>(GotoTypeDeclaration)
+nmap gd :action GotoDeclaration<CR>
+nmap gD :action GotoTypeDeclaration<CR>
 nmap ge :raction VcsShowNextChangeMarker<CR>
 nmap gE :raction VcsShowPrevChangeMarker<CR>
-nmap gf <Action>(EditSource)
+nmap gi :action GotoImplementation<CR>
-nmap gi <Action>(GotoImplementation)
 map gj :raction EditorCloneCaretBelow<CR>
 map gk :raction EditorCloneCaretAbove<CR>
-nmap gr <Action>(RecentLocations)
+nmap gr :action RecentLocations<CR>
-nmap gR <Action>(RecentChangedFiles)
+nmap gR :action RecentChangedFiles<CR>
-nmap gs <Action>(GotoSuperMethod)
+nmap gs :action GotoSuperMethod<CR>
-nmap gS <Action>(ShowSiblings)
+nmap gS :action ShowSiblings<CR>
 map gt :raction KM.GotoNextTypeInFile<CR>
 map gT :raction KM.GotoPreviousTypeInFile<CR>
-nmap gu <Action>(ShowUsages)
+nmap gu :action ShowUsages<CR>
-nmap gU <Action>(FindUsages)
+nmap gU :action FindUsages<CR>
-map gz <Action>(NextSplitter)
+map gz :action NextSplitter<CR>
-map gZ <Action>(PrevSplitter)
+map gZ :action PrevSplitter<CR>
 nmap g( :raction KM.GotoPreviousErrorInOtherMode<CR>
 nmap g) :raction KM.GotoNextErrorInOtherMode<CR>
 
@@ -229,60 +200,69 @@ nmap GT gT
 map Gz gz
 map GZ gZ
 
-" Repurpose 'z' for view actions and debugger
+" Repurpose 'z' for view actions, debugger, and tab management
-map za <Action>(Annotate)
+map za :action Annotate<CR>
-map zb <Action>(ViewBreakpoints)
+map zb :action ViewBreakpoints<CR>
-map zc <Action>(EditorContextInfo)
+map zc :action EditorContextInfo<CR>
-map zd <Action>(QuickJavaDoc)
+map zd :action QuickJavaDoc<CR>
-map ze <Action>(ShowErrorDescription)
+map ze :action ShowErrorDescription<CR>
-map zf <Action>(SelectInProjectView)
+map zf :action SelectInProjectView<CR>
 
-map zht <Action>(TypeHierarchy)
+map zht :action TypeHierarchy<CR>
-map zhm <Action>(MethodHierarchy)
+map zhm :action MethodHierarchy<CR>
-map zhc <Action>(CallHierarchy)
+map zhc :action CallHierarchy<CR>
 
-map zm <Action>(ShowBookmarks)
+map zm :action ShowBookmarks<CR>
-map zp <Action>(QuickImplementations)
+map zp :action QuickImplementations<CR>
-map zP <Action>(QuickTypeDefinition)
+map zP :action QuickTypeDefinition<CR>
 
-map zr <Action>(RunToCursor)
+map zqa :action CloseAllEditors<CR>
-map zR <Action>(ForceRunToCursor)
+map zqh :action CloseAllToTheLeft<CR>
+map zql :action CloseAllToTheRight<CR>
+map zqo :action CloseAllEditorsButActive<CR>
+map zqq :action CloseContent<CR>
+map zqu :action ReopenClosedTab<CR>
 
-map zt <Action>(ExpressionTypeInfo)
+map zr :action RunToCursor<CR>
-map zx <Action>(EvaluateExpression)
+map zR :action ForceRunToCursor<CR>
+
+map zsd :action MoveTabDown<CR>
+map zsr :action MoveTabRight<CR>
+map zsu :action Unsplit<CR>
+map zsU :action UnsplitAll<CR>
+
+map zt :action ExpressionTypeInfo<CR>
+map zx :action EvaluateExpression<CR>
 
 " Repurpose 'm' for refactoring (normal mode)
-nmap md <Action>(SafeDelete)
+nmap md :action SafeDelete<CR>
-nmap me <Action>(Move)
+nmap mg :action Generate<CR>
-nmap mg <Action>(Generate)
+nmap mi :action Inline<CR>
-nmap mi <Action>(Inline)
+nmap mn :action RenameElement<CR>
-nmap mn <Action>(RenameElement)
+nmap mo :action OverrideMethods<CR>
-nmap mo <Action>(OverrideMethods)
+nmap ms :action ChangeSignature<CR>
-nmap ms <Action>(ChangeSignature)
+nmap mS :action NewScratchFile<CR>
-nmap mS <Action>(NewScratchFile)
 
 " Repurpose 'm' for refactoring (normal / visual mode)
-nmap mc <Action>(IntroduceConstant)
+nmap mc :action IntroduceConstant<CR>
-xmap mc <Action>(IntroduceConstant)
+xmap mc :action IntroduceConstant<CR>
-nmap mf <Action>(IntroduceField)
+nmap mf :action IntroduceField<CR>
-xmap mf <Action>(IntroduceField)
+xmap mf :action IntroduceField<CR>
-nmap mm <Action>(ExtractMethod)
+nmap mm :action ExtractMethod<CR>
-xmap mm <Action>(ExtractMethod)
+xmap mm :action ExtractMethod<CR>
-nmap mM <Action>(ExtractFunction)
+nmap mM :action ExtractFunction<CR>
-xmap mM <Action>(ExtractFunction)
+xmap mM :action ExtractFunction<CR>
-nmap mp <Action>(IntroduceParameter)
+nmap mp :action IntroduceParameter<CR>
-xmap mp <Action>(IntroduceParameter)
+xmap mp :action IntroduceParameter<CR>
-nmap mP <Action>(IntroduceProperty)
+nmap mP :action IntroduceProperty<CR>
-xmap mP <Action>(IntroduceProperty)
+xmap mP :action IntroduceProperty<CR>
-nmap mr <Action>(Refactorings.QuickListPopupAction)
+nmap mr :action Refactorings.QuickListPopupAction<CR>
-xmap mr <Action>(Refactorings.QuickListPopupAction)
+xmap mr :action Refactorings.QuickListPopupAction<CR>
-nmap mt <Action>(InsertLiveTemplate)
+nmap mv :action IntroduceVariable<CR>
-xmap mt <Action>(SurroundWithLiveTemplate)
+xmap mv :action IntroduceVariable<CR>
-nmap mv <Action>(IntroduceVariable)
+nmap mw :action SurroundWith<CR>
-xmap mv <Action>(IntroduceVariable)
+xmap mw :action SurroundWith<CR>
-nmap mw <Action>(SurroundWith)
-xmap mw <Action>(SurroundWith)
 
 " Actions for custom version of AceJump
 set acejump
-map <Space> <Action>(AceVimAction_JumpAllEditors)
+map <Space> :action AceVimAction_JumpAllEditors<CR>