Merge text.love
This commit is contained in:
commit
63031e822d
70
search.lua
70
search.lua
|
@ -18,38 +18,45 @@ end
|
|||
|
||||
function Text.search_next(State)
|
||||
-- search current line from cursor
|
||||
local pos = find(State.lines[State.cursor1.line].data, State.search_term, State.cursor1.pos, --[[literal]] true)
|
||||
if pos then
|
||||
State.cursor1.pos = pos
|
||||
local curr_pos = State.cursor1.pos
|
||||
local curr_line = State.lines[State.cursor1.line].data
|
||||
local curr_offset = Text.offset(curr_line, curr_pos)
|
||||
local offset = find(curr_line, State.search_term, curr_offset, --[[literal]] true)
|
||||
if offset then
|
||||
State.cursor1.pos = utf8.len(curr_line, 1, offset)
|
||||
end
|
||||
if pos == nil then
|
||||
if offset == nil then
|
||||
-- search lines below cursor
|
||||
for i=State.cursor1.line+1,#State.lines do
|
||||
pos = find(State.lines[i].data, State.search_term, --[[from start]] nil, --[[literal]] true)
|
||||
if pos then
|
||||
State.cursor1 = {line=i, pos=pos}
|
||||
local curr_line = State.lines[i].data
|
||||
offset = find(curr_line, State.search_term, --[[from start]] nil, --[[literal]] true)
|
||||
if offset then
|
||||
State.cursor1 = {line=i, pos=utf8.len(curr_line, 1, offset)}
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
if pos == nil then
|
||||
if offset == nil then
|
||||
-- wrap around
|
||||
for i=1,State.cursor1.line-1 do
|
||||
pos = find(State.lines[i].data, State.search_term, --[[from start]] nil, --[[literal]] true)
|
||||
if pos then
|
||||
State.cursor1 = {line=i, pos=pos}
|
||||
local curr_line = State.lines[i].data
|
||||
offset = find(curr_line, State.search_term, --[[from start]] nil, --[[literal]] true)
|
||||
if offset then
|
||||
State.cursor1 = {line=i, pos=utf8.len(curr_line, 1, offset)}
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
if pos == nil then
|
||||
if offset == nil then
|
||||
-- search current line until cursor
|
||||
pos = find(State.lines[State.cursor1.line].data, State.search_term, --[[from start]] nil, --[[literal]] true)
|
||||
local curr_line = State.lines[State.cursor1.line].data
|
||||
offset = find(curr_line, State.search_term, --[[from start]] nil, --[[literal]] true)
|
||||
local pos = utf8.len(curr_line, 1, offset)
|
||||
if pos and pos < State.cursor1.pos then
|
||||
State.cursor1.pos = pos
|
||||
end
|
||||
end
|
||||
if pos == nil then
|
||||
if offset == nil then
|
||||
State.cursor1.line = State.search_backup.cursor.line
|
||||
State.cursor1.pos = State.search_backup.cursor.pos
|
||||
State.screen_top1.line = State.search_backup.screen_top.line
|
||||
|
@ -64,38 +71,45 @@ end
|
|||
|
||||
function Text.search_previous(State)
|
||||
-- search current line before cursor
|
||||
local pos = rfind(State.lines[State.cursor1.line].data, State.search_term, State.cursor1.pos-1, --[[literal]] true)
|
||||
if pos then
|
||||
State.cursor1.pos = pos
|
||||
local curr_pos = State.cursor1.pos
|
||||
local curr_line = State.lines[State.cursor1.line].data
|
||||
local curr_offset = Text.offset(curr_line, curr_pos)
|
||||
local offset = rfind(curr_line, State.search_term, curr_offset-1, --[[literal]] true)
|
||||
if offset then
|
||||
State.cursor1.pos = utf8.len(curr_line, 1, offset)
|
||||
end
|
||||
if pos == nil then
|
||||
if offset == nil then
|
||||
-- search lines above cursor
|
||||
for i=State.cursor1.line-1,1,-1 do
|
||||
pos = rfind(State.lines[i].data, State.search_term, --[[from end]] nil, --[[literal]] true)
|
||||
if pos then
|
||||
State.cursor1 = {line=i, pos=pos}
|
||||
local curr_line = State.lines[i].data
|
||||
offset = rfind(curr_line, State.search_term, --[[from end]] nil, --[[literal]] true)
|
||||
if offset then
|
||||
State.cursor1 = {line=i, pos=utf8.len(curr_line, 1, offset)}
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
if pos == nil then
|
||||
if offset == nil then
|
||||
-- wrap around
|
||||
for i=#State.lines,State.cursor1.line+1,-1 do
|
||||
pos = rfind(State.lines[i].data, State.search_term, --[[from end]] nil, --[[literal]] true)
|
||||
if pos then
|
||||
State.cursor1 = {line=i, pos=pos}
|
||||
local curr_line = State.lines[i].data
|
||||
offset = rfind(curr_line, State.search_term, --[[from end]] nil, --[[literal]] true)
|
||||
if offset then
|
||||
State.cursor1 = {line=i, pos=utf8.len(curr_line, 1, offset)}
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
if pos == nil then
|
||||
if offset == nil then
|
||||
-- search current line after cursor
|
||||
pos = rfind(State.lines[State.cursor1.line].data, State.search_term, --[[from end]] nil, --[[literal]] true)
|
||||
local curr_line = State.lines[State.cursor1.line].data
|
||||
offset = rfind(curr_line, State.search_term, --[[from end]] nil, --[[literal]] true)
|
||||
local pos = utf8.len(curr_line, 1, offset)
|
||||
if pos and pos > State.cursor1.pos then
|
||||
State.cursor1.pos = pos
|
||||
end
|
||||
end
|
||||
if pos == nil then
|
||||
if offset == nil then
|
||||
State.cursor1.line = State.search_backup.cursor.line
|
||||
State.cursor1.pos = State.search_backup.cursor.pos
|
||||
State.screen_top1.line = State.search_backup.screen_top.line
|
||||
|
|
|
@ -1858,7 +1858,7 @@ end
|
|||
function test_search()
|
||||
App.screen.init{width=120, height=60}
|
||||
Editor_state = edit.initialize_test_state()
|
||||
Editor_state.lines = load_array{'abc', 'def', 'ghi', 'deg'}
|
||||
Editor_state.lines = load_array{'abc', 'def', 'ghi', '’deg'} -- contains unicode quote in final line
|
||||
Text.redraw_all(Editor_state)
|
||||
Editor_state.cursor1 = {line=1, pos=1}
|
||||
Editor_state.screen_top1 = {line=1, pos=1}
|
||||
|
@ -1879,15 +1879,15 @@ function test_search()
|
|||
edit.run_after_keychord(Editor_state, 'down')
|
||||
edit.run_after_keychord(Editor_state, 'return')
|
||||
check_eq(Editor_state.cursor1.line, 4, '2/cursor:line')
|
||||
check_eq(Editor_state.cursor1.pos, 1, '2/cursor:pos')
|
||||
check_eq(Editor_state.cursor1.pos, 2, '2/cursor:pos')
|
||||
end
|
||||
|
||||
function test_search_upwards()
|
||||
App.screen.init{width=120, height=60}
|
||||
Editor_state = edit.initialize_test_state()
|
||||
Editor_state.lines = load_array{'abc abd'}
|
||||
Editor_state.lines = load_array{'’abc', 'abd'} -- contains unicode quote
|
||||
Text.redraw_all(Editor_state)
|
||||
Editor_state.cursor1 = {line=1, pos=2}
|
||||
Editor_state.cursor1 = {line=2, pos=1}
|
||||
Editor_state.screen_top1 = {line=1, pos=1}
|
||||
Editor_state.screen_bottom1 = {}
|
||||
edit.draw(Editor_state)
|
||||
|
@ -1897,15 +1897,15 @@ function test_search_upwards()
|
|||
-- search for previous occurrence
|
||||
edit.run_after_keychord(Editor_state, 'up')
|
||||
check_eq(Editor_state.cursor1.line, 1, '2/cursor:line')
|
||||
check_eq(Editor_state.cursor1.pos, 1, '2/cursor:pos')
|
||||
check_eq(Editor_state.cursor1.pos, 2, '2/cursor:pos')
|
||||
end
|
||||
|
||||
function test_search_wrap()
|
||||
App.screen.init{width=120, height=60}
|
||||
Editor_state = edit.initialize_test_state()
|
||||
Editor_state.lines = load_array{'abc'}
|
||||
Editor_state.lines = load_array{'’abc', 'def'} -- contains unicode quote in first line
|
||||
Text.redraw_all(Editor_state)
|
||||
Editor_state.cursor1 = {line=1, pos=3}
|
||||
Editor_state.cursor1 = {line=2, pos=1}
|
||||
Editor_state.screen_top1 = {line=1, pos=1}
|
||||
Editor_state.screen_bottom1 = {}
|
||||
edit.draw(Editor_state)
|
||||
|
@ -1915,13 +1915,13 @@ function test_search_wrap()
|
|||
edit.run_after_keychord(Editor_state, 'return')
|
||||
-- cursor wraps
|
||||
check_eq(Editor_state.cursor1.line, 1, '1/cursor:line')
|
||||
check_eq(Editor_state.cursor1.pos, 1, '1/cursor:pos')
|
||||
check_eq(Editor_state.cursor1.pos, 2, '1/cursor:pos')
|
||||
end
|
||||
|
||||
function test_search_wrap_upwards()
|
||||
App.screen.init{width=120, height=60}
|
||||
Editor_state = edit.initialize_test_state()
|
||||
Editor_state.lines = load_array{'abc abd'}
|
||||
Editor_state.lines = load_array{'abc ’abd'} -- contains unicode quote
|
||||
Text.redraw_all(Editor_state)
|
||||
Editor_state.cursor1 = {line=1, pos=1}
|
||||
Editor_state.screen_top1 = {line=1, pos=1}
|
||||
|
@ -1933,5 +1933,5 @@ function test_search_wrap_upwards()
|
|||
edit.run_after_keychord(Editor_state, 'up')
|
||||
-- cursor wraps
|
||||
check_eq(Editor_state.cursor1.line, 1, '1/cursor:line')
|
||||
check_eq(Editor_state.cursor1.pos, 5, '1/cursor:pos')
|
||||
check_eq(Editor_state.cursor1.pos, 6, '1/cursor:pos')
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue