Skip to content

Track parens ourselves in type highlight #1346

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
May 31, 2016
Merged

Track parens ourselves in type highlight #1346

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
3693d51
Track parens by our own in type highlight
gracjan May 31, 2016
f9c8624
Add tests for types and parens
gracjan May 31, 2016
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
32 changes: 24 additions & 8 deletions haskell-font-lock.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,8 @@ like ::, class, instance, data, newtype, type."
(token nil)
;; we are starting right after ::
(last-token-was-operator t)
(last-token-was-newline nil))
(last-token-was-newline nil)
(open-parens 0))
(while cont
(setq token (haskell-lexeme-looking-at-token 'newline))

Expand All @@ -251,9 +252,26 @@ like ::, class, instance, data, newtype, type."
(setq last-token-was-newline (not last-token-was-operator))
(setq end (match-end 0))
(goto-char (match-end 0)))
((member (match-string-no-properties 0)
'(")" "]" "}"))
(setq open-parens (1- open-parens))
(if (< open-parens 0)
;; unmatched closing parenthesis closes type declaration
(setq cont nil)
(setq end (match-end 0))
(goto-char end))
(setq last-token-was-newline nil))
((and (member (match-string-no-properties 0)
'("," ";" "|"))
(not (member (match-string-no-properties 0) ignore)))
(if (equal 0 open-parens)
(setq cont nil)
(setq last-token-was-operator t)
(setq end (match-end 0))
(goto-char end))
(setq last-token-was-newline nil))
((and (or (member (match-string-no-properties 0)
'("<-" "=" "<-" "←" "," ";"
")" "]" "}" "|"))
'("<-" "=" "←"))
(member (match-string-no-properties 0) haskell-font-lock--reverved-ids))
(not (member (match-string-no-properties 0) ignore)))
(setq cont nil)
Expand All @@ -262,11 +280,9 @@ like ::, class, instance, data, newtype, type."
'("(" "[" "{"))
(if last-token-was-newline
(setq cont nil)
(goto-char (match-beginning 0))
(condition-case err
(forward-sexp)
(scan-error (goto-char (nth 3 err))))
(setq end (point))
(setq open-parens (1+ open-parens))
(setq end (match-end 0))
(goto-char end)
(setq last-token-was-newline nil)))
((member token '(qsymid char string number template-haskell-quote template-haskell-quasi-quote))
(setq last-token-was-operator (member (haskell-lexeme-classify-by-first-char (char-after (match-beginning 1)))
Expand Down
10 changes: 10 additions & 0 deletions tests/haskell-font-lock-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,16 @@
("Z" t haskell-type-face)
("C" t haskell-constructor-face))))

(ert-deftest haskell-type-colors-31 ()
(check-properties
;; open parentheses do not keep type decl open because there might
;; be an unclosed parenthesis stretching to the end of file and
;; that is very costly to check
'("x :: (OpenParen"
" NotType)")
'(("OpenParen" t haskell-type-face)
("NotType" t haskell-constructor-face))))

(ert-deftest haskell-pattern ()
"Fontify the \"pattern\" keyword in contexts related to pattern synonyms."
:expected-result :failed
Expand Down