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

Reverted find fixes.

This commit is contained in:
Adam Harrison 2021-07-15 18:15:05 -04:00
parent 6bcdaa9d7a
commit 0dda252096
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
data/core/commands/findreplace.lua
View File

@ -10,8 +10,8 @@ local StatusView = require "core.statusview"
local max_last_finds = 50 local max_last_finds = 50
local last_finds, last_view, last_fn, last_text, last_sel local last_finds, last_view, last_fn, last_text, last_sel
local case_insensitive = config.find_case_insensitive or false local case_sensitive = config.find_case_sensitive or false
local plain = config.find_plain or false local find_regex = config.find_regex or false
local function doc() local function doc()
return last_view and last_view.doc or core.active_view.doc return last_view and last_view.doc or core.active_view.doc
@ -19,18 +19,18 @@ end
local function get_find_tooltip() local function get_find_tooltip()
local rf = keymap.get_binding("find-replace:repeat-find") local rf = keymap.get_binding("find-replace:repeat-find")
local ti = keymap.get_binding("find-replace:toggle-insensitivity") local ti = keymap.get_binding("find-replace:toggle-sensitivity")
local tr = keymap.get_binding("find-replace:toggle-plain") local tr = keymap.get_binding("find-replace:toggle-regex")
return (plain and "[Plain] " or "") .. return (find_regex and "[Regex] " or "") ..
(case_insensitive and "[Insensitive] " or "") .. (case_sensitive and "[Sensitive] " or "") ..
(rf and ("Press " .. rf .. " to select the next match.") or "") .. (rf and ("Press " .. rf .. " to select the next match.") or "") ..
(ti and (" " .. ti .. " toggles case sensitivity.") or "") .. (ti and (" " .. ti .. " toggles case sensitivity.") or "") ..
(tr and (" " .. tr .. " toggles plain find.") or "") (tr and (" " .. tr .. " toggles regex find.") or "")
end end
local function update_preview(sel, search_fn, text) local function update_preview(sel, search_fn, text)
local ok, line1, col1, line2, col2 = local ok, line1, col1, line2, col2 =
pcall(search_fn, last_view.doc, sel[1], sel[2], text, case_insensitive, plain) pcall(search_fn, last_view.doc, sel[1], sel[2], text, case_sensitive, find_regex)
if ok and line1 and text ~= "" then if ok and line1 and text ~= "" then
last_view.doc:set_selection(line2, col2, line1, col1) last_view.doc:set_selection(line2, col2, line1, col1)
last_view:scroll_to_line(line2, true) last_view:scroll_to_line(line2, true)
@ -105,15 +105,15 @@ command.add(has_selection, {
command.add("core.docview", { command.add("core.docview", {
["find-replace:find"] = function() ["find-replace:find"] = function()
find("Find Text", function(doc, line, col, text, case_insensitive, plain) find("Find Text", function(doc, line, col, text, case_sensitive, find_regex)
local opt = { wrap = true, no_case = case_insensitive, regex = not plain } local opt = { wrap = true, no_case = not case_sensitive, regex = find_regex }
return search.find(doc, line, col, text, opt) return search.find(doc, line, col, text, opt)
end) end)
end, end,
["find-replace:replace"] = function() ["find-replace:replace"] = function()
replace("Text", doc():get_text(doc():get_selection(true)), function(text, old, new) replace("Text", doc():get_text(doc():get_selection(true)), function(text, old, new)
if plain then if not find_regex then
return text:gsub(old:gsub("%W", "%%%1"), new:gsub("%%", "%%%%"), nil) return text:gsub(old:gsub("%W", "%%%1"), new:gsub("%%", "%%%%"), nil)
end end
local result, matches = regex.gsub(regex.compile(old), text, new) local result, matches = regex.gsub(regex.compile(old), text, new)
@ -150,7 +150,7 @@ command.add(valid_for_finding, {
core.error("No find to continue from") core.error("No find to continue from")
else else
local sl1, sc1, sl2, sc2 = doc():get_selection(true) local sl1, sc1, sl2, sc2 = doc():get_selection(true)
local line1, col1, line2, col2 = last_fn(doc(), sl1, sc2, last_text, case_insensitive, plain) local line1, col1, line2, col2 = last_fn(doc(), sl1, sc2, last_text, case_sensitive, find_regex)
if line1 then if line1 then
if last_view.doc ~= doc() then if last_view.doc ~= doc() then
last_finds = {} last_finds = {}
@ -177,14 +177,14 @@ command.add(valid_for_finding, {
}) })
command.add("core.commandview", { command.add("core.commandview", {
["find-replace:toggle-insensitivity"] = function() ["find-replace:toggle-sensitivity"] = function()
case_insensitive = not case_insensitive case_sensitive = not case_sensitive
core.status_view:show_tooltip(get_find_tooltip()) core.status_view:show_tooltip(get_find_tooltip())
update_preview(last_sel, last_fn, last_text) update_preview(last_sel, last_fn, last_text)
end, end,
["find-replace:toggle-plain"] = function() ["find-replace:toggle-regex"] = function()
plain = not plain find_regex = not find_regex
core.status_view:show_tooltip(get_find_tooltip()) core.status_view:show_tooltip(get_find_tooltip())
update_preview(last_sel, last_fn, last_text) update_preview(last_sel, last_fn, last_text)
end end