Disable the enhanced cljs completion

This breaks on load time with shadow-cljs 2.10.x. We'll enable it back once suitable gets updated.
clojure-emacs · Jun 16, 2020 · ed79316 · ed79316
1 parent 4ec02a7
commit ed79316
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 30 deletions.
diff --git a/src/cider/nrepl/middleware/complete.clj b/src/cider/nrepl/middleware/complete.clj
@@ -8,7 +8,6 @@
    [compliment.core :as complete]
    [compliment.utils :as complete-utils]
    [orchard.misc :as misc]
-   [suitable.complete-for-nrepl :as suitable]
    [suitable.compliment.sources.cljs :as suitable-sources]))
 
 (def clj-sources
@@ -36,8 +35,7 @@
                          :extra-metadata (set (map keyword extra-metadata))}]
     (if-let [cljs-env (cljs/grab-cljs-env msg)]
       (binding [suitable-sources/*compiler-env* cljs-env]
-        (concat (complete/completions prefix (merge completion-opts {:sources cljs-sources}))
-                (when enhanced-cljs-completion? (suitable/complete-for-nrepl (assoc msg :symbol prefix)))))
+        (complete/completions prefix (merge completion-opts {:sources cljs-sources})))
       (complete/completions prefix (merge completion-opts {:sources clj-sources})))))
 
 (defn completion-doc

diff --git a/test/cljs/cider/nrepl/middleware/cljs_complete_test.clj b/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"