Skip to content

Commit 26dd8c2

Browse files
committed
Rename things + docs
1 parent 41ea926 commit 26dd8c2

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

app/actions.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -220,21 +220,21 @@ def bookmarkRemove(self):
220220
upperRow, _, lowerRow, _ = self.startAndEnd()
221221
return self.bookmarkRemoveFrom(upperRow, lowerRow)
222222

223-
def bookmarkRemoveFrom(self, upperRow, lowerRow):
223+
def bookmarkRemoveFrom(self, startRow, endRow):
224224
"""
225225
Removes bookmarks in the given line interval.
226226
227227
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.
230230
231231
Returns:
232232
(boolean) Whether any bookmarks were removed.
233233
"""
234-
if upperRow > lowerRow:
234+
if startRow > endRow:
235235
return False
236236
rangeList = self.bookmarks
237-
needle = app.bookmark.Bookmark(upperRow, lowerRow)
237+
needle = app.bookmark.Bookmark(startRow, endRow)
238238
# Find the left-hand index.
239239
begin = bisect.bisect_left(rangeList, needle)
240240
if begin and needle.begin <= rangeList[begin - 1].end:
@@ -260,33 +260,33 @@ def bookmarkRemoveFrom(self, upperRow, lowerRow):
260260
self.bookmarks = rangeList[:begin] + rangeList[index:]
261261
return True
262262

263-
def bookmarkMove(self, upper, delta):
263+
def bookmarkMove(self, startRow, delta):
264264
"""
265265
Moves bookmarks up and down.
266266
Called after changes to line numbers.
267267
268268
Args:
269-
upper (int): The upper limit on current bookmark positions.
269+
startRow (int): The upper limit on the bookmarks boundaries to move.
270270
delta (int): The number of rows to move.
271271
272272
Returns:
273273
None.
274274
"""
275-
begin = max(bisect.bisect_left(self.bookmarks, ((upper, upper),)) - 1, 0)
275+
begin = max(bisect.bisect_left(self.bookmarks, ((startRow, startRow),)) - 1, 0)
276276

277277
# TODO(Androbin, aaxu): defer changes outside the screen
278278
for index in range(begin, len(self.bookmarks)):
279279
bookmark = self.bookmarks[index]
280280
markRange, data = bookmark
281281

282-
if markRange[0] > upper:
282+
if markRange[0] > startRow:
283283
markRange = (markRange[0] + delta, markRange[1] + delta)
284-
elif markRange[1] >= upper:
284+
elif markRange[1] >= startRow:
285285
markRange = (markRange[0], markRange[1] + delta)
286286

287287
for key in ['cursor', 'marker', 'pen']:
288288
value = data[key]
289-
if value[0] >= upper:
289+
if value[0] >= startRow:
290290
data[key] = (value[0] + delta, value[1])
291291

292292
bookmark = (markRange, data)

0 commit comments

Comments
 (0)