Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change format of forms-str and arglists-str #412

Merged
merged 1 commit into from
Jun 18, 2017
Merged

Change format of forms-str and arglists-str #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions src/cider/nrepl/middleware/info.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,22 +288,24 @@

(defn format-response
[info]
(when info
(-> info
(merge (when-let [ns (:ns info)]
{:ns (str ns)})
(when-let [args (:arglists info)]
{:arglists-str (pr-str args)})
(when-let [forms (:forms info)]
{:forms-str (->> (map #(str " " (pr-str %)) forms)
(str/join \newline))})
(when-let [file (:file info)]
(file-info file))
(when-let [path (:javadoc info)]
(javadoc-info path)))
format-nested
blacklist
u/transform-value)))
(letfn [(forms-join [forms]
(->> (map pr-str forms)
(str/join \newline)))]
(when info
(-> info
(merge (when-let [ns (:ns info)]
{:ns (str ns)})
(when-let [args (:arglists info)]
{:arglists-str (forms-join args)})
(when-let [forms (:forms info)]
{:forms-str (forms-join forms)})
(when-let [file (:file info)]
(file-info file))
(when-let [path (:javadoc info)]
(javadoc-info path)))
format-nested
blacklist
u/transform-value))))

(defn info-reply
[msg]
Expand Down
20 changes: 11 additions & 9 deletions test/clj/cider/nrepl/middleware/info_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
[clojure.java.io :as io]
[clojure.repl :as repl]
[clojure.set :as set]
[clojure.string :as str]
[cider.nrepl.middleware.info :as info]
[cider.nrepl.middleware.util.misc :as util]
[cider.nrepl.test-session :as session]
Expand Down Expand Up @@ -160,7 +161,8 @@
(is (= (dissoc (info/format-response (info/info-clj 'cider.nrepl.middleware.info 'assoc)) "file")
{"ns" "clojure.core"
"name" "assoc"
"arglists-str" (pr-str arglists)
"arglists-str" (->> (map pr-str arglists)
(str/join \newline))
"column" column
"added" added
"static" (str static)
Expand Down Expand Up @@ -271,7 +273,7 @@
(is (= (:status response) #{"done"}))
(is (= (:ns response) "cider.nrepl.middleware.info-test"))
(is (= (:name response) "testing-function"))
(is (= (:arglists-str response) "([a b c])"))
(is (= (:arglists-str response) "[a b c]"))
(is (nil? (:macro response)))
(is (= (:doc response) "This is used for testing"))
(is (nil? (:spec response)))))
Expand All @@ -281,7 +283,7 @@
(is (= (:status response) #{"done"}))
(is (= (:ns response) "cider.nrepl.middleware.info-test"))
(is (= (:name response) "testing-macro"))
(is (= (:arglists-str response) "([pred a b])"))
(is (= (:arglists-str response) "[pred a b]"))
(is (= (:macro response) "true"))
(is (= (:doc response) "a macro for testing"))
(is (nil? (:spec response)))))
Expand All @@ -293,7 +295,7 @@
(is (= (:status response) #{"done"}))
(is (= (:class response) "cider.nrepl.test.TestClass"))
(is (= (:member response) "getInt"))
(is (= (:arglists-str response) "([this])"))
(is (= (:arglists-str response) "[this]"))
(is (= (:argtypes response) []))
(is (= (:returns response) "int"))
(is (= (:modifiers response) "#{:public}"))
Expand All @@ -320,7 +322,7 @@
(is (= (:status response) #{"done"}))
(is (= (:class response) "cider.nrepl.test.TestClass"))
(is (= (:member response) "doSomething"))
(is (= (:arglists-str response) "([int int java.lang.String])"))
(is (= (:arglists-str response) "[int int java.lang.String]"))
(is (= (:argtypes response) ["int" "int" "java.lang.String"]))
(is (= (:returns response) "void"))
(is (= (:modifiers response) "#{:private :static}"))
Expand All @@ -347,7 +349,7 @@
(is (= (:status response) #{"done"}))
(is (= (:class response) "java.lang.StringBuilder"))
(is (= (:member response) "capacity"))
(is (= (:arglists-str response) "([this])"))
(is (= (:arglists-str response) "[this]"))
(is (= (:argtypes response) []))
(is (= (:returns response) "int"))
(is (= (:modifiers response) "#{:public :bridge :synthetic}"))
Expand All @@ -374,15 +376,15 @@
(is (= (:url response) "https://clojure.org/java_interop#dot"))
(is (= (:special-form response) "true"))
(is (.startsWith (:doc response) "The instance member form works"))
(is (.startsWith (:forms-str response) " (.instanceMember instance args*)\n (.instanceMember"))))
(is (.startsWith (:forms-str response) "(.instanceMember instance args*)\n(.instanceMember"))))

(testing "get info of a clojure non-core file, located in a jar"
(let [response (session/message {:op "info" :symbol "resource" :ns "clojure.java.io"})]
(is (= (:status response) #{"done"}))
(is (= (:name response) "resource"))
(is (= (:resource response) "clojure/java/io.clj"))
(is (= (:ns response) "clojure.java.io"))
(is (= (:arglists-str response) "([n] [n loader])"))
(is (= (:arglists-str response) "[n]\n[n loader]"))
(is (.startsWith (:doc response) "Returns the URL for a named"))
(is (.startsWith (:file response) "jar:file:"))))

Expand All @@ -405,7 +407,7 @@
(is (= (:status response) #{"done"}))
(is (= (:ns response) "clojure.core"))
(is (= (:name response) "as->"))
(is (= (:arglists-str response) "([expr name & forms])"))
(is (= (:arglists-str response) "[expr name & forms]"))
(is (= (:macro response) "true"))
(is (.startsWith (:doc response) "Binds name to expr, evaluates")))
(finally
Expand Down