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