branch: elpa/idris-mode
commit dde834fbaed08e7dfb5111f8efaa5d26f8ad88ad
Author: Marek L <[email protected]>
Commit: Marek L <[email protected]>
Simplify `idris-generate-def`, remove unused code and
add test for `idris-generate-def-next`
---
idris-commands.el | 12 +++---------
test/idris-commands-test.el | 44 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/idris-commands.el b/idris-commands.el
index d00e3cd6186..305e27bb0e7 100644
--- a/idris-commands.el
+++ b/idris-commands.el
@@ -806,10 +806,10 @@ Idris 2 only."
(prefix (idris-line-indentation-for what)))
(if (string= result "")
(error "Nothing found")
- (goto-char (line-beginning-position))
+ (beginning-of-line)
(forward-line)
(while (and (not (eobp))
- (progn (goto-char (line-beginning-position))
+ (progn (beginning-of-line)
(looking-at-p (concat prefix "\\s-+"))))
(forward-line))
(insert prefix)
@@ -818,13 +818,7 @@ Idris 2 only."
(insert result)
(setq def-region-end (point))
(newline)
- (goto-char final-point)
-; (save-excursion
-; (forward-line 1)
-; (setq def-region-start (point))
-; (insert result)
-; (setq def-region-end (point)))
- )))))
+ (goto-char final-point))))))
(defun idris-generate-def-next ()
"Replace the previous generated definition with next definition, if it
exists.
diff --git a/test/idris-commands-test.el b/test/idris-commands-test.el
index 0a9b815bc05..f1d42af1e12 100644
--- a/test/idris-commands-test.el
+++ b/test/idris-commands-test.el
@@ -500,6 +500,50 @@ closeDistance s1 s2 = closeDistance_rhs s1 s2"
(should (equal "/some/path/to/idris-project" (car result)))
(should (equal "src/Component/Foo.idr" (cdr result)))))))
+(ert-deftest idris-generate-def-next ()
+ "Test `idris-generate-def-next'."
+ (skip-unless (string-match-p "idris2$" idris-interpreter-path))
+ (let (eval-result)
+ (cl-flet ((idris-load-file-sync-stub () nil)
+ (idris-eval-stub (sexp &optional no-errors)
+ (apply #'funcall eval-result)))
+ (advice-add 'idris-load-file-sync :override #'idris-load-file-sync-stub)
+ (advice-add 'idris-eval :override #'idris-eval-stub)
+ (unwind-protect
+ (with-temp-buffer
+ (insert "data Foo = A | B
+
+testf : Foo -> Int
+")
+ (goto-char (point-min))
+ (re-search-forward "test")
+ (setq eval-result (list #'identity '("testf A = testf B\ntestf B =
testf A")))
+ (funcall-interactively 'idris-generate-def)
+
+ (setq eval-result (list #'identity '("testf A = 1\ntestf B = 2")))
+ (funcall-interactively 'idris-generate-def-next)
+ (should (string= "data Foo = A | B
+
+testf : Foo -> Int
+testf A = 1
+testf B = 2
+"
+ (buffer-substring-no-properties (point-min)
(point-max))))
+ (setq eval-result (list #'identity '("third definition")))
+ (funcall-interactively 'idris-generate-def-next)
+ (message "%s" (buffer-substring-no-properties (point-min)
(point-max)))
+ (should (string= "data Foo = A | B
+
+testf : Foo -> Int
+third definition
+"
+ (buffer-substring-no-properties (point-min)
(point-max))))
+ (setq eval-result (list #'error "%s (synchronous Idris evaluation
failed)" "No more results"))
+ (should-error (funcall-interactively 'idris-generate-def-next)))
+
+ (advice-remove 'idris-load-file-sync #'idris-load-file-sync-stub)
+ (advice-remove 'idris-eval #'idris-eval-stub)))))
+
;; Tests by Yasuhiko Watanabe
;; https://github.com/idris-hackers/idris-mode/pull/537/files
(idris-ert-command-action "test-data/CaseSplit.idr" idris-case-split
idris-test-eq-buffer)
