Fix the build

Author: vemv

.clj-kondo/config.edn

@@ -4,6 +4,7 @@
                                          (cider.nrepl.middleware.util.instrument/instrument-special-form)
                                          (cider.nrepl.middleware.util.instrument/instrument-coll)
                                          (cider.nrepl.print-method/def-print-method)]}
+           :unused-import {:level :off}
            :unresolved-namespace {:exclude [clojure.main]}}
  :output {:progress true
           :exclude-files ["data_readers" "tasks"]}}

project.clj

@@ -87,6 +87,7 @@
                    :global-vars {*assert* true}}
 
              :test {:source-paths ["test/src"]
+                    :jvm-opts ["-Dcider.internal.test.cljs-suitable-enabled=true"]
                     :java-source-paths ["test/java"]
                     :resource-paths ["test/resources"]
                     :dependencies [[pjstadig/humane-test-output "0.10.0"]

src/cider/nrepl/middleware/complete.clj

@@ -10,6 +10,15 @@
    [orchard.misc :as misc]
    [suitable.compliment.sources.cljs :as suitable-sources]))
 
+(def suitable-enabled? (System/getProperty "cider.internal.test.cljs-suitable-enabled"))
+
+(when suitable-enabled?
+  (require 'suitable.complete-for-nrepl))
+
+(def suitable-complete-for-nrepl
+  (when suitable-enabled?
+    @(resolve 'suitable.complete-for-nrepl/complete-for-nrepl)))
+
 (def clj-sources
   "Source keywords for Clojure completions."
   [:compliment.sources.special-forms/literals
@@ -27,15 +36,17 @@
   [::suitable-sources/cljs-source])
 
 (defn complete
-  [{:keys [ns prefix symbol context extra-metadata] :as msg}]
+  [{:keys [ns prefix symbol context extra-metadata enhanced-cljs-completion?] :as msg}]
   ;; TODO: Drop legacy symbol param in version 1.0
   (let [prefix (str (or prefix symbol))
-        completion-opts {:ns (misc/as-sym ns)
-                         :context context
+        completion-opts {:ns             (misc/as-sym ns)
+                         :context        context
                          :extra-metadata (set (map keyword extra-metadata))}]
     (if-let [cljs-env (cljs/grab-cljs-env msg)]
       (binding [suitable-sources/*compiler-env* cljs-env]
-        (complete/completions prefix (merge completion-opts {:sources cljs-sources})))
+        (cond-> (complete/completions prefix (merge completion-opts {:sources cljs-sources}))
+          (and suitable-enabled? enhanced-cljs-completion?)
+          (concat (suitable-complete-for-nrepl (assoc msg :symbol prefix)))))
       (complete/completions prefix (merge completion-opts {:sources clj-sources})))))
 
 (defn completion-doc

src/cider/nrepl/middleware/slurp.clj

@@ -11,7 +11,7 @@
    [nrepl.misc :refer [response-for]]
    [nrepl.transport :as transport])
   (:import
-   (java.io ByteArrayOutputStream InputStream)
+   (java.io ByteArrayOutputStream FileNotFoundException InputStream)
    (java.net MalformedURLException URL URLConnection)
    (java.nio.file Files Path Paths)
    (java.util Base64)))
@@ -83,7 +83,7 @@
   "Attempts to parse and then to slurp a URL, producing a content-typed response."
   [url-str]
   (when-let [^URL url (try (URL. url-str)
-                         (catch MalformedURLException _e nil))]
+                           (catch MalformedURLException _e nil))]
     (if (= (.getProtocol url) "file") ;; expected common case
       (let [^Path p (Paths/get (.toURI url))
             content-type (normalize-content-type (get-file-content-type p))
@@ -93,11 +93,18 @@
       ;; It's not a file, so just try to open it on up
       (let [^URLConnection conn (.openConnection url)
             content-type (normalize-content-type
-                          (or (.getContentType conn)
+                          (or (try
+                                (.getContentType conn)
+                                (catch FileNotFoundException _))
                               "application/octet-stream"))
             ;; FIXME (arrdem 2018-04-03):
             ;;   There's gotta be a better way here
-            ^InputStream is (.getInputStream conn)
+            ^InputStream is (try
+                              (.getInputStream conn)
+                              (catch FileNotFoundException _
+                                (proxy [InputStream] []
+                                  (read []
+                                    -1))))
             os (ByteArrayOutputStream.)]
         (loop []
           (let [b (.read is)]

src/cider/nrepl/print_method.clj

@@ -6,7 +6,8 @@
   (:require
    [clojure.main :as main])
   (:import
-   [clojure.lang AFunction Atom MultiFn Namespace]))
+   [clojure.lang AFunction Atom MultiFn Namespace]
+   [java.io Writer]))
 
 (def ^:dynamic *pretty-objects*
   "If true, cider prettifies some object descriptions.

test/clj/cider/nrepl/middleware/slurp_test.clj

@@ -37,6 +37,5 @@
 (t/deftest test-url-content-type
   ;; When a url gives content type as nil, then default content-type should be taken.
   (let [resp (slurp-url-to-content+body "https://clojure.org/no-such-page")]
-    (t/is (= ["application/octet-stream" {}]))
-    (t/is (str/starts-with? (:body resp) "#binary[location="))
-    (t/is (str/ends-with? (:body resp) ",size=0]"))))
+    (t/is (= ["text/html" {}] (:content-type resp)))
+    (t/is (= "" (:body resp)))))

test/cljs/cider/nrepl/middleware/cljs_complete_test.clj

@@ -36,35 +36,35 @@
       (is (= '("[psym & doc+methods]") (:arglists candidate)))
       (is (string? (:doc candidate))))))
 
-;; (deftest cljs-complete-with-suitable-test
-;;   (testing "js global completion"
-;;     (let [response (session/message {:op "complete"
-;;                                      :ns "cljs.user"
-;;                                      :prefix "js/Ob"
-;;                                      :enhanced-cljs-completion? "t"})
-;;           candidates (:completions response)]
-;;       (is (= [{:candidate "js/Object", :ns "js", :type "function"}] candidates))))
+(deftest cljs-complete-with-suitable-test
+  (testing "js global completion"
+    (let [response (session/message {:op "complete"
+                                     :ns "cljs.user"
+                                     :prefix "js/Ob"
+                                     :enhanced-cljs-completion? "t"})
+          candidates (:completions response)]
+      (is (= [{:candidate "js/Object", :ns "js", :type "function"}] candidates))))
 
-;;   (testing "manages context state"
-;;     (session/message {:op "complete"
-;;                       :ns "cljs.user"
-;;                       :prefix ".xxxx"
-;;                       :context "(__prefix__ js/Object)"
-;;                       :enhanced-cljs-completion? "t"})
-;;     (let [response (session/message {:op "complete"
-;;                                      :ns "cljs.user"
-;;                                      :prefix ".key"
-;;                                      :context ":same"
-;;                                      :enhanced-cljs-completion? "t"})
-;;           candidates (:completions response)]
-;;       (is (= [{:ns "js/Object", :candidate ".keys" :type "function"}] candidates))))
+  (testing "manages context state"
+    (session/message {:op "complete"
+                      :ns "cljs.user"
+                      :prefix ".xxxx"
+                      :context "(__prefix__ js/Object)"
+                      :enhanced-cljs-completion? "t"})
+    (let [response (session/message {:op "complete"
+                                     :ns "cljs.user"
+                                     :prefix ".key"
+                                     :context ":same"
+                                     :enhanced-cljs-completion? "t"})
+          candidates (:completions response)]
+      (is (= [{:ns "js/Object", :candidate ".keys" :type "function"}] candidates))))
 
-;;   (testing "no suitable completions without enhanced-cljs-completion? flag"
-;;     (let [response (session/message {:op "complete"
-;;                                      :ns "cljs.user"
-;;                                      :prefix "js/Ob"})
-;;           candidates (:completions response)]
-;;       (is (empty? candidates)))))
+  (testing "no suitable completions without enhanced-cljs-completion? flag"
+    (let [response (session/message {:op "complete"
+                                     :ns "cljs.user"
+                                     :prefix "js/Ob"})
+          candidates (:completions response)]
+      (is (empty? candidates)))))
 
 (deftest cljs-complete-doc-test
   (testing "no suitable documentation can be found"