7d72519039
[READY] Do not disable omnifunc when filetype completion is disabled Prior to PR https://github.com/Valloric/YouCompleteMe/pull/2657, it was possible to trigger Vim's omnifunc with `<C-Space>` even if semantic completion was disabled for the current filetype through the `g:ycm_filetype_specific_completion_to_disable` option. It worked because `<C-Space>` was mapped to `<C-X><C-O><C-P>`, which are the keys to trigger the omnifunc. PR https://github.com/Valloric/YouCompleteMe/pull/2657 changed that by making `<C-Space>` directly call the `SendCompletionRequest` function with `force_semantic` sets to `True`. This change was necessary to get fuzzy matching with the omnifunc (see issue https://github.com/Valloric/YouCompleteMe/issues/961) but broke the `<C-Space>` behavior when filetype completion is disabled. This PR restores that behavior. Fixes https://github.com/Valloric/YouCompleteMe/issues/2950. <!-- 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/2978) <!-- Reviewable:end -->
134 lines
4.8 KiB
Python
134 lines
4.8 KiB
Python
# Copyright (C) 2011, 2012, 2013 Google Inc.
|
|
#
|
|
# This file is part of YouCompleteMe.
|
|
#
|
|
# YouCompleteMe is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# YouCompleteMe is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with YouCompleteMe. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
from __future__ import unicode_literals
|
|
from __future__ import print_function
|
|
from __future__ import division
|
|
from __future__ import absolute_import
|
|
# Not installing aliases from python-future; it's unreliable and slow.
|
|
from builtins import * # noqa
|
|
|
|
import vim
|
|
from ycm import vimsupport
|
|
from ycmd import utils
|
|
from ycmd.completers.completer import Completer
|
|
from ycm.client.base_request import BaseRequest
|
|
|
|
OMNIFUNC_RETURNED_BAD_VALUE = 'Omnifunc returned bad value to YCM!'
|
|
OMNIFUNC_NOT_LIST = ( 'Omnifunc did not return a list or a dict with a "words" '
|
|
' list when expected.' )
|
|
|
|
|
|
class OmniCompleter( Completer ):
|
|
def __init__( self, user_options ):
|
|
super( OmniCompleter, self ).__init__( user_options )
|
|
self._omnifunc = None
|
|
|
|
|
|
def SupportedFiletypes( self ):
|
|
return []
|
|
|
|
|
|
def ShouldUseCache( self ):
|
|
return bool( self.user_options[ 'cache_omnifunc' ] )
|
|
|
|
|
|
def ShouldUseNow( self, request_data ):
|
|
self._omnifunc = utils.ToUnicode( vim.eval( '&omnifunc' ) )
|
|
if not self._omnifunc:
|
|
return False
|
|
if self.ShouldUseCache():
|
|
return super( OmniCompleter, self ).ShouldUseNow( request_data )
|
|
return self.ShouldUseNowInner( request_data )
|
|
|
|
|
|
def ShouldUseNowInner( self, request_data ):
|
|
if request_data[ 'force_semantic' ]:
|
|
return True
|
|
disabled_filetypes = self.user_options[
|
|
'filetype_specific_completion_to_disable' ]
|
|
if not vimsupport.CurrentFiletypesEnabled( disabled_filetypes ):
|
|
return False
|
|
return super( OmniCompleter, self ).ShouldUseNowInner( request_data )
|
|
|
|
|
|
def ComputeCandidates( self, request_data ):
|
|
if self.ShouldUseCache():
|
|
return super( OmniCompleter, self ).ComputeCandidates( request_data )
|
|
if self.ShouldUseNowInner( request_data ):
|
|
return self.ComputeCandidatesInner( request_data )
|
|
return []
|
|
|
|
|
|
def ComputeCandidatesInner( self, request_data ):
|
|
if not self._omnifunc:
|
|
return []
|
|
|
|
try:
|
|
return_value = vimsupport.GetIntValue( self._omnifunc + '(1,"")' )
|
|
if return_value < 0:
|
|
# FIXME: Technically, if the return is -1 we should raise an error
|
|
return []
|
|
|
|
# Use the start column calculated by the omnifunc, rather than our own
|
|
# interpretation. This is important for certain languages where our
|
|
# identifier detection is either incorrect or not compatible with the
|
|
# behaviour of the omnifunc. Note: do this before calling the omnifunc
|
|
# because it affects the value returned by 'query'
|
|
request_data[ 'start_column' ] = return_value + 1
|
|
|
|
# Calling directly the omnifunc may move the cursor position. This is the
|
|
# case with the default Vim omnifunc for C-family languages
|
|
# (ccomplete#Complete) which calls searchdecl to find a declaration. This
|
|
# function is supposed to move the cursor to the found declaration but it
|
|
# doesn't when called through the omni completion mapping (CTRL-X CTRL-O).
|
|
# So, we restore the cursor position after calling the omnifunc.
|
|
line, column = vimsupport.CurrentLineAndColumn()
|
|
|
|
omnifunc_call = [ self._omnifunc,
|
|
"(0,'",
|
|
vimsupport.EscapeForVim( request_data[ 'query' ] ),
|
|
"')" ]
|
|
items = vim.eval( ''.join( omnifunc_call ) )
|
|
|
|
vimsupport.SetCurrentLineAndColumn( line, column )
|
|
|
|
if isinstance( items, dict ) and 'words' in items:
|
|
items = items[ 'words' ]
|
|
|
|
if not hasattr( items, '__iter__' ):
|
|
raise TypeError( OMNIFUNC_NOT_LIST )
|
|
|
|
return list( filter( bool, items ) )
|
|
|
|
except ( TypeError, ValueError, vim.error ) as error:
|
|
vimsupport.PostVimMessage(
|
|
OMNIFUNC_RETURNED_BAD_VALUE + ' ' + str( error ) )
|
|
return []
|
|
|
|
|
|
def FilterAndSortCandidatesInner( self, candidates, sort_property, query ):
|
|
request_data = {
|
|
'candidates': candidates,
|
|
'sort_property': sort_property,
|
|
'query': query
|
|
}
|
|
|
|
response = BaseRequest.PostDataToHandler( request_data,
|
|
'filter_and_sort_candidates' )
|
|
return response if response is not None else candidates
|