@@ -220,21 +220,21 @@ def bookmarkRemove(self):
220
220
upperRow , _ , lowerRow , _ = self .startAndEnd ()
221
221
return self .bookmarkRemoveFrom (upperRow , lowerRow )
222
222
223
- def bookmarkRemoveFrom (self , upperRow , lowerRow ):
223
+ def bookmarkRemoveFrom (self , startRow , endRow ):
224
224
"""
225
225
Removes bookmarks in the given line interval.
226
226
227
227
Args:
228
- upperRow : The upper line limit , inclusive.
229
- lowerRow : The lower line limit , inclusive.
228
+ startRow : The start of the line interval , inclusive.
229
+ endRow : The end of the line interval , inclusive.
230
230
231
231
Returns:
232
232
(boolean) Whether any bookmarks were removed.
233
233
"""
234
- if upperRow > lowerRow :
234
+ if startRow > endRow :
235
235
return False
236
236
rangeList = self .bookmarks
237
- needle = app .bookmark .Bookmark (upperRow , lowerRow )
237
+ needle = app .bookmark .Bookmark (startRow , endRow )
238
238
# Find the left-hand index.
239
239
begin = bisect .bisect_left (rangeList , needle )
240
240
if begin and needle .begin <= rangeList [begin - 1 ].end :
@@ -260,33 +260,33 @@ def bookmarkRemoveFrom(self, upperRow, lowerRow):
260
260
self .bookmarks = rangeList [:begin ] + rangeList [index :]
261
261
return True
262
262
263
- def bookmarkMove (self , upper , delta ):
263
+ def bookmarkMove (self , startRow , delta ):
264
264
"""
265
265
Moves bookmarks up and down.
266
266
Called after changes to line numbers.
267
267
268
268
Args:
269
- upper (int): The upper limit on current bookmark positions .
269
+ startRow (int): The upper limit on the bookmarks boundaries to move .
270
270
delta (int): The number of rows to move.
271
271
272
272
Returns:
273
273
None.
274
274
"""
275
- begin = max (bisect .bisect_left (self .bookmarks , ((upper , upper ),)) - 1 , 0 )
275
+ begin = max (bisect .bisect_left (self .bookmarks , ((startRow , startRow ),)) - 1 , 0 )
276
276
277
277
# TODO(Androbin, aaxu): defer changes outside the screen
278
278
for index in range (begin , len (self .bookmarks )):
279
279
bookmark = self .bookmarks [index ]
280
280
markRange , data = bookmark
281
281
282
- if markRange [0 ] > upper :
282
+ if markRange [0 ] > startRow :
283
283
markRange = (markRange [0 ] + delta , markRange [1 ] + delta )
284
- elif markRange [1 ] >= upper :
284
+ elif markRange [1 ] >= startRow :
285
285
markRange = (markRange [0 ], markRange [1 ] + delta )
286
286
287
287
for key in ['cursor' , 'marker' , 'pen' ]:
288
288
value = data [key ]
289
- if value [0 ] >= upper :
289
+ if value [0 ] >= startRow :
290
290
data [key ] = (value [0 ] + delta , value [1 ])
291
291
292
292
bookmark = (markRange , data )
0 commit comments