Skip to content

Commit 9bd2f4d

Browse files
committed
Fix parsing of comma separated list inside parentheses
1 parent 391d4c9 commit 9bd2f4d

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

haskell-indentation.el

+8-6
Original file line numberDiff line numberDiff line change
@@ -940,20 +940,22 @@ the current buffer."
940940
;; ,
941941
(defun haskell-indentation-separated (parser separator &optional stmt-separator)
942942
(catch 'return
943+
(unless (listp separator)
944+
(setq separator (list separator)))
945+
(unless (listp stmt-separator)
946+
(setq stmt-separator (list stmt-separator)))
943947
(while t
944948
(funcall parser)
945-
(cond ((if (listp separator)
946-
(member current-token separator)
947-
(equal current-token separator))
949+
(cond ((member current-token separator)
948950
(haskell-indentation-at-separator))
949951

950-
((equal current-token stmt-separator)
952+
((member current-token stmt-separator)
951953
(setq starter-indent (current-column))
952954
(haskell-indentation-at-separator))
953955

954956
((eq current-token 'end-tokens)
955-
(cond ((or (equal following-token separator)
956-
(equal following-token stmt-separator))
957+
(cond ((or (member following-token separator)
958+
(member following-token stmt-separator))
957959
;; set an indentation before a separator,
958960
;; for example:
959961
;; [ 1 or [ 1 | a

tests/haskell-indentation-tests.el

-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ Example of lines:
7777

7878
(ert-deftest haskell-indentation-check-4 ()
7979
"Import statememnt symbol list 2"
80-
:expected-result :failed
8180
(haskell-indentation-check
8281
"import Control.Concurrent"
8382
" ( forkIO"

0 commit comments

Comments
 (0)