From d0223a8f0be6232c9a8bdc84cc2a77285cad2010 Mon Sep 17 00:00:00 2001 From: Strahinja Val Markovic Date: Mon, 20 Aug 2012 20:55:25 -0700 Subject: [PATCH] Easier to move in insert mode now The completion menu would interfere with moving in insert mode with the arrow keys. This is now solved. --- autoload/youcompleteme.vim | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/autoload/youcompleteme.vim b/autoload/youcompleteme.vim index e6a78aad..5871ba69 100644 --- a/autoload/youcompleteme.vim +++ b/autoload/youcompleteme.vim @@ -25,8 +25,11 @@ let s:searched_and_results_found = 0 let s:should_use_filetype_completion = 0 let s:completion_start_column = 0 let s:omnifunc_mode = 0 + let s:old_cursor_position = [] let s:cursor_moved = 0 +let s:moved_vertically_in_insert_mode = 0 +let s:previous_num_chars_on_current_line = -1 function! youcompleteme#Enable() " When vim is in diff mode, don't run @@ -159,6 +162,18 @@ function! s:OnCursorMovedInsertMode() endif call s:UpdateCursorMoved() + + " Basically, we need to only trigger the completion menu when the user has + " inserted or deleted a character, NOT just when the user moves in insert mode + " (with, say, the arrow keys). If we trigger the menu even on pure moves, then + " it's impossible to move in insert mode since the up/down arrows start moving + " the selected completion in the completion menu. Yeah, people shouldn't be + " moving in insert mode at all (that's what normal mode is for) but explain + " that to the users who complain... + if !s:BufferTextChangedSinceLastMoveInInsertMode() + return + endif + call s:IdentifierFinishedOperations() call s:ClosePreviewWindowIfNeeded() call s:InvokeCompletion() @@ -198,10 +213,35 @@ endfunction function! s:UpdateCursorMoved() let current_position = getpos('.') let s:cursor_moved = current_position != s:old_cursor_position + + let s:moved_vertically_in_insert_mode = s:old_cursor_position != [] && + \ current_position[ 1 ] != s:old_cursor_position[ 1 ] + let s:old_cursor_position = current_position endfunction +function! s:BufferTextChangedSinceLastMoveInInsertMode() + if s:moved_vertically_in_insert_mode + let s:previous_num_chars_on_current_line = -1 + return 0 + endif + + let num_chars_in_current_cursor_line = strlen( getline('.') ) + + if s:previous_num_chars_on_current_line == -1 + let s:previous_num_chars_on_current_line = num_chars_in_current_cursor_line + return 0 + endif + + let changed_text_on_current_line = num_chars_in_current_cursor_line != + \ s:previous_num_chars_on_current_line + let s:previous_num_chars_on_current_line = num_chars_in_current_cursor_line + + return changed_text_on_current_line +endfunction + + function! s:ClosePreviewWindowIfNeeded() if !g:ycm_autoclose_preview_window_after_completion return