Add can_match

lua/gesture/command.lua

@@ -33,8 +33,8 @@ function M.draw(raw_opts)
   end
 
   local gesture = state.matcher:match(ctx)
-  local has_forward_match = state.matcher:has_forward_match(ctx)
-  state.view:render_input(ctx.inputs, gesture, has_forward_match, opts.show_board)
+  local can_match = state.matcher:can_match(ctx)
+  state.view:render_input(ctx.inputs, gesture, can_match, opts.show_board)
 end
 
 function M.suspend()

lua/gesture/core/gesture.lua

@@ -23,6 +23,7 @@ function Gesture.new(info)
     action = { info.action, { "string", "callable" } },
     inputs = { info.inputs, "table", true },
     match = { info.match, "function", true },
+    can_match = { info.can_match, "function", true },
     nowait = { info.nowait, "boolean", true },
     buffer = { info.buffer, { "string", "number" }, true },
   })
@@ -37,10 +38,24 @@ function Gesture.new(info)
     input_defs = require("gesture.core.input_definitions").new(info.inputs or {})
   end
 
+  local can_match
+  if info.can_match then
+    can_match = info.can_match
+  elseif info.match then
+    can_match = function(_)
+      return true
+    end
+  elseif input_defs then
+    can_match = function(ctx)
+      return input_defs:has_forward_match(ctx.inputs)
+    end
+  end
+
   local tbl = {
     name = info.name or "",
     input_defs = input_defs,
     _match = info.match,
+    can_match = can_match,
     nowait = info.nowait or false,
     buffer = bufnr,
     _action = action,
@@ -55,13 +70,6 @@ function Gesture.match(self, ctx)
   return self._match(ctx)
 end
 
-function Gesture.has_forward_match(self, ctx)
-  if not self._match then
-    return self.input_defs:has_forward_match(ctx.inputs)
-  end
-  return true
-end
-
 function Gesture.execute(self, ctx)
   local ok, result = pcall(self._action, ctx)
   if not ok then
@@ -92,9 +100,9 @@ function Gestures.add(self, gesture)
   table.insert(self._gestures, gesture)
 end
 
-function Gestures.has_forward_match(self, inputs)
+function Gestures.can_match(self, ctx)
   for _, gesture in ipairs(self._gestures) do
-    if gesture:has_forward_match(inputs) then
+    if gesture.can_match(ctx) then
       return true
     end
   end
@@ -176,7 +184,7 @@ function GestureMap._match(self, key, ctx)
   return gestures:match(ctx)
 end
 
-function GestureMap.has_forward_match(self, bufnr, ctx)
+function GestureMap.can_match(self, bufnr, ctx)
   vim.validate({ bufnr = { bufnr, "number" } })
   local input_strs = require("gesture.core.inputs").strings(ctx.inputs)
 
@@ -199,7 +207,7 @@ function GestureMap.has_forward_match(self, bufnr, ctx)
     },
   }
   for _, key_pair in ipairs(key_pairs) do
-    local matched = self:_has_forward_match(key_pair[1], key_pair[2], ctx)
+    local matched = self:_can_match(key_pair[1], key_pair[2], ctx)
     if matched then
       return matched
     end
@@ -208,10 +216,10 @@ function GestureMap.has_forward_match(self, bufnr, ctx)
   return false
 end
 
-function GestureMap._has_forward_match(self, nowait_key, key, ctx)
+function GestureMap._can_match(self, nowait_key, key, ctx)
   for k, gestures in pairs(self._map) do
     local key_matched = vim.startswith(key, nowait_key) or vim.startswith(k, key)
-    if key_matched and gestures:has_forward_match(ctx) then
+    if key_matched and gestures:can_match(ctx) then
       return true
     end
   end

lua/gesture/core/matcher.lua

@@ -20,8 +20,8 @@ function Matcher.match(self, ctx)
   return self._gesture_map:match(self._bufnr, ctx, false)
 end
 
-function Matcher.has_forward_match(self, ctx)
-  return self._gesture_map:has_forward_match(self._bufnr, ctx)
+function Matcher.can_match(self, ctx)
+  return self._gesture_map:can_match(self._bufnr, ctx)
 end
 
 return Matcher

lua/gesture/view/board.lua

@@ -13,7 +13,7 @@ end
 
 local hl_groups = require("gesture.view.highlight_group")
 
-function GestureBoard.create(inputs, gesture, has_forward_match, show_board)
+function GestureBoard.create(inputs, gesture, can_match, show_board)
   if #inputs == 0 or not show_board then
     return {}
   end
@@ -38,7 +38,7 @@ function GestureBoard.create(inputs, gesture, has_forward_match, show_board)
   local end_col = math.min(center + half_width, editor_width)
 
   local hl_group = hl_groups.GestureInput
-  if not has_forward_match then
+  if not can_match then
     hl_group = hl_groups.GestureInputNotMatched
   end
 

lua/gesture/view/init.lua

@@ -18,8 +18,8 @@ function View.open(winblend)
   return setmetatable(tbl, View), window_id
 end
 
-function View.render_input(self, inputs, gesture, has_forward_match, show_board)
-  local board_range_map = GestureBoard.create(inputs, gesture, has_forward_match, show_board)
+function View.render_input(self, inputs, gesture, can_match, show_board)
+  local board_range_map = GestureBoard.create(inputs, gesture, can_match, show_board)
   self._canvas:draw(board_range_map, self._new_points)
 end