Skip to content

Commit 1bd70a7

Browse files
committed
work on munging (more tests, docs and fixing edge cases)
1 parent e82d9e2 commit 1bd70a7

File tree

4 files changed

+404
-140
lines changed

4 files changed

+404
-140
lines changed

src/lib/devtools/format.cljs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
(ns devtools.format
22
(:require-macros [devtools.util :refer [oget oset ocall oapply]])
33
(:require [devtools.prefs :refer [pref]]
4-
[devtools.munging :as munging]
5-
[clojure.string :as string]))
4+
[devtools.munging :as munging]))
65

76
; ---------------------------------------------------------------------------------------------------------------------------
87
; PROTOCOL SUPPORT
@@ -186,15 +185,13 @@
186185

187186
(defn cljs-function-template [fn-obj]
188187
(let [[ns name] (munging/parse-fn-info fn-obj)
189-
arities (or (munging/collect-fn-arities fn-obj) {:naked fn-obj})
190-
multi-arity? (> (count arities) 1)
191188
args-open-symbol (pref :args-open-symbol)
192189
args-close-symbol (pref :args-close-symbol)
193190
multi-arity-symbol (pref :multi-arity-symbol)
194191
spacer-symbol (pref :spacer)
195192
rest-symbol (pref :rest-symbol)
196-
args-lists (munging/arities-to-args-lists arities true)
197-
args-strings (munging/args-lists-to-strings args-lists spacer-symbol multi-arity-symbol rest-symbol)
193+
args-strings (munging/extract-args-strings fn-obj true spacer-symbol multi-arity-symbol rest-symbol)
194+
multi-arity? (> (count args-strings) 1)
198195
args (map #(str args-open-symbol % args-close-symbol) args-strings)
199196
multi-arity-marker (str args-open-symbol multi-arity-symbol args-close-symbol)
200197
args-template (template :span :fn-args-style (if multi-arity? multi-arity-marker (first args)))

0 commit comments

Comments
 (0)