walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 15 Wiki Activity

Merge reverse find functions for lua patterns and regexes

This commit is contained in:
Guldoman 2021-10-10 00:42:30 +02:00
parent cfe0c79a04
commit 3a1274fd08
No known key found for this signature in database
GPG Key ID: C08A498EC7F1AFDD
1 changed files with 25 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
data/core/doc/search.lua
View File

@ -22,26 +22,20 @@ local function init_args(doc, line, col, text, opt)
return doc, line, col, text, opt return doc, line, col, text, opt
end end
-- This function is needed to uniform the behavior of
-- `regex:cmatch` and `string.find`.
local function regex_func(text, re, index, _)
local s, e = re:cmatch(text, index)
return s, e and e - 1
end
local function rfind(text, pattern, index, plain) local function rfind(func, text, pattern, index, plain)
local s, e = text:find(pattern, 1, plain) local s, e = func(text, pattern, 1, plain)
local last_s, last_e local last_s, last_e
if index < 0 then index = #text - index + 1 end if index < 0 then index = #text - index + 1 end
while e and e <= index do while e and e <= index do
last_s, last_e = s, e last_s, last_e = s, e
s, e = text:find(pattern, s + 1, plain) s, e = func(text, pattern, s + 1, plain)
end
return last_s, last_e
end
local function rcmatch(re, text, index)
local s, e = re:cmatch(text)
local last_s, last_e
if index < 0 then index = #text - index + 1 end
while e and e <= index + 1 do
last_s, last_e = s, e
s, e = re:cmatch(text, s + 1)
end end
return last_s, last_e return last_s, last_e
end end
@ -49,10 +43,11 @@ end
function search.find(doc, line, col, text, opt) function search.find(doc, line, col, text, opt)
doc, line, col, text, opt = init_args(doc, line, col, text, opt) doc, line, col, text, opt = init_args(doc, line, col, text, opt)
local pattern = text
local re local search_func = string.find
if opt.regex then if opt.regex then
re = regex.compile(text, opt.no_case and "i" or "") pattern = regex.compile(text, opt.no_case and "i" or "")
search_func = regex_func
end end
local start, finish, step = line, #doc.lines, 1 local start, finish, step = line, #doc.lines, 1
if opt.reverse then if opt.reverse then
@ -60,33 +55,20 @@ function search.find(doc, line, col, text, opt)
end end
for line = start, finish, step do for line = start, finish, step do
local line_text = doc.lines[line] local line_text = doc.lines[line]
if opt.regex then if opt.no_case and not opt.regex then
local s, e
if opt.reverse then
s, e = rcmatch(re, line_text, col - 1)
else
s, e = re:cmatch(line_text, col)
end
if s then
return line, s, line, e
end
col = opt.reverse and -1 or 1
else
if opt.no_case then
line_text = line_text:lower() line_text = line_text:lower()
end end
local s, e local s, e
if opt.reverse then if opt.reverse then
s, e = rfind(line_text, text, col - 1, true) s, e = rfind(search_func, line_text, pattern, col - 1)
else else
s, e = line_text:find(text, col, true) s, e = search_func(line_text, pattern, col)
end end
if s then if s then
return line, s, line, e + 1 return line, s, line, e + 1
end end
col = opt.reverse and -1 or 1 col = opt.reverse and -1 or 1
end end
end
if opt.wrap then if opt.wrap then
opt = { no_case = opt.no_case, regex = opt.regex, reverse = opt.reverse } opt = { no_case = opt.no_case, regex = opt.regex, reverse = opt.reverse }