From 2aff69b0bb55f398d199db687617ed35d0335d5b Mon Sep 17 00:00:00 2001 From: Josh Rahm Date: Sun, 10 Mar 2024 23:53:04 -0600 Subject: Added multiple strategies for deteriming the column. Doing a full grid select can be intimidating. A word-wise strat is probably a good thing to have. --- lua/warp/strategy/default.lua | 92 +++++++++++++++++++++++++++++++++++++++++++ lua/warp/strategy/null.lua | 12 ++++++ lua/warp/strategy/words.lua | 84 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+) create mode 100644 lua/warp/strategy/default.lua create mode 100644 lua/warp/strategy/null.lua create mode 100644 lua/warp/strategy/words.lua (limited to 'lua/warp') diff --git a/lua/warp/strategy/default.lua b/lua/warp/strategy/default.lua new file mode 100644 index 0000000..55019d8 --- /dev/null +++ b/lua/warp/strategy/default.lua @@ -0,0 +1,92 @@ +local vim = assert(vim) + +local M = {} + +local hsel1 = "tnshrdlcumwfgypkbvjxqz" -- 21 +local hsel2 = "aeiou" -- 5 + +local function char_at(s, i) + local m = (i % #s) + 1 + return string.sub(s, m, m) +end + +local function make_big_line() + local col = 0 + local line = '' + + local v = '' + local c = nil + local i = 0 + local col_map = {} + while true do + v = char_at(hsel1, i) + if c then + if col_map[v .. c] then break end + col_map[c .. v] = col + end + c = char_at(hsel2, i) + if col_map[c .. v] then break end + line = line .. v + col = col + 1 + line = line .. c + col_map[v .. c] = col + col = col + 1 + i = i + 1 + end + + return line, col_map +end + +local big_line, col_map = make_big_line() + +M.default_strategy = function () + local filter + + return { + display = function () + local curpos = vim.api.nvim_win_get_cursor(0) + local line_at = vim.fn.getline(curpos[1]) + local unfiltered = big_line:sub(1, #line_at + 1) + local line = unfiltered + + if filter then + line = "" + local i = 1 + while i <= #unfiltered do + local curch = char_at(unfiltered, i - 1) + if curch == filter then + line = line .. char_at(unfiltered, i) + else + line = line .. ' ' + end + i = i + 1 + end + end + + return line + end, + + on_char = function (ch) + if not filter then + if ch == '$' or ch == '^' then + vim.cmd("normal! " .. ch) + return false + elseif not ch:match('[a-z]') then + vim.cmd("normal! f" .. ch) + return false + else + filter = ch + return true + end + else + if col_map[filter .. ch] then + vim.cmd("normal! " .. col_map[filter .. ch] .. "|") + end + end + + return false + end + } +end + +return M diff --git a/lua/warp/strategy/null.lua b/lua/warp/strategy/null.lua new file mode 100644 index 0000000..9464547 --- /dev/null +++ b/lua/warp/strategy/null.lua @@ -0,0 +1,12 @@ +local vim = assert(vim) + +local M = {} + +M.null_strategy = function () + return { + display = function () return nil end, + on_char = function () return false end + } +end + +return M diff --git a/lua/warp/strategy/words.lua b/lua/warp/strategy/words.lua new file mode 100644 index 0000000..d255203 --- /dev/null +++ b/lua/warp/strategy/words.lua @@ -0,0 +1,84 @@ +local vim = assert(vim) + +local M = {} +local alphabet = "etansihrdlocumwfgypkbvjxqz" + +local function split_lines(line) + local i + local j = 1 + + local chars_to_col = {} + local col_to_chars = {} + + local run_regex = function(rx, off) + if #alphabet < j then + return + end + + if not off then + off = 0 + end + + i = 0 + while true do + i = string.find(line, rx, i) + if i == nil then break end + i = i + 1 + + if #alphabet < j then + return + end + + local nextalph = alphabet:sub(j, j) + j = j + 1 + chars_to_col[nextalph] = i + off + col_to_chars[i + off] = nextalph + end + end + + run_regex("%W%w") + run_regex("%s%S") + run_regex("%w%W", - 1) + + local winstr = "" + i = 1 + while i <= #line do + if col_to_chars[i] then + winstr = winstr .. col_to_chars[i] + else + winstr = winstr .. " " + end + i = i + 1 + end + + return winstr, chars_to_col +end + +M.words_strategy = function () + local chartab + + return { + display = function () + local curpos = vim.api.nvim_win_get_cursor(0) + local line_at = vim.fn.getline(curpos[1]) + local str, tab = split_lines(line_at) + chartab = tab + return str + end, + + on_char = function (ch) + if ch == '$' or ch == '^' then + vim.cmd("normal! " .. ch) + elseif not ch:match('[a-z]') then + vim.cmd("normal! f" .. ch) + else + if chartab[ch] then + vim.cmd("norma! " .. chartab[ch] .. "|") + end + end + return false + end + } +end + +return M -- cgit