Skip to content

Commit 25ec3c9

Browse files
committed
Clean up BuildRequestDataForLocation
- `badd` is unnecessary since we have `GetBufferNumberForFilename()` - Instead of passing `location`, we can pass `file`, `line` and `column` separately.
1 parent ac002d5 commit 25ec3c9

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

python/ycm/client/base_request.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,16 +249,15 @@ def BuildRequestData( buffer_number = None ):
249249
}
250250

251251

252-
def BuildRequestDataForLocation( location ):
253-
file, line, column = location
254-
if file not in vim.buffers:
255-
vim.command( f'badd { file }' )
252+
def BuildRequestDataForLocation( file : str, line : int, column : int ):
253+
buffer_number = vimsupport.GetBufferNumberForFilename(
254+
file,
255+
create_buffer_if_needed = True )
256256
try:
257257
vim.eval( f'bufload( "{ file }" )' )
258258
except vim.error as e:
259259
if 'E325' not in str( e ):
260260
raise
261-
buffer_number = vimsupport.GetBufferNumberForFilename( file )
262261
buffer = vim.buffers[ buffer_number ]
263262
file_data = vimsupport.GetUnsavedAndSpecifiedBufferData( buffer, file )
264263
return {

python/ycm/client/command_request.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def __init__( self,
4949

5050
def Start( self ):
5151
if self._location is not None:
52-
self._request_data = BuildRequestDataForLocation( self._location )
52+
self._request_data = BuildRequestDataForLocation( *self._location )
5353
elif self._bufnr is not None:
5454
self._request_data = BuildRequestData( self._bufnr )
5555
else:

0 commit comments

Comments
 (0)