File tree Expand file tree Collapse file tree 1 file changed +21
-9
lines changed Expand file tree Collapse file tree 1 file changed +21
-9
lines changed Original file line number Diff line number Diff line change 44
44
:lighter " Typed"
45
45
:keymap typed-clojure-mode-map)
46
46
47
+ (defconst current-alias-clj
48
+ " (if-let [[al typedns] (first (filter #(=
49
+ (find-ns 'clojure.core.typed)
50
+ (val %))
51
+ (ns-aliases *ns*)))]
52
+ (str al \" /\" )
53
+ \" clojure.core.typed/\" )" )
54
+
55
+ (defun current-alias ()
56
+ (cider-eval-and-get-value current-alias-clj))
57
+
47
58
(defun typed-clojure-check-form (&optional prefix )
48
59
" Typecheck the preceding form."
49
60
(interactive " P" )
50
- (if prefix
51
- (cider-interactive-eval-print
52
- (format " (clojure.core.typed/cf %s ) "
53
- (cider-last-sexp)))
54
- (cider-interactive-eval
55
- (format " (clojure.core.typed/cf %s ) "
56
- (cider-last-sexp)))))
61
+ (let ((ca (current-alias)))
62
+ (if prefix
63
+ (cider-interactive-eval-print
64
+ (format " (%s cf %s ) " ca
65
+ (cider-last-sexp)))
66
+ (cider-interactive-eval
67
+ (format " (%s cf %s ) " ca
68
+ (cider-last-sexp))))))
57
69
58
70
(defconst code "
59
71
(let [{:keys [delayed-errors]} (clojure.core.typed/check-ns-info)]
109
121
(defun typed-clojure-insert-ann ()
110
122
(interactive )
111
123
(beginning-of-defun )
112
- (insert (format " (clojure.core.typed/ann %s [])\n " (which-function )))
124
+ (insert (format " (%s ann %s [])\n " (current-alias) (which-function )))
113
125
(previous-line )
114
126
(end-of-line )
115
127
(backward-char 2 ))
120
132
(paredit-wrap-round)
121
133
(beginning-of-defun )
122
134
(forward-char )
123
- (insert " clojure.core.typed/ann -form " )
135
+ (insert ( format " %s ann -form " (current-alias)) )
124
136
(beginning-of-defun )
125
137
(paredit-forward)
126
138
(backward-char )
You can’t perform that action at this time.
0 commit comments