.ideavimrc

@@ -19,6 +19,7 @@ if has('win32')
 endif
 
 " Configure IDEA settings (https://github.com/JetBrains/ideavim/wiki/set-commands)
+set ideaglobalmode
 set ideajoin
 set idearefactormode=visual
 
@@ -96,9 +97,6 @@ nnoremap <A-S-b> gE
 " 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
@@ -147,8 +145,19 @@ nnoremap M m
 nnoremap Z z
 noremap \\ <C-w>
 
-" Repurpose 'Enter' for statement completion (requires a custom version of IdeaVIM)
-nmap <Enter> :action EditorCompleteStatement<CR>
+" Repurpose 'Enter' for statement completion (renaming function requires a custom version of IdeaVIM)
+function! CompleteStatement()
+  if (renaming())
+    " TODO https://github.com/JetBrains/ideavim/discussions/397#discussioncomment-1573048
+    " return "\<Enter>"
+    return "<Enter>"
+  else
+    action EditorCompleteStatement
+    return ""
+  endif
+endfunction
+
+nmap <expr> <Enter> CompleteStatement()
 
 " Repurpose special characters for navigation
 nmap ( :raction GotoPreviousError<CR>