[#363] Bump compliment to 0.3.0-SNAPSHOT (#364)

Author: cskksc

project.clj

@@ -10,7 +10,7 @@
                  [org.tcrawley/dynapath "0.2.3"]
                  ^:source-dep [mvxcvi/puget "1.0.0"]
                  ^:source-dep [fipp "0.6.4"]
-                 ^:source-dep [compliment "0.2.8-SNAPSHOT"]
+                 ^:source-dep [compliment "0.3.0-SNAPSHOT"]
                  ^:source-dep [cljs-tooling "0.2.0"]
                  ^:source-dep [cljfmt "0.4.1" :exclusions [org.clojure/clojurescript]]
                  ^:source-dep [org.clojure/java.classpath "0.2.3"]

src/cider/nrepl/middleware/complete.clj

@@ -17,7 +17,6 @@
                                                   :extra-metadata extra-metadata})
       (jvm-complete/completions prefix {:ns ns
                                         :context context
-                                        :tag-candidates true
                                         :extra-metadata extra-metadata}))))
 
 (defn completion-doc

src/cider/nrepl/middleware/resource.clj

@@ -2,20 +2,24 @@
   (:require [clojure.java.io :as io]
             [clojure.tools.nrepl.middleware :refer [set-descriptor!]]
             [cider.nrepl.middleware.util.error-handling :refer [with-safe-transport] :as err]
-            [compliment.sources.resources :as r]))
+            [compliment.sources.resources :as r]
+            [compliment.core :as jvm-complete]))
 
 (defn resource-path [name]
   (when-let [resource (io/resource name)]
     (.getPath resource)))
 
-(defn resources-list []
-  (r/resources-by-prefix ""))
+(defn resources-list [{:keys [prefix context] :as msg
+                       :or {context "(resource \"__prefix__\")" prefix ""}}]
+  (->> (jvm-complete/completions prefix {:context context
+                                         :sources [::r/resources]})
+       (map :candidate)))
 
 (defn resource-reply [{:keys [name] :as msg}]
   {:resource-path (resource-path name)})
 
 (defn resources-list-reply [msg]
-  {:resources-list (resources-list)})
+  {:resources-list (resources-list msg)})
 
 (defn wrap-resource
   "Middleware that provides the path to resource."
@@ -33,4 +37,6 @@
     :returns {"resource-path" "The file path to a resource."}}
    "resources-list"
    {:doc "Obtain a list of all resources on the classpath."
-    :returns {"resources-list" "The list of resources."}}}})
+    :returns {"resources-list" "The list of resources."}
+    :optional {"context" "Completion context for compliment."
+               "prefix" "Prefix to filter out resources."}}}})

test/clj/cider/nrepl/middleware/resource_test.clj

@@ -10,10 +10,18 @@
     (is (.endsWith (:resource-path response) "test/resources/test.txt"))))
 
 (deftest test-resources-list
-  (let [response (session/message {:op "resources-list"})]
-    (is (= #{"done"} (:status response)))
-    (is (not (empty? (:resources-list response))))
-    (is (not (empty? (filter #(re-matches #"test\.txt" %) (:resources-list response)))))))
+  (testing "Basic checks"
+    (let [response (session/message {:op "resources-list"})]
+      (is (= #{"done"} (:status response)))
+      (is (not (empty? (:resources-list response))))
+      (is (not (empty? (filter #(re-matches #"test\.txt" %) (:resources-list response)))))))
+
+  (testing "Filtering resources based on prefixes"
+    (let [response (session/message {:op "resources-list" :prefix "see-also"})]
+      (is (= #{"done"} (:status response)))
+      (is (not (empty? (:resources-list response))))
+      (is (every? #(.startsWith % "see-also") (:resources-list response)))
+      (is (contains? (set (:resources-list response)) "see-also.edn")))))
 
 (deftest test-resource-op-error-handling
   (with-redefs [r/resource-path (fn [& _] (throw (Exception. "resource")))]