Skip to content

Commit 0872b47

Browse files
committed
Rename things + docs
1 parent f44a3e0 commit 0872b47

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
@@ -221,21 +221,21 @@ def bookmarkRemove(self):
221221
upperRow, _, lowerRow, _ = self.startAndEnd()
222222
return self.bookmarkRemoveFrom(upperRow, lowerRow)
223223

224-
def bookmarkRemoveFrom(self, upperRow, lowerRow):
224+
def bookmarkRemoveFrom(self, startRow, endRow):
225225
"""
226226
Removes bookmarks in the given line interval.
227227
228228
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.
231231
232232
Returns:
233233
(boolean) Whether any bookmarks were removed.
234234
"""
235-
if upperRow > lowerRow:
235+
if startRow > endRow:
236236
return False
237237
rangeList = self.bookmarks
238-
needle = app.bookmark.Bookmark(upperRow, lowerRow)
238+
needle = app.bookmark.Bookmark(startRow, endRow)
239239
# Find the left-hand index.
240240
begin = bisect.bisect_left(rangeList, needle)
241241
if begin and needle.begin <= rangeList[begin - 1].end:
@@ -261,33 +261,33 @@ def bookmarkRemoveFrom(self, upperRow, lowerRow):
261261
self.bookmarks = rangeList[:begin] + rangeList[index:]
262262
return True
263263

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

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

283-
if markRange[0] > upper:
283+
if markRange[0] > startRow:
284284
markRange = (markRange[0] + delta, markRange[1] + delta)
285-
elif markRange[1] >= upper:
285+
elif markRange[1] >= startRow:
286286
markRange = (markRange[0], markRange[1] + delta)
287287

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

293293
bookmark = (markRange, data)

0 commit comments

Comments
 (0)