Skip to content

Commit 21eb4df

Browse files
author
John Louis Walker
committed
Factor out paredit
1 parent 4697635 commit 21eb4df

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

typed-clojure-mode.el

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
;; Author: John Walker <[email protected]>, Ambrose Bonnaire-Sergeant <[email protected]>
66
;; URL: https://github.com/typedclojure/typed-clojure-mode
77
;; Version: 1.0
8-
;; Package-Requires: ((paredit "22") (clojure-mode "2.1.1") (cider "0.5.0"))
8+
;; Package-Requires: ((clojure-mode "2.1.1") (cider "0.5.0"))
99

1010
;; This program is free software: you can redistribute it and/or modify
1111
;; it under the terms of the GNU General Public License as published by
@@ -31,7 +31,6 @@
3131
(require 'button)
3232
(require 'cider)
3333
(require 'clojure-mode)
34-
(require 'paredit)
3534

3635
(defvar typed-clojure-mode-map
3736
(let ((map (make-sparse-keymap)))
@@ -187,12 +186,15 @@
187186
(defun typed-clojure-ann-form ()
188187
(interactive)
189188
(lexical-let ((t (read-string "Annotate form with type (default Any): ")))
190-
(paredit-wrap-round)
191-
(insert (format "%sann-form " (typed-clojure-lowest-ns 'ann-form)))
192-
(forward-sexp)
193-
(insert (concat "\n" (if (= 0 (length t)) "Any" t)))
194-
(backward-up-list)
195-
(paredit-reindent-defun)
189+
(save-excursion
190+
(insert (format "(%sann-form " (typed-clojure-lowest-ns 'ann-form)))
191+
(forward-sexp)
192+
(insert (format "%s)" (concat "\n" (if (= 0 (length t)) "Any" t))))
193+
(backward-up-list) )
194+
(save-excursion
195+
(mark-defun)
196+
(indent-region (region-beginning)
197+
(region-end)))
196198
; navigate to type
197199
(forward-sexp)
198200
(backward-char)

0 commit comments

Comments
 (0)