Skip to content

Commit b7da6d1

Browse files
committed
Rename things + docs
1 parent bd80009 commit b7da6d1

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
@@ -213,21 +213,21 @@ def bookmarkRemove(self):
213213
upperRow, _, lowerRow, _ = self.startAndEnd()
214214
return self.bookmarkRemoveFrom(upperRow, lowerRow)
215215

216-
def bookmarkRemoveFrom(self, upperRow, lowerRow):
216+
def bookmarkRemoveFrom(self, startRow, endRow):
217217
"""
218218
Removes bookmarks in the given line interval.
219219
220220
Args:
221-
upperRow: The upper line limit, inclusive.
222-
lowerRow: The lower line limit, inclusive.
221+
startRow: The start of the line interval, inclusive.
222+
endRow: The end of the line interval, inclusive.
223223
224224
Returns:
225225
(boolean) Whether any bookmarks were removed.
226226
"""
227-
if upperRow > lowerRow:
227+
if startRow > endRow:
228228
return False
229229
rangeList = self.bookmarks
230-
needle = app.bookmark.Bookmark(upperRow, lowerRow)
230+
needle = app.bookmark.Bookmark(startRow, endRow)
231231
# Find the left-hand index.
232232
begin = bisect.bisect_left(rangeList, needle)
233233
if begin and needle.begin <= rangeList[begin - 1].end:
@@ -253,33 +253,33 @@ def bookmarkRemoveFrom(self, upperRow, lowerRow):
253253
self.bookmarks = rangeList[:begin] + rangeList[index:]
254254
return True
255255

256-
def bookmarkMove(self, upper, delta):
256+
def bookmarkMove(self, startRow, delta):
257257
"""
258258
Moves bookmarks up and down.
259259
Called after changes to line numbers.
260260
261261
Args:
262-
upper (int): The upper limit on current bookmark positions.
262+
startRow (int): The upper limit on the bookmarks boundaries to move.
263263
delta (int): The number of rows to move.
264264
265265
Returns:
266266
None.
267267
"""
268-
begin = max(bisect.bisect_left(self.bookmarks, ((upper, upper),)) - 1, 0)
268+
begin = max(bisect.bisect_left(self.bookmarks, ((startRow, startRow),)) - 1, 0)
269269

270270
# TODO(Androbin, aaxu): defer changes outside the screen
271271
for index in range(begin, len(self.bookmarks)):
272272
bookmark = self.bookmarks[index]
273273
markRange, data = bookmark
274274

275-
if markRange[0] > upper:
275+
if markRange[0] > startRow:
276276
markRange = (markRange[0] + delta, markRange[1] + delta)
277-
elif markRange[1] >= upper:
277+
elif markRange[1] >= startRow:
278278
markRange = (markRange[0], markRange[1] + delta)
279279

280280
for key in ['cursor', 'marker', 'pen']:
281281
value = data[key]
282-
if value[0] >= upper:
282+
if value[0] >= startRow:
283283
data[key] = (value[0] + delta, value[1])
284284

285285
bookmark = (markRange, data)

0 commit comments

Comments
 (0)