Skip to content

Commit ed79316

Browse files
committed
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.
1 parent 4ec02a7 commit ed79316

File tree

2 files changed

+28
-30
lines changed

2 files changed

+28
-30
lines changed

src/cider/nrepl/middleware/complete.clj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
[compliment.core :as complete]
99
[compliment.utils :as complete-utils]
1010
[orchard.misc :as misc]
11-
[suitable.complete-for-nrepl :as suitable]
1211
[suitable.compliment.sources.cljs :as suitable-sources]))
1312

1413
(def clj-sources
@@ -36,8 +35,7 @@
3635
:extra-metadata (set (map keyword extra-metadata))}]
3736
(if-let [cljs-env (cljs/grab-cljs-env msg)]
3837
(binding [suitable-sources/*compiler-env* cljs-env]
39-
(concat (complete/completions prefix (merge completion-opts {:sources cljs-sources}))
40-
(when enhanced-cljs-completion? (suitable/complete-for-nrepl (assoc msg :symbol prefix)))))
38+
(complete/completions prefix (merge completion-opts {:sources cljs-sources})))
4139
(complete/completions prefix (merge completion-opts {:sources clj-sources})))))
4240

4341
(defn completion-doc

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -36,35 +36,35 @@
3636
(is (= '("[psym & doc+methods]") (:arglists candidate)))
3737
(is (string? (:doc candidate))))))
3838

39-
(deftest cljs-complete-with-suitable-test
40-
(testing "js global completion"
41-
(let [response (session/message {:op "complete"
42-
:ns "cljs.user"
43-
:prefix "js/Ob"
44-
:enhanced-cljs-completion? "t"})
45-
candidates (:completions response)]
46-
(is (= [{:candidate "js/Object", :ns "js", :type "function"}] candidates))))
39+
;; (deftest cljs-complete-with-suitable-test
40+
;; (testing "js global completion"
41+
;; (let [response (session/message {:op "complete"
42+
;; :ns "cljs.user"
43+
;; :prefix "js/Ob"
44+
;; :enhanced-cljs-completion? "t"})
45+
;; candidates (:completions response)]
46+
;; (is (= [{:candidate "js/Object", :ns "js", :type "function"}] candidates))))
4747

48-
(testing "manages context state"
49-
(session/message {:op "complete"
50-
:ns "cljs.user"
51-
:prefix ".xxxx"
52-
:context "(__prefix__ js/Object)"
53-
:enhanced-cljs-completion? "t"})
54-
(let [response (session/message {:op "complete"
55-
:ns "cljs.user"
56-
:prefix ".key"
57-
:context ":same"
58-
:enhanced-cljs-completion? "t"})
59-
candidates (:completions response)]
60-
(is (= [{:ns "js/Object", :candidate ".keys" :type "function"}] candidates))))
48+
;; (testing "manages context state"
49+
;; (session/message {:op "complete"
50+
;; :ns "cljs.user"
51+
;; :prefix ".xxxx"
52+
;; :context "(__prefix__ js/Object)"
53+
;; :enhanced-cljs-completion? "t"})
54+
;; (let [response (session/message {:op "complete"
55+
;; :ns "cljs.user"
56+
;; :prefix ".key"
57+
;; :context ":same"
58+
;; :enhanced-cljs-completion? "t"})
59+
;; candidates (:completions response)]
60+
;; (is (= [{:ns "js/Object", :candidate ".keys" :type "function"}] candidates))))
6161

62-
(testing "no suitable completions without enhanced-cljs-completion? flag"
63-
(let [response (session/message {:op "complete"
64-
:ns "cljs.user"
65-
:prefix "js/Ob"})
66-
candidates (:completions response)]
67-
(is (empty? candidates)))))
62+
;; (testing "no suitable completions without enhanced-cljs-completion? flag"
63+
;; (let [response (session/message {:op "complete"
64+
;; :ns "cljs.user"
65+
;; :prefix "js/Ob"})
66+
;; candidates (:completions response)]
67+
;; (is (empty? candidates)))))
6868

6969
(deftest cljs-complete-doc-test
7070
(testing "no suitable documentation can be found"

0 commit comments

Comments
 (0)