Refactor _HandleFixitResponse function

This commit is contained in:
micbou 2015-09-12 16:30:21 +02:00
parent a2808ee3ff
commit 33316d8bf8
2 changed files with 49 additions and 43 deletions

View File

@ -22,6 +22,7 @@ from ycm.client.base_request import BaseRequest, BuildRequestData, ServerError
from ycm import vimsupport from ycm import vimsupport
from ycmd.utils import ToUtf8IfNeeded from ycmd.utils import ToUtf8IfNeeded
def _EnsureBackwardsCompatibility( arguments ): def _EnsureBackwardsCompatibility( arguments ):
if arguments and arguments[ 0 ] == 'GoToDefinitionElseDeclaration': if arguments and arguments[ 0 ] == 'GoToDefinitionElseDeclaration':
arguments[ 0 ] = 'GoTo' arguments[ 0 ] = 'GoTo'
@ -57,6 +58,7 @@ class CommandRequest( BaseRequest ):
def Response( self ): def Response( self ):
return self._response return self._response
def RunPostCommandActionsIfNeeded( self ): def RunPostCommandActionsIfNeeded( self ):
if not self.Done() or not self._response: if not self.Done() or not self._response:
return return
@ -68,6 +70,7 @@ class CommandRequest( BaseRequest ):
elif 'message' in self._response: elif 'message' in self._response:
self._HandleMessageResponse() self._HandleMessageResponse()
def _HandleGotoResponse( self ): def _HandleGotoResponse( self ):
if isinstance( self._response, list ): if isinstance( self._response, list ):
defs = [ _BuildQfListItem( x ) for x in self._response ] defs = [ _BuildQfListItem( x ) for x in self._response ]
@ -78,53 +81,24 @@ class CommandRequest( BaseRequest ):
self._response[ 'line_num' ], self._response[ 'line_num' ],
self._response[ 'column_num' ] ) self._response[ 'column_num' ] )
def _HandleFixitResponse( self ): def _HandleFixitResponse( self ):
if not len( self._response[ 'fixits' ] ): if not len( self._response[ 'fixits' ] ):
vimsupport.EchoText( "No fixits found for current line" ) vimsupport.EchoText( "No fixits found for current line" )
else: else:
fixit = self._response[ 'fixits' ][ 0 ] chunks = self._response[ 'fixits' ][ 0 ][ 'chunks' ]
# We need to track the difference in length, but ensuring we apply fixes vimsupport.ReplaceChunksList( chunks )
# in ascending order of insertion point.
fixit[ 'chunks' ].sort( key = lambda chunk: (
str(chunk[ 'range' ][ 'start' ][ 'line_num' ])
+ ','
+ str(chunk[ 'range' ][ 'start' ][ 'column_num' ])
))
# Remember the line number we're processing. Negative line number means we
# haven't processed any lines yet (by nature of being not equal to any
# real line number).
last_line = -1
# Counter of changes applied, so the user has a mental picture of the
# undo history this change is creating.
num_fixed = 0
line_delta = 0
for chunk in fixit[ 'chunks' ]:
if chunk[ 'range' ][ 'start' ][ 'line_num' ] != last_line:
# If this chunk is on a different line than the previous chunk,
# then ignore previous deltas (as offsets won't have changed).
last_line = chunk[ 'range' ][ 'end' ][ 'line_num' ]
char_delta = 0
(new_line_delta, new_char_delta) = vimsupport.ReplaceChunk(
chunk[ 'range' ][ 'start' ],
chunk[ 'range' ][ 'end' ],
chunk[ 'replacement_text' ],
line_delta, char_delta )
line_delta += new_line_delta
char_delta += new_char_delta
num_fixed = num_fixed + 1
vimsupport.EchoTextVimWidth( "FixIt applied " vimsupport.EchoTextVimWidth( "FixIt applied "
+ str(num_fixed) + str( len( chunks ) )
+ " changes" ) + " changes" )
def _HandleMessageResponse( self ): def _HandleMessageResponse( self ):
vimsupport.EchoText( self._response[ 'message' ] ) vimsupport.EchoText( self._response[ 'message' ] )
def SendCommandRequest( arguments, completer ): def SendCommandRequest( arguments, completer ):
request = CommandRequest( arguments, completer ) request = CommandRequest( arguments, completer )
# This is a blocking call. # This is a blocking call.

View File

@ -459,6 +459,41 @@ def GetIntValue( variable ):
return int( vim.eval( variable ) ) return int( vim.eval( variable ) )
def ReplaceChunksList( chunks, vim_buffer = None ):
if vim_buffer is None:
vim_buffer = vim.current.buffer
# We need to track the difference in length, but ensuring we apply fixes
# in ascending order of insertion point.
chunks.sort( key = lambda chunk: (
str( chunk[ 'range' ][ 'start' ][ 'line_num' ] )
+ ','
+ str( chunk[ 'range' ][ 'start' ][ 'column_num' ] )
) )
# Remember the line number we're processing. Negative line number means we
# haven't processed any lines yet (by nature of being not equal to any
# real line number).
last_line = -1
line_delta = 0
for chunk in chunks:
if chunk[ 'range' ][ 'start' ][ 'line_num' ] != last_line:
# If this chunk is on a different line than the previous chunk,
# then ignore previous deltas (as offsets won't have changed).
last_line = chunk[ 'range' ][ 'end' ][ 'line_num' ]
char_delta = 0
( new_line_delta, new_char_delta ) = ReplaceChunk(
chunk[ 'range' ][ 'start' ],
chunk[ 'range' ][ 'end' ],
chunk[ 'replacement_text' ],
line_delta, char_delta,
vim_buffer )
line_delta += new_line_delta
char_delta += new_char_delta
# Replace the chunk of text specified by a contiguous range with the supplied # Replace the chunk of text specified by a contiguous range with the supplied
# text. # text.
# * start and end are objects with line_num and column_num properties # * start and end are objects with line_num and column_num properties
@ -469,10 +504,7 @@ def GetIntValue( variable ):
# returns the delta (in lines and characters) that any position after the end # returns the delta (in lines and characters) that any position after the end
# needs to be adjusted by. # needs to be adjusted by.
def ReplaceChunk( start, end, replacement_text, line_delta, char_delta, def ReplaceChunk( start, end, replacement_text, line_delta, char_delta,
vim_buffer = None ): vim_buffer ):
if vim_buffer is None:
vim_buffer = vim.current.buffer
# ycmd's results are all 1-based, but vim's/python's are all 0-based # ycmd's results are all 1-based, but vim's/python's are all 0-based
# (so we do -1 on all of the values) # (so we do -1 on all of the values)
start_line = start[ 'line_num' ] - 1 + line_delta start_line = start[ 'line_num' ] - 1 + line_delta