[nongnu] elpa/forth-mode 952995d95e 098/153: Add tests for indentation

[ELPA Syncer]

branch: elpa/forth-mode
commit 952995d95e665af26be01c97735e36ec33348214
Author: Helmut Eller <helmut@msibook>
Commit: Helmut Eller <helmut@msibook>

    Add tests for indentation
    
    * test/tests.el: Add some tests.
    * forth-smie.el (forth-smie--grammar): Add missing ?do ... +loop rule.
    Remove {: ... :} as {: is currently a comment.
---
 forth-smie.el |  2 +-
 test/tests.el | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/forth-smie.el b/forth-smie.el
index bfe7086461..3bc14fb139 100644
--- a/forth-smie.el
+++ b/forth-smie.el
@@ -14,10 +14,10 @@
        ("of" words "endof")
        ("case" words "endcase")
        ("?do" words "loop")
+       ("?do" words "+loop")
        ("do" words "loop")
        ("do" words "+loop")
        ("begin-structure" words "end-structure")
-       ("{:" words ":}")
        (":" words ";"))
       (words)))))
 
diff --git a/test/tests.el b/test/tests.el
index 9b3337fe16..a8f978247a 100644
--- a/test/tests.el
+++ b/test/tests.el
@@ -24,10 +24,23 @@
      ,@body))
 
 (defun forth-assert-face (content pos face)
-  (when (boundp 'syntax-propertize-function)
-    (forth-with-temp-buffer content
-      (font-lock-fontify-buffer)
-      (should (eq face (get-text-property pos 'face))))))
+  (forth-with-temp-buffer content
+    (font-lock-fontify-buffer)
+    (should (eq face (get-text-property pos 'face)))))
+
+(defun forth-strip-| (string)
+  (replace-regexp-in-string "^[ \t]*|" "" (substring-no-properties  string)))
+
+(defun forth-should-indent (expected &optional content)
+  "Assert that CONTENT turns into EXPECTED after the buffer is re-indented.
+If CONTENT is not supplied uses EXPECTED as input.
+The whitespace before and including \"|\" on each line is removed."
+  (let ((content (or content expected)))
+    (forth-with-temp-buffer (forth-strip-| content)
+      (let ((inhibit-message t)) ; Suppress "Indenting region ... done" message
+       (indent-region (point-min) (point-max)))
+      (should (string= (forth-strip-| expected)
+                      (substring-no-properties (buffer-string)))))))
 
 (ert-deftest forth-paren-comment-font-lock ()
   (forth-assert-face "( )" 1 font-lock-comment-delimiter-face)
@@ -79,3 +92,67 @@
 (ert-deftest forth-parsing-words-font-lock ()
   (forth-assert-face "postpone ( x " 11 nil)
   (forth-assert-face "' s\" x " 6 nil))
+
+(ert-deftest forth-indent-colon-definition ()
+  (forth-should-indent
+   ": foo ( x y -- y x )
+   |  swap
+   |;"))
+
+(ert-deftest forth-indent-if-then-else ()
+  (forth-should-indent
+   "x if
+   |  3 +
+   |then")
+  (forth-should-indent
+   "x if
+   |  3 +
+   |else
+   |  1+
+   |then"))
+
+(ert-deftest forth-indent-begin-while-repeat ()
+  (forth-should-indent
+   "begin
+   |  0>
+   |while
+   |  1-
+   |repeat")
+  (forth-should-indent
+   "begin
+   |  0>
+   |while
+   |  begin
+   |    foo
+   |  while
+   |    bar
+   |  repeat
+   |  1-
+   |repeat"))
+
+;; FIXME: this kind of code is indented poorly (difficult for SMIE)
+;; |: foo ( )
+;; |  begin
+;; |    bar while
+;; |    baz while
+;; |again then then ;
+
+(ert-deftest forth-indent-do ()
+  (forth-should-indent
+   "10 0 ?do
+   |  .
+   |loop")
+  (forth-should-indent
+   "10 0 ?do
+   |  . 2
+   |+loop"))
+
+(ert-deftest forth-indent-case ()
+  (forth-should-indent
+   "x case
+   |  [char] f of
+   |    foo
+   |  endof
+   |  [char] b of bar endof
+   |  drop exit
+   |endcase"))