diff options
Diffstat (limited to 'init.lua')
| -rw-r--r-- | init.lua | 49 |
1 files changed, 40 insertions, 9 deletions
@@ -6,13 +6,45 @@ require("vis") local vis = vis +require("lpeg") +local l = lpeg +local Cc, Cmt, Cp, P, R, V = l.Cc, l.Cmt, l.Cp, l.P, l.R, l.V + local M = {} + +-- Inverted and unrolled config table. +-- With this table format, make_shift() can use the same logic for both numeric and word increment/decrement. local lookup = {} + +-- Pattern that matches any one of the words listed in the config table. +local ordinal_words + local count -local inner_word = 0 local char_next = 17 +local function at_or_after(_, _, pos, start, finish) + if start and finish then + if pos >= start and pos < finish or pos < start then + return true, start, finish + end + end +end + +local function ordinal(win, pos) + local selection + for s in win:selections_iterator() do + if s.pos == pos then selection = s break end + end + local line = win.file.lines[selection.line] + local dec_num = P"-"^-1 * R"09"^1 + local patt = dec_num + ordinal_words + local start, finish = P{Cmt(Cc(selection.col) * Cp() * patt * Cp(), at_or_after) + 1 * V(1)}:match(line) + if not (start and finish) then return end + local line_begin = selection.pos - selection.col + 1 + return line_begin + start - 1, line_begin + finish - 1 +end + local function toggle(func, motion) return function(file, range, pos) local word = file:content(range) @@ -70,27 +102,26 @@ local function operator_new(key, handler, object, motion, help, novisual) end end --- Inverts and unrolls all config table entries. --- With this table format, make_shift() can use the same logic for both numeric and word increment/decrement. --- The original format is more sensible to humans, though. local function preprocess(tbl) - local cfg = {} + local cfg, ord = {}, P(-1) for _, options in ipairs(tbl) do for i, key in ipairs(options) do cfg[key] = {i, options} + ord = ord + key end end - return cfg + return cfg, ord end vis.events.subscribe(vis.events.INIT, function() - operator_new("<C-a>", toggle(increment), inner_word, nil, "Toggle/increment word or selection", true) - operator_new("<C-x>", toggle(decrement), inner_word, nil, "Toggle/decrement word or selection", true) + local ord_next = vis:textobject_register(ordinal) + operator_new("<C-a>", toggle(increment), ord_next, nil, "Toggle/increment word or number", true) + operator_new("<C-x>", toggle(decrement), ord_next, nil, "Toggle/decrement word or number", true) operator_new("~", toggle(case, true), nil, char_next, "Toggle case of character or selection") operator_new("g~", toggle(case), nil, nil, "Toggle-case operator") operator_new("gu", toggle(string.lower), nil, nil, "Lower-case operator") operator_new("gU", toggle(string.upper), nil, nil, "Upper-case operator") - lookup = preprocess(M) + lookup, ordinal_words = preprocess(M) vis:map(vis.modes.NORMAL, "g~~", "g~il") vis:map(vis.modes.NORMAL, "guu", "guil") vis:map(vis.modes.NORMAL, "gUU", "gUil") |