Auto merge of #2513 - micbou:get-completions, r=vheon

[READY] Remove s:GetCompletions function

Small refactoring.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/valloric/youcompleteme/2513)
<!-- Reviewable:end -->
This commit is contained in:
Homu 2017-01-26 14:53:48 +09:00
commit 26bbbb2cb9

View File

@ -715,11 +715,6 @@ function! s:InvokeCompletion()
endfunction endfunction
function! s:GetCompletions()
return s:Pyeval( 'ycm_state.GetCompletions()' )
endfunction
" This is our main entry point. This is what vim calls to get completions. " This is our main entry point. This is what vim calls to get completions.
function! youcompleteme#Complete( findstart, base ) function! youcompleteme#Complete( findstart, base )
" After the user types one character after the call to the omnifunc, the " After the user types one character after the call to the omnifunc, the
@ -746,7 +741,7 @@ function! youcompleteme#Complete( findstart, base )
exec s:python_command "ycm_state.CreateCompletionRequest()" exec s:python_command "ycm_state.CreateCompletionRequest()"
return s:Pyeval( 'base.CompletionStartColumn()' ) return s:Pyeval( 'base.CompletionStartColumn()' )
else else
return s:GetCompletions() return s:Pyeval( 'ycm_state.GetCompletions()' )
endif endif
endfunction endfunction
@ -761,7 +756,7 @@ function! youcompleteme#OmniComplete( findstart, base )
\ "force_semantic = True )" \ "force_semantic = True )"
return s:Pyeval( 'base.CompletionStartColumn()' ) return s:Pyeval( 'base.CompletionStartColumn()' )
else else
return s:GetCompletions() return s:Pyeval( 'ycm_state.GetCompletions()' )
endif endif
endfunction endfunction