Merge pull request #17 from ninjudd/handle_empty_slash

Handle slash without anything before it
ninjudd · Jan 21, 2014 · 76d4bda · 76d4bda
2 parents e106888 + cb31512
commit 76d4bda
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/complete/core.clj b/src/complete/core.clj
@@ -95,12 +95,13 @@
 
 (defmethod potential-completions :scoped
   [prefix ns]
-  (let [scope (symbol (first (.split prefix "/")))]
+  (when-let [prefix-scope (first (.split prefix "/"))]
-    (map #(str scope "/" %)
+    (let [scope (symbol prefix-scope)]
-         (if-let [class (resolve-class scope)]
+      (map #(str scope "/" %)
-           (static-members class)
+           (if-let [class (resolve-class scope)]
-           (when-let [ns (or (find-ns scope) (scope (ns-aliases ns)))]
+             (static-members class)
-             (ns-public-vars ns))))))
+             (when-let [ns (or (find-ns scope) (scope (ns-aliases ns)))]
+               (ns-public-vars ns)))))))
 
 (defmethod potential-completions :class
   [prefix ns]

diff --git a/test/complete/core_test.clj b/test/complete/core_test.clj
@@ -20,6 +20,10 @@
   (is (= '("java.lang.System/out")
          (completions "java.lang.System/out")))
 
+  (is (= () (completions "fake-ns-here/")))
+
+  (is (= () (completions "/")))
+
   (is (some #{"String/valueOf"} (completions "String/")))
 
   (is (not (some #{"String/indexOf" ".indexOf"} (completions "String/")))))