diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/autoinsert.lua | 14 | ||||
| -rw-r--r-- | plugins/colorpreview.lua | 14 | ||||
| -rw-r--r-- | plugins/dragdropselected.lua | 16 | ||||
| -rw-r--r-- | plugins/regexreplacepreview.lua | 16 | ||||
| -rw-r--r-- | plugins/selectionhighlight.lua | 13 | ||||
| -rw-r--r-- | plugins/sort.lua | 13 |
6 files changed, 8 insertions, 78 deletions
diff --git a/plugins/autoinsert.lua b/plugins/autoinsert.lua index a210955..b5fb783 100644 --- a/plugins/autoinsert.lua +++ b/plugins/autoinsert.lua @@ -18,18 +18,6 @@ config.plugins.autoinsert = common.merge({ map = { } }, config.plugins.autoinsert) --- Workaround for bug in Lite XL 2.1 --- Remove this when b029f5993edb7dee5ccd2ba55faac1ec22e24609 is in a release -local function get_selection(doc, sort) - local line1, col1, line2, col2 = doc:get_selection_idx(doc.last_selection) - if line1 then - return doc:get_selection_idx(doc.last_selection, sort) - else - return doc:get_selection_idx(1, sort) - end -end - - local function is_closer(chr) for _, v in pairs(config.plugins.autoinsert.map) do if v == chr then @@ -63,7 +51,7 @@ function DocView:on_text_input(text) -- wrap selection if we have a selection if mapping and self.doc:has_selection() then - local l1, c1, l2, c2, swap = get_selection(self.doc, true) + local l1, c1, l2, c2, swap = self.doc:get_selection(true) self.doc:insert(l2, c2, mapping) self.doc:insert(l1, c1, text) self.doc:set_selection(l1, c1, l2, c2 + 2, swap) diff --git a/plugins/colorpreview.lua b/plugins/colorpreview.lua index 16a5293..0aa7663 100644 --- a/plugins/colorpreview.lua +++ b/plugins/colorpreview.lua @@ -24,18 +24,6 @@ local black = { common.color "#000000" } local tmp = {} --- Workaround for bug in Lite XL 2.1 --- Remove this when b029f5993edb7dee5ccd2ba55faac1ec22e24609 is in a release -local function get_selection(doc, sort) - local line1, col1, line2, col2 = doc:get_selection_idx(doc.last_selection) - if line1 then - return doc:get_selection_idx(doc.last_selection, sort) - else - return doc:get_selection_idx(1, sort) - end -end - - local function draw_color_previews(self, line, x, y, ptn, base, nibbles) local text = self.doc.lines[line] local s, e = 0, 0 @@ -70,7 +58,7 @@ local function draw_color_previews(self, line, x, y, ptn, base, nibbles) local text_color = math.max(r, g, b) < 128 and white or black tmp[1], tmp[2], tmp[3], tmp[4] = r, g, b, a - local l1, _, l2, _ = get_selection(self.doc, true) + local l1, _, l2, _ = self.doc:get_selection(true) if not (self.doc:has_selection() and line >= l1 and line <= l2) then renderer.draw_rect(x1, y, x2 - x1, self:get_line_height(), tmp) diff --git a/plugins/dragdropselected.lua b/plugins/dragdropselected.lua index 144c4da..8f41ec3 100644 --- a/plugins/dragdropselected.lua +++ b/plugins/dragdropselected.lua @@ -14,18 +14,6 @@ local core = require "core" local keymap = require "core.keymap" local style = require "core.style" --- Workaround for bug in Lite XL 2.1 --- Remove this when b029f5993edb7dee5ccd2ba55faac1ec22e24609 is in a release -local function get_selection(doc, sort) - local line1, col1, line2, col2 = doc:get_selection_idx(doc.last_selection) - if line1 then - return doc:get_selection_idx(doc.last_selection, sort) - else - return doc:get_selection_idx(1, sort) - end -end - - -- helper function for on_mouse_pressed to determine if mouse down is in selection -- iLine is line number where mouse down happened -- iCol is column where mouse down happened @@ -43,7 +31,7 @@ end -- isInSelection -- distance between two points local function distance(x1, y1, x2, y2) - return math.sqrt(math.pow(x2-x1, 2)+math.pow(y2-y1, 2)) + return math.sqrt((x2-x1)^2+(y2-y1)^2) end local min_drag = style.code_font:get_width(" ") @@ -108,7 +96,7 @@ function DocView:on_mouse_pressed(button, x, y, clicks) -- convert pixel coordinates to line and column coordinates local iLine, iCol = self:resolve_screen_position(x, y) -- get selection coordinates - local iSelLine1, iSelCol1, iSelLine2, iSelCol2 = get_selection(self.doc, true) + local iSelLine1, iSelCol1, iSelLine2, iSelCol2 = self.doc:get_selection(true) -- set flag for on_mouse_released and on_mouse_moved() methods to detect dragging self.bClickedIntoSelection = isInSelection(iLine, iCol, iSelLine1, iSelCol1, iSelLine2, iSelCol2) diff --git a/plugins/regexreplacepreview.lua b/plugins/regexreplacepreview.lua index 7675d54..a0d416e 100644 --- a/plugins/regexreplacepreview.lua +++ b/plugins/regexreplacepreview.lua @@ -65,18 +65,6 @@ local function substitute(pattern_string, str, replacement) return table.concat(result) .. str:sub(offset), matches, replacements end --- Workaround for bug in Lite XL 2.1 --- Remove this when b029f5993edb7dee5ccd2ba55faac1ec22e24609 is in a release -local function get_selection(doc, sort) - local line1, col1, line2, col2 = doc:get_selection_idx(doc.last_selection) - if line1 then - return doc:get_selection_idx(doc.last_selection, sort) - else - return doc:get_selection_idx(1, sort) - end -end - - -- Takes the following pattern: /pattern/replace/ -- Capture groupings can be replaced using \1 through \9 local function regex_replace_file(view, pattern, old_lines, raw, start_line, end_line) @@ -165,8 +153,8 @@ command.add("core.docview!", { ["regex-replace-preview:find-replace-regex"] = function(view) local old_lines = {} local doc = view.doc - local original_selection = { get_selection(doc, true) } - local selection = doc:has_selection() and { get_selection(doc, true) } or {} + local original_selection = { doc:get_selection(true) } + local selection = doc:has_selection() and { doc:get_selection(true) } or {} core.command_view:enter("Regex Replace (enter pattern as /old/new/)", { text = "/", submit = function(pattern) diff --git a/plugins/selectionhighlight.lua b/plugins/selectionhighlight.lua index f9bb01e..133dced 100644 --- a/plugins/selectionhighlight.lua +++ b/plugins/selectionhighlight.lua @@ -4,17 +4,6 @@ local DocView = require "core.docview" -- originally written by luveti --- Workaround for bug in Lite XL 2.1 --- Remove this when b029f5993edb7dee5ccd2ba55faac1ec22e24609 is in a release -local function get_selection(doc, sort) - local line1, col1, line2, col2 = doc:get_selection_idx(doc.last_selection) - if line1 then - return doc:get_selection_idx(doc.last_selection, sort) - else - return doc:get_selection_idx(1, sort) - end -end - local function draw_box(x, y, w, h, color) local r = renderer.draw_rect local s = math.ceil(SCALE) @@ -29,7 +18,7 @@ local draw_line_body = DocView.draw_line_body function DocView:draw_line_body(line, x, y) local line_height = draw_line_body(self, line, x, y) - local line1, col1, line2, col2 = get_selection(self.doc, true) + local line1, col1, line2, col2 = self.doc:get_selection(true) if line1 == line2 and col1 ~= col2 then local selection = self.doc:get_text(line1, col1, line2, col2) if not selection:match("^%s+$") then diff --git a/plugins/sort.lua b/plugins/sort.lua index 899475e..b933bb4 100644 --- a/plugins/sort.lua +++ b/plugins/sort.lua @@ -3,17 +3,6 @@ local core = require "core" local command = require "core.command" local translate = require "core.doc.translate" --- Workaround for bug in Lite XL 2.1 --- Remove this when b029f5993edb7dee5ccd2ba55faac1ec22e24609 is in a release -local function get_selection(doc, sort) - local line1, col1, line2, col2 = doc:get_selection_idx(doc.last_selection) - if line1 then - return doc:get_selection_idx(doc.last_selection, sort) - else - return doc:get_selection_idx(1, sort) - end -end - local function split_lines(text) local res = {} for line in (text .. "\n"):gmatch("(.-)\n") do @@ -26,7 +15,7 @@ command.add("core.docview!", { ["sort:sort"] = function(dv) local doc = dv.doc - local l1, c1, l2, c2, swap = get_selection(doc, true) + local l1, c1, l2, c2, swap = doc:get_selection(true) l1, c1 = translate.start_of_line(doc, l1, c1) l2, c2 = translate.end_of_line(doc, l2, c2) doc:set_selection(l1, c1, l2, c2, swap) |