From 4d3e8d8bd0a7de6cfcc478eb63dd9d5a5e2a17f9 Mon Sep 17 00:00:00 2001
From: jgmdev <jgmdev@gmail.com>
Date: Sun, 15 May 2022 16:10:57 -0400
Subject: [PATCH] command predicates: added support for strict matching by
 appending '!' on string predicates

---
 data/core/command.lua | 21 ++++++++++++++++-----
 data/core/object.lua  |  5 +----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/data/core/command.lua b/data/core/command.lua
index 39582de3..f54854a4 100644
--- a/data/core/command.lua
+++ b/data/core/command.lua
@@ -11,21 +11,32 @@ local always_true = function() return true end
 ---evaluation.
 ---
 ---If a string predicate is given it is treated as a require import that should
----return a valid object which is checked against the current active view, the
----sames applies if a table is given. A function that returns a boolean can be
----used instead to perform a custom evaluation, setting to nil means always
----evaluates to true.
+---return a valid object which is checked against the current active view,
+---eg: "core.docview" will match any view that inherits from DocView. Appending
+---a `!` at the end of the string means we want to match the given object
+---from the import strcitly eg: "core.docview!" only DocView is matched.
+---A function that returns a boolean can be used instead to perform a custom
+---evaluation, setting to nil means always evaluates to true.
 ---
 ---@param predicate string | table | function
 ---@return function
 function command.generate_predicate(predicate)
   predicate = predicate or always_true
+  local strict = false
   if type(predicate) == "string" then
+    if predicate:match("!$") then
+      strict = true
+      predicate = predicate:gsub("!$", "")
+    end
     predicate = require(predicate)
   end
   if type(predicate) == "table" then
     local class = predicate
-    predicate = function() return core.active_view:extends(class) end
+    if not strict then
+      predicate = function() return core.active_view:extends(class) end
+    else
+      predicate = function() return core.active_view:is(class) end
+    end
   end
   return predicate
 end
diff --git a/data/core/object.lua b/data/core/object.lua
index a57ac9e8..6a6ea490 100644
--- a/data/core/object.lua
+++ b/data/core/object.lua
@@ -21,10 +21,7 @@ end
 
 
 function Object:is(T)
-  if getmetatable(self) == T then
-    return true
-  end
-  return false
+  return getmetatable(self) == T
 end