branch: elpa/haskell-tng-mode
commit 59640ceec33cd4df37096289e11ff6f4b876be03
Author: Tseen She <ts33n....@gmail.com>
Commit: Tseen She <ts33n....@gmail.com>
cleanups thanks to MELPA review
---
haskell-tng-compile.el | 2 +-
haskell-tng-contrib.el | 2 +-
haskell-tng-hsinspect.el | 2 +-
haskell-tng-imenu.el | 2 +-
haskell-tng-layout.el | 4 ++--
haskell-tng-lexer.el | 2 +-
haskell-tng-mode.el | 4 ++--
haskell-tng-smie.el | 8 ++++----
haskell-tng-syntax.el | 10 +++++-----
test/haskell-tng-indent-test.el | 4 ++--
10 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/haskell-tng-compile.el b/haskell-tng-compile.el
index 1382d6d..be8be27 100644
--- a/haskell-tng-compile.el
+++ b/haskell-tng-compile.el
@@ -121,7 +121,7 @@ will cause the subsequent call to prompt."
(define-compilation-mode haskell-tng-compilation-mode "haskell-tng-compilation"
;; TODO add a hook to detect ghcid recompiles and clear the buffer
(add-hook 'compilation-filter-hook
- 'haskell-tng--compile-ansi-color nil t))
+ #'haskell-tng--compile-ansi-color nil t))
(provide 'haskell-tng-compile)
;;; haskell-tng-compile.el ends here
diff --git a/haskell-tng-contrib.el b/haskell-tng-contrib.el
index 00a42ce..1e34764 100644
--- a/haskell-tng-contrib.el
+++ b/haskell-tng-contrib.el
@@ -56,7 +56,7 @@
(defun haskell-tng-filename-to-modulename ()
"Infers the ModuleName for the current file based on filesystem layout."
(mapconcat
- 'identity
+ #'identity
(reverse
(seq-take-while
(lambda (e) (let (case-fold-search)
diff --git a/haskell-tng-hsinspect.el b/haskell-tng-hsinspect.el
index 37f1423..f6fbbae 100644
--- a/haskell-tng-hsinspect.el
+++ b/haskell-tng-hsinspect.el
@@ -72,7 +72,7 @@ t means the process failed.")
nil "*hsinspect*" nil
(append `("imports" ,buffer-file-name)
haskell-tng-hsinspect-langexts)))
- (user-error "`hsinspect' failed. See the *hsinspect* buffer for more
information.")
+ (user-error "`hsinspect' failed. See the *hsinspect* buffer for more
information")
(setq haskell-tng--hsinspect-imports
(with-current-buffer "*hsinspect*"
(goto-char (point-min))
diff --git a/haskell-tng-imenu.el b/haskell-tng-imenu.el
index 13bdb21..c2cc470 100644
--- a/haskell-tng-imenu.el
+++ b/haskell-tng-imenu.el
@@ -45,7 +45,7 @@
nil t)
(let ((name (match-string 0))
(pos (match-beginning 0)))
- (when (not (string-match haskell-tng--rx-c-reserved name))
+ (unless (string-match haskell-tng--rx-c-reserved name)
(push `(,name . ,pos) entries)))))
(seq-uniq
diff --git a/haskell-tng-layout.el b/haskell-tng-layout.el
index 5f4995c..9107d00 100644
--- a/haskell-tng-layout.el
+++ b/haskell-tng-layout.el
@@ -141,7 +141,7 @@ using a cache if available."
;; 4. everywhere else, extra sep
(when module
(push `(,max nil) cache))
- (when (not (or module before-module))
+ (unless (or module before-module)
(if (eq max (point-max))
(push `(nil ,max) cache)
(push `(nil nil ,max) cache))
@@ -180,7 +180,7 @@ using a cache if available."
word-end))
(goto-char (match-end 0))
(forward-comment limit)
- (when (not (looking-at "{"))
+ (unless (looking-at "{")
(throw 'wldo (haskell-tng--layout-wldo
(min (or (haskell-tng--util-paren-close) (point-max))
limit)))))
diff --git a/haskell-tng-lexer.el b/haskell-tng-lexer.el
index f040a86..e1685f4 100644
--- a/haskell-tng-lexer.el
+++ b/haskell-tng-lexer.el
@@ -21,7 +21,7 @@
;;
https://github.com/typelead/intellij-eta/blob/eta-ide/plugin/src/main/eta/IntelliJ/Plugin/Eta/Lang/Lexer/EtaParsingLexer.hs
;; https://www.haskell.org/hugs/downloads/2006-09/hugs98-Sep2006.tar.gz
(src/parser.y)
;; https://github.com/haskell-lisp/yale-haskell/blob/master/parser/lexer.scm
-;; http://bnfc.digitalgrammars.com/
+;; https://bnfc.digitalgrammars.com/
;;
;; We could potentially use FFI + Flex to do the lexing for us, giving us
access
;; to much more powerful regexp rules (Emacs doesn't support zero width
diff --git a/haskell-tng-mode.el b/haskell-tng-mode.el
index 420f2f4..9ae5f15 100644
--- a/haskell-tng-mode.el
+++ b/haskell-tng-mode.el
@@ -5,8 +5,8 @@
;; Homepage: https://gitlab.com/tseenshe/haskell-tng-mode
;; Keywords: languages
-;; Package-Version: 0.0.1
-;; Package-Requires: ((emacs "24.3"))
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "26.1"))
;;; Commentary:
;;
diff --git a/haskell-tng-smie.el b/haskell-tng-smie.el
index 84f13c9..90d12df 100644
--- a/haskell-tng-smie.el
+++ b/haskell-tng-smie.el
@@ -382,7 +382,7 @@ information, to aid in the creation of new rules."
(member last-command haskell-tng--smie-return))))
(setq haskell-tng--smie-indentations nil)
;; TAB+TAB or RETURN+TAB
- (when (null haskell-tng--smie-indentations)
+ (unless haskell-tng--smie-indentations
(let ((prime (current-column)))
(setq haskell-tng--smie-indentations
(append
@@ -430,9 +430,9 @@ BEFORE is t if the line appears before the indentation."
relevant)
(while (< (point) bound)
;; TODO we the lexer instead of regexps, we're not barbarians
- (when (not
- (looking-at
- (rx (* space) (| "where" "do") word-end)))
+ (unless
+ (looking-at
+ (rx (* space) (| "where" "do") word-end))
(push (current-indentation) relevant))
(when
(and
diff --git a/haskell-tng-syntax.el b/haskell-tng-syntax.el
index f96776b..86c4260 100644
--- a/haskell-tng-syntax.el
+++ b/haskell-tng-syntax.el
@@ -20,11 +20,11 @@
(defconst haskell-tng--syntax-table
(let ((table (make-syntax-table)))
(map-char-table
- #'(lambda (k v)
- ;; reset the (surprisingly numerous) defaults
- (let ((class (syntax-class v)))
- (when (seq-contains '(1 4 5 6 9) class)
- (modify-syntax-entry k "_" table))))
+ (lambda (k v)
+ ;; reset the (surprisingly numerous) defaults
+ (let ((class (syntax-class v)))
+ (when (seq-contains '(1 4 5 6 9) class)
+ (modify-syntax-entry k "_" table))))
(char-table-parent table))
;; many of the following chars are already defined by the defaults, but we
diff --git a/test/haskell-tng-indent-test.el b/test/haskell-tng-indent-test.el
index 54f7d7e..c7ed10b 100644
--- a/test/haskell-tng-indent-test.el
+++ b/test/haskell-tng-indent-test.el
@@ -116,11 +116,11 @@
(pcase mode
('insert
(beginning-of-line)
- (when (not (eobp))
+ (unless (eobp)
(kill-whole-line)))
('append
(beginning-of-line)
- (when (not (eobp))
+ (unless (eobp)
(delete-region (point) (line-end-position))))
('reindent
(indent-line-to orig)
