diff --git a/haskell-indentation.el b/haskell-indentation.el index 14002e9a5..a80c2942c 100644 --- a/haskell-indentation.el +++ b/haskell-indentation.el @@ -940,20 +940,22 @@ the current buffer." ;; , (defun haskell-indentation-separated (parser separator &optional stmt-separator) (catch 'return + (unless (listp separator) + (setq separator (list separator))) + (unless (listp stmt-separator) + (setq stmt-separator (list stmt-separator))) (while t (funcall parser) - (cond ((if (listp separator) - (member current-token separator) - (equal current-token separator)) + (cond ((member current-token separator) (haskell-indentation-at-separator)) - ((equal current-token stmt-separator) + ((member current-token stmt-separator) (setq starter-indent (current-column)) (haskell-indentation-at-separator)) ((eq current-token 'end-tokens) - (cond ((or (equal following-token separator) - (equal following-token stmt-separator)) + (cond ((or (member following-token separator) + (member following-token stmt-separator)) ;; set an indentation before a separator, ;; for example: ;; [ 1 or [ 1 | a diff --git a/tests/haskell-indentation-tests.el b/tests/haskell-indentation-tests.el index a158e7f0d..45044a4fc 100644 --- a/tests/haskell-indentation-tests.el +++ b/tests/haskell-indentation-tests.el @@ -77,7 +77,6 @@ Example of lines: (ert-deftest haskell-indentation-check-4 () "Import statememnt symbol list 2" - :expected-result :failed (haskell-indentation-check "import Control.Concurrent" " ( forkIO"