Skip to content

Commit 09327cb

Browse files
committed
Remove "deriving" Haskell artifact from indentation
`deriving` isn't a thing in PureScript. There's `derive` keyword, but it has a bit different structure (specifically, it is a top-level keyword). Related discussion: https://discourse.purescript.org/t/solved-is-deriving-keyword-a-thing-in-purescript/4787
1 parent 07e4d6e commit 09327cb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

purescript-indentation.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ indent the current line. This has to be fixed elsewhere."
649649
(purescript-indentation-type)
650650
(cond ((string= current-token "=")
651651
(purescript-indentation-with-starter
652-
(lambda () (purescript-indentation-separated #'purescript-indentation-type "|" "deriving"))
652+
(lambda () (purescript-indentation-separated #'purescript-indentation-type "|" nil))
653653
nil))
654654
((string= current-token "where")
655655
(purescript-indentation-with-starter
@@ -998,7 +998,7 @@ indent the current line. This has to be fixed elsewhere."
998998

999999
(defun purescript-indentation-peek-token ()
10001000
"Return token starting at point."
1001-
(cond ((looking-at "\\(if\\|then\\|else\\|let\\|in\\|ado\\|mdo\\|rec\\|\\(?:[[:word:]]+\\.\\)*do\\|proc\\|case\\|of\\|where\\|module\\|deriving\\|data\\|type\\|newtype\\|class\\|instance\\)\\([^[:alnum:]'_]\\|$\\)")
1001+
(cond ((looking-at "\\(if\\|then\\|else\\|let\\|in\\|ado\\|mdo\\|rec\\|\\(?:[[:word:]]+\\.\\)*do\\|proc\\|case\\|of\\|where\\|module\\|data\\|type\\|newtype\\|class\\|instance\\)\\([^[:alnum:]'_]\\|$\\)")
10021002
(match-string-no-properties 1))
10031003
((looking-at "[][(){}[,;]")
10041004
(match-string-no-properties 0))

0 commit comments

Comments
 (0)