Skip to content

Commit 620118c

Browse files
committed
ed -> editor
1 parent d908c85 commit 620118c

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

lib_src/misc/blocks.ts

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
import { forLines } from "./scopes"
55

6-
export function getLine(ed, l) {
6+
export function getLine(editor, l) {
77
return {
8-
scope: ed.scopeDescriptorForBufferPosition([l, 0]).scopes,
9-
line: ed.getTextInBufferRange([
8+
scope: editor.scopeDescriptorForBufferPosition([l, 0]).scopes,
9+
line: editor.getTextInBufferRange([
1010
[l, 0],
1111
[l, Infinity]
1212
])
@@ -43,19 +43,19 @@ function isStart(lineInfo) {
4343
return !(/^\s/.test(lineInfo.line) || isBlank(lineInfo) || isEnd(lineInfo) || isCont(lineInfo))
4444
}
4545

46-
function walkBack(ed, row) {
47-
while (row > 0 && !isStart(getLine(ed, row))) {
46+
function walkBack(editor, row) {
47+
while (row > 0 && !isStart(getLine(editor, row))) {
4848
row--
4949
}
5050
return row
5151
}
5252

53-
function walkForward(ed, start) {
53+
function walkForward(editor, start) {
5454
let end = start
5555
let mark = start
56-
while (mark < ed.getLastBufferRow()) {
56+
while (mark < editor.getLastBufferRow()) {
5757
mark++
58-
const lineInfo = getLine(ed, mark)
58+
const lineInfo = getLine(editor, mark)
5959

6060
if (isStart(lineInfo)) {
6161
break
@@ -64,7 +64,7 @@ function walkForward(ed, start) {
6464
// An `end` only counts when there still are unclosed blocks (indicated by `forLines`
6565
// returning a non-empty array).
6666
// If the line closes a multiline string we also take that as ending the block.
67-
if (!(forLines(ed, start, mark - 1).length === 0) || isStringEnd(lineInfo)) {
67+
if (!(forLines(editor, start, mark - 1).length === 0) || isStringEnd(lineInfo)) {
6868
end = mark
6969
}
7070
} else if (!(isBlank(lineInfo) || isStart(lineInfo))) {
@@ -74,9 +74,9 @@ function walkForward(ed, start) {
7474
return end
7575
}
7676

77-
function getRange(ed, row) {
78-
const start = walkBack(ed, row)
79-
const end = walkForward(ed, start)
77+
function getRange(editor, row) {
78+
const start = walkBack(editor, row)
79+
const end = walkForward(editor, start)
8080
if (start <= row && row <= end) {
8181
return [
8282
[start, 0],
@@ -85,29 +85,29 @@ function getRange(ed, row) {
8585
}
8686
}
8787

88-
function getSelection(ed, sel) {
88+
function getSelection(editor, sel) {
8989
const { start, end } = sel.getBufferRange()
9090
const range = [
9191
[start.row, start.column],
9292
[end.row, end.column]
9393
]
94-
while (isBlank(getLine(ed, range[0][0]), true) && range[0][0] <= range[1][0]) {
94+
while (isBlank(getLine(editor, range[0][0]), true) && range[0][0] <= range[1][0]) {
9595
range[0][0]++
9696
range[0][1] = 0
9797
}
98-
while (isBlank(getLine(ed, range[1][0]), true) && range[1][0] >= range[0][0]) {
98+
while (isBlank(getLine(editor, range[1][0]), true) && range[1][0] >= range[0][0]) {
9999
range[1][0]--
100100
range[1][1] = Infinity
101101
}
102102
return range
103103
}
104104

105-
export function moveNext(ed, sel, range) {
105+
export function moveNext(editor, sel, range) {
106106
// Ensure enough room at the end of the buffer
107107
const row = range[1][0]
108108
let last
109-
while ((last = ed.getLastBufferRow()) < row + 2) {
110-
if (last !== row && !isBlank(getLine(ed, last))) {
109+
while ((last = editor.getLastBufferRow()) < row + 2) {
110+
if (last !== row && !isBlank(getLine(editor, last))) {
111111
break
112112
}
113113
sel.setBufferRange([
@@ -118,35 +118,35 @@ export function moveNext(ed, sel, range) {
118118
}
119119
// Move the cursor
120120
let to = row + 1
121-
while (to < ed.getLastBufferRow() && isBlank(getLine(ed, to))) {
121+
while (to < editor.getLastBufferRow() && isBlank(getLine(editor, to))) {
122122
to++
123123
}
124-
to = walkForward(ed, to)
124+
to = walkForward(editor, to)
125125
return sel.setBufferRange([
126126
[to, Infinity],
127127
[to, Infinity]
128128
])
129129
}
130130

131-
function getRanges(ed) {
132-
const ranges = ed.getSelections().map(sel => {
131+
function getRanges(editor) {
132+
const ranges = editor.getSelections().map(sel => {
133133
return {
134134
selection: sel,
135-
range: sel.isEmpty() ? getRange(ed, sel.getHeadBufferPosition().row) : getSelection(ed, sel)
135+
range: sel.isEmpty() ? getRange(editor, sel.getHeadBufferPosition().row) : getSelection(editor, sel)
136136
}
137137
})
138138
return ranges.filter(({ range }) => {
139-
return range && ed.getTextInBufferRange(range).trim()
139+
return range && editor.getTextInBufferRange(range).trim()
140140
})
141141
}
142142

143-
export function get(ed) {
144-
return getRanges(ed).map(({ range, selection }) => {
143+
export function get(editor) {
144+
return getRanges(editor).map(({ range, selection }) => {
145145
return {
146146
range,
147147
selection,
148148
line: range[0][0],
149-
text: ed.getTextInBufferRange(range)
149+
text: editor.getTextInBufferRange(range)
150150
}
151151
})
152152
}
@@ -165,10 +165,10 @@ export function getLocalContext(editor, row) {
165165
}
166166
}
167167

168-
export function select(ed = atom.workspace.getActiveTextEditor()) {
169-
if (!ed) return
170-
return ed.mutateSelectedText(selection => {
171-
const range = getRange(ed, selection.getHeadBufferPosition().row)
168+
export function select(editor = atom.workspace.getActiveTextEditor()) {
169+
if (!editor) return
170+
return editor.mutateSelectedText(selection => {
171+
const range = getRange(editor, selection.getHeadBufferPosition().row)
172172
if (range) {
173173
selection.setBufferRange(range)
174174
}

0 commit comments

Comments
 (0)