Skip to content

Fixed haskell-indentation-newline-and-indent #837

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 1 commit into from
Sep 2, 2015
Merged

Fixed haskell-indentation-newline-and-indent #837

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions haskell-indentation.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,19 @@ negative ARG. Handles bird style literate Haskell too."
(defun haskell-indentation-newline-and-indent ()
"Insert newline and indent."
(interactive)
(delete-horizontal-space)
(newline)
(unless (haskell-indentation-bird-outside-code-p)
;; On RET (or C-j), we:
;; - just jump to the next line if literate haskell, but outside code
(if (haskell-indentation-bird-outside-code-p)
(progn
(delete-horizontal-space)
(newline))
(catch 'parse-error
;; - save the current column
(let* ((ci (haskell-indentation-current-indentation))
(indentations (haskell-indentation-find-indentations-safe)))
;; - jump to the next line and reindent to at the least same level
(delete-horizontal-space)
(newline)
(when (haskell-indentation-bird-p)
(insert "> "))
(haskell-indentation-reindent-to
Expand Down