Skip to content

Implemente layout rule more properly #773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 26, 2015
Merged

Implemente layout rule more properly #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3e8f76
Implement off-side rule (more) properly
gracjan Jul 23, 2015
ac8c444
Add haskell-indentation tests for off-side rule
gracjan Jul 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions haskell-indentation.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@ the current buffer."
(defvar parse-line-number) ;; the number of lines parsed
(defvar possible-indentations) ;; the return value of the indentations
(defvar indentation-point) ;; where to stop parsing
(defvar implicit-layout-active) ;; is 'off-side' rule active?

(defun haskell-indentation-goto-least-indentation ()
(beginning-of-line)
Expand Down Expand Up @@ -770,11 +771,12 @@ the current buffer."
;; items parsed by parser, separated by sep or stmt-sep, and ending in
;; end.
(defun haskell-indentation-list (parser end sep &optional stmt-sep)
(haskell-indentation-with-starter
`(lambda () (haskell-indentation-separated #',parser
,sep
,stmt-sep))
end))
(let ((implicit-layout-active nil))
(haskell-indentation-with-starter
`(lambda () (haskell-indentation-separated #',parser
,sep
,stmt-sep))
end)))

;; An expression starting with a keyword or paren. Skip the keyword
;; or paren.
Expand Down Expand Up @@ -979,7 +981,8 @@ the current buffer."
(defun haskell-indentation-implicit-layout-list (parser)
(let* ((layout-indent (current-column))
(current-indent (current-column))
(left-indent (current-column)))
(left-indent (current-column))
(implicit-layout-active t))
(catch 'return
(while t
(let ((left-indent left-indent))
Expand Down Expand Up @@ -1123,23 +1126,30 @@ the current buffer."
;; 'end-tokens: back at point where we started, following-token
;; will be set to the next token.
;;
;; Pseudo tokens are used only when implicit-layout-active is t. That
;; is the case only after keywords 'do', 'where', 'let' and 'of'.
;;
;; if we are at a new line, parse-line is increased, and
;; current-indent and left-indent are set to the indentation
;; of the line.

(defun haskell-indentation-read-next-token ()
(cond ((eq current-token 'end-tokens)
(cond ((and implicit-layout-active
(eq current-token 'end-tokens))
'end-tokens)
((eq current-token 'layout-end)
((and implicit-layout-active
(eq current-token 'layout-end))
(cond ((> layout-indent (current-column))
'layout-end)
((= layout-indent (current-column))
(setq current-token 'layout-item))
((< layout-indent (current-column))
(setq current-token (haskell-indentation-peek-token)))))
((eq current-token 'layout-item)
((and implicit-layout-active
(eq current-token 'layout-item))
(setq current-token (haskell-indentation-peek-token)))
((> layout-indent (current-column))
((and implicit-layout-active
(> layout-indent (current-column)))
(setq current-token 'layout-end))
(t
(haskell-indentation-skip-token)
Expand All @@ -1155,9 +1165,11 @@ the current buffer."
(setq current-indent (current-column))
(setq left-indent (current-column))
(setq parse-line-number (+ parse-line-number 1)))
(cond ((> layout-indent (current-column))
(cond ((and implicit-layout-active
(> layout-indent (current-column)))
(setq current-token 'layout-end))
((= layout-indent (current-column))
((and implicit-layout-active
(= layout-indent (current-column)))
(setq current-token 'layout-item))
(t (setq current-token (haskell-indentation-peek-token))))))))

Expand Down
19 changes: 12 additions & 7 deletions tests/haskell-indentation-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,21 +404,26 @@ Example of lines:
" ^"))

(ert-deftest haskell-indentation-check-instance-21a ()
"layout versus comma in braces"
(haskell-indentation-check
"main :: IO ()"
"main = do"
"let foo = Foo {"
" bar = 0"
" , baz = 0"
" , baz = 0"
" ^"))

(ert-deftest haskell-indentation-check-instance-21a-unicode ()
"layout versus comma in braces (unicode)"
(ert-deftest haskell-indentation-check-instance-21b ()
(haskell-indentation-check
"data Foo = Foo {"
" bar :: Int"
", baz :: Int"
" ^"))

(ert-deftest haskell-indentation-check-instance-21c ()
(haskell-indentation-check
"main ∷ IO ()"
"main = do"
"let foo = Foo {"
" bar = 0"
" , baz = 0"
" ^"))
" bar = 0"
" , baz = 0"
" ^"))