From abbe21687ba9f028d43f861038440843237597d0 Mon Sep 17 00:00:00 2001 From: Georgi Kirilov <> Date: Sun, 22 Nov 2020 15:10:49 +0200 Subject: Fix nested escaping --- init.lua | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 27cf638..d8443b5 100644 --- a/init.lua +++ b/init.lua @@ -49,24 +49,6 @@ local function at_pos(t, pos) if pos.start + 1 >= t[1] and pos.finish < t[#t] then return t end end -local function asymmetric(d, escaped, pos) - local p - local I = l.Cp() - local skip = escaped and escaped + l.P(1) or l.P(1) - if #d == 1 then - p = (d - l.B"\\") * I * ("\\" * l.P(1) + (skip - d))^0 * I * d - else - p = d * I * (skip - d)^0 * I * d - end - return l.Ct(I * p * I) * l.Cc(pos) / at_pos -end - -local function symmetric(d1, d2, escaped, pos) - local I = l.Cp() - local skip = escaped and escaped + l.P(1) or l.P(1) - return l.P{l.Ct(I * d1 * I * ((skip - d1 - d2) + l.V(1))^0 * I * d2 * I) * l.Cc(pos) / at_pos} -end - local function nth_innermost(t, count) local start, finish, c = 0, 0, count if #t == 5 then @@ -78,11 +60,6 @@ local function nth_innermost(t, count) return start, finish end -local precedence = { - [vis.lexers.COMMENT] = {vis.lexers.STRING}, - [vis.lexers.STRING] = {}, -} - local function selection_range(win, pos) for selection in win:selections_iterator() do if selection.pos == pos then @@ -97,9 +74,7 @@ local function any_captures(_, position, t) if type(t) == "table" then return position, t end - if t then - prev_match = position - t - end + prev_match = position end local function not_past(_, position, pos) @@ -185,11 +160,9 @@ local function get_range(key, win, pos, file_data, count) o[i] = v - 1 + correction end end - return unpack(offsets) - else - pos = correction - 1 end - until hierarchy or pos < 0 + return unpack(offsets) + end end local function keep_last(acc, cur) -- cgit