dap-python: refactor: remove `dap-python--equal'

`dap-python--equal' just replicated the functionality of `equal', and increased
the complexity of `dap-python'. Replace all uses of it with `equal' instead.

Author: nbfalcon

dap-python.el

@@ -84,35 +84,6 @@ https://github.com/pyenv/pyenv-which-ext."
   (type nil :type string)
   (location nil :type dap-python--location))
 
-(cl-defgeneric dap-python--equal (lhs rhs)
-  (:documentation "Check if lhs and rhs are equal"))
-
-(cl-defmethod dap-python--equal ((lhs symbol) (rhs symbol))
-  (eq lhs rhs))
-
-(cl-defmethod dap-python--equal ((lhs integer) (rhs integer))
-  (eq lhs rhs))
-
-(cl-defmethod dap-python--equal ((lhs string) (rhs string))
-  (string-equal lhs rhs))
-
-(cl-defmethod dap-python--equal ((lhs list) (rhs list))
-  (and (dap-python--equal (length lhs) (length rhs))
-       (-reduce (lambda (x y) (and x y)) (-zip-with 'dap-python--equal lhs rhs))))
-
-(cl-defmethod dap-python--equal ((lhs dap-python--point) (rhs dap-python--point))
-  (and (dap-python--equal (dap-python--point-line lhs) (dap-python--point-line rhs))
-       (dap-python--equal (dap-python--point-character lhs) (dap-python--point-character rhs))))
-
-(cl-defmethod dap-python--equal ((lhs dap-python--location) (rhs dap-python--location))
-  (and (dap-python--equal (dap-python--location-start lhs) (dap-python--location-start rhs))
-       (dap-python--equal (dap-python--location-end lhs) (dap-python--location-end rhs))))
-
-(cl-defmethod dap-python--equal ((lhs dap-python--symbol) (rhs dap-python--symbol))
-  (and (dap-python--equal (dap-python--symbol-name lhs) (dap-python--symbol-name rhs))
-       (dap-python--equal (dap-python--symbol-type lhs) (dap-python--symbol-type rhs))
-       (dap-python--equal (dap-python--symbol-location lhs) (dap-python--symbol-location rhs))))
-
 (lsp-defun dap-python--parse-lsp-symbol
   ((&DocumentSymbol
     :name :kind
@@ -141,17 +112,17 @@ https://github.com/pyenv/pyenv-which-ext."
 
 (defun dap-python--test-p (lsp-symbol)
   (let ((name (dap-python--symbol-name lsp-symbol)))
-    (and (dap-python--equal (dap-python--symbol-type lsp-symbol) "Function")
-               (s-starts-with? "test_" name))))
+    (and (string= (dap-python--symbol-type lsp-symbol) "Function")
+         (s-starts-with? "test_" name))))
 
 (defun dap-python--test-class-p (test-symbol lsp-symbol)
-  (when (dap-python--equal (dap-python--symbol-type lsp-symbol) "Class")
+  (when (string= (dap-python--symbol-type lsp-symbol) "Class")
     (let* ((class-location (dap-python--symbol-location lsp-symbol))
-                 (class-start-line (-> class-location dap-python--location-start dap-python--point-line))
-                 (class-end-line (-> class-location dap-python--location-end dap-python--point-line))
-                 (test-start-line (-> test-symbol dap-python--symbol-location dap-python--location-start dap-python--point-line)))
-            (and (> test-start-line class-start-line)
-                 (< test-start-line class-end-line)))))
+           (class-start-line (-> class-location dap-python--location-start dap-python--point-line))
+           (class-end-line (-> class-location dap-python--location-end dap-python--point-line))
+           (test-start-line (-> test-symbol dap-python--symbol-location dap-python--location-start dap-python--point-line)))
+      (and (> test-start-line class-start-line)
+           (< test-start-line class-end-line)))))
 
 (defun dap-python--nearest-test (lsp-symbols)
   (cl-callf reverse lsp-symbols)
@@ -175,11 +146,14 @@ https://github.com/pyenv/pyenv-which-ext."
        dap-python--nearest-test))
 
 (defun dap-python--template (template-name)
-  (->> dap-debug-template-configurations
-       (-first (-lambda ((name)) (dap-python--equal name template-name)))
-       cdr))
-
-(defun dap-python--debug-test-at-point ()
+  "Return the debug template whose name is TEMPLATE-NAME.
+For the name, only the template's `car' is checked, not its
+`:name' property."
+  (--first (string= template-name it) dap-debug-template-configurations))
+
+(defalias 'dap-python--debug-test-at-point #'dap-python-debug-test-at-point)
+(defun dap-python-debug-test-at-point ()
+  "Debug the pytest test under the cursor."
   (interactive)
   (dap-debug (dap-python--template "Python :: Run pytest (at point)")))
 

test/dap-test.el

@@ -65,33 +65,33 @@
 
 (ert-deftest dap--python-test-free-function ()
   (let* ((document-symbols
-    (list
-     #s(dap-python--symbol "dataclass" "Function" #s(dap-python--location #s(dap-python--point 0 0) #s(dap-python--point 0 33)))
-     #s(dap-python--symbol "Foo" "Class" #s(dap-python--location #s(dap-python--point 4 0) #s(dap-python--point 6 0)))
-     #s(dap-python--symbol "value" "Variable" #s(dap-python--location #s(dap-python--point 5 4) #s(dap-python--point 5 14)))
-     #s(dap-python--symbol "Bar" "Class" #s(dap-python--location #s(dap-python--point 9 0) #s(dap-python--point 11 0)))
-     #s(dap-python--symbol "value" "Variable" #s(dap-python--location #s(dap-python--point 10 4) #s(dap-python--point 10 14)))
-     #s(dap-python--symbol "test_foo" "Function" #s(dap-python--location #s(dap-python--point 13 0) #s(dap-python--point 16 0)))
-     #s(dap-python--symbol "foo" "Variable" #s(dap-python--location #s(dap-python--point 14 4) #s(dap-python--point 14 20)))
-     #s(dap-python--symbol "test_bar" "Function" #s(dap-python--location #s(dap-python--point 18 0) #s(dap-python--point 21 0)))
-     #s(dap-python--symbol "bar" "Variable" #s(dap-python--location #s(dap-python--point 19 4) #s(dap-python--point 19 20)))))
-
-   (cursor #s(dap-python--point 15 4))
-
-   (actual (dap-python--symbols-before-point cursor document-symbols))
-
-   (expected
-    (list
-     #s(dap-python--symbol "dataclass" "Function" #s(dap-python--location #s(dap-python--point 0 0) #s(dap-python--point 0 33)))
-     #s(dap-python--symbol "Foo" "Class" #s(dap-python--location #s(dap-python--point 4 0) #s(dap-python--point 6 0)))
-     #s(dap-python--symbol "value" "Variable" #s(dap-python--location #s(dap-python--point 5 4) #s(dap-python--point 5 14)))
-     #s(dap-python--symbol "Bar" "Class" #s(dap-python--location #s(dap-python--point 9 0) #s(dap-python--point 11 0)))
-     #s(dap-python--symbol "value" "Variable" #s(dap-python--location #s(dap-python--point 10 4) #s(dap-python--point 10 14)))
-     #s(dap-python--symbol "test_foo" "Function" #s(dap-python--location #s(dap-python--point 13 0) #s(dap-python--point 16 0)))
-     #s(dap-python--symbol "foo" "Variable" #s(dap-python--location #s(dap-python--point 14 4) #s(dap-python--point 14 20))))))
-
-    (should (dap-python--equal actual expected))
-    (should (dap-python--equal (dap-python--nearest-test expected) "::test_foo"))))
+          (list
+           #s(dap-python--symbol "dataclass" "Function" #s(dap-python--location #s(dap-python--point 0 0) #s(dap-python--point 0 33)))
+           #s(dap-python--symbol "Foo" "Class" #s(dap-python--location #s(dap-python--point 4 0) #s(dap-python--point 6 0)))
+           #s(dap-python--symbol "value" "Variable" #s(dap-python--location #s(dap-python--point 5 4) #s(dap-python--point 5 14)))
+           #s(dap-python--symbol "Bar" "Class" #s(dap-python--location #s(dap-python--point 9 0) #s(dap-python--point 11 0)))
+           #s(dap-python--symbol "value" "Variable" #s(dap-python--location #s(dap-python--point 10 4) #s(dap-python--point 10 14)))
+           #s(dap-python--symbol "test_foo" "Function" #s(dap-python--location #s(dap-python--point 13 0) #s(dap-python--point 16 0)))
+           #s(dap-python--symbol "foo" "Variable" #s(dap-python--location #s(dap-python--point 14 4) #s(dap-python--point 14 20)))
+           #s(dap-python--symbol "test_bar" "Function" #s(dap-python--location #s(dap-python--point 18 0) #s(dap-python--point 21 0)))
+           #s(dap-python--symbol "bar" "Variable" #s(dap-python--location #s(dap-python--point 19 4) #s(dap-python--point 19 20)))))
+
+         (cursor #s(dap-python--point 15 4))
+
+         (actual (dap-python--symbols-before-point cursor document-symbols))
+
+         (expected
+          (list
+           #s(dap-python--symbol "dataclass" "Function" #s(dap-python--location #s(dap-python--point 0 0) #s(dap-python--point 0 33)))
+           #s(dap-python--symbol "Foo" "Class" #s(dap-python--location #s(dap-python--point 4 0) #s(dap-python--point 6 0)))
+           #s(dap-python--symbol "value" "Variable" #s(dap-python--location #s(dap-python--point 5 4) #s(dap-python--point 5 14)))
+           #s(dap-python--symbol "Bar" "Class" #s(dap-python--location #s(dap-python--point 9 0) #s(dap-python--point 11 0)))
+           #s(dap-python--symbol "value" "Variable" #s(dap-python--location #s(dap-python--point 10 4) #s(dap-python--point 10 14)))
+           #s(dap-python--symbol "test_foo" "Function" #s(dap-python--location #s(dap-python--point 13 0) #s(dap-python--point 16 0)))
+           #s(dap-python--symbol "foo" "Variable" #s(dap-python--location #s(dap-python--point 14 4) #s(dap-python--point 14 20))))))
+
+    (should (equal actual expected))
+    (should (equal (dap-python--nearest-test expected) "::test_foo"))))
 
 (ert-deftest dap--python-test-class-method ()
   (let* ((document-symbols
@@ -121,8 +121,8 @@
            #s(dap-python--symbol "TestClass" "Class" #s(dap-python--location #s(dap-python--point 13 0) #s(dap-python--point 21 0)))
            #s(dap-python--symbol "test_foo" "Function" #s(dap-python--location #s(dap-python--point 14 4) #s(dap-python--point 17 0))))))
 
-    (should (dap-python--equal actual expected))
-    (should (dap-python--equal (dap-python--nearest-test expected) "::TestClass::test_foo"))))
+    (should (equal actual expected))
+    (should (equal (dap-python--nearest-test expected) "::TestClass::test_foo"))))
 
 (defun dap-launch-test--sanitize-json (s)
   "Delete all comments in S."