Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Bump clojure-complete version and lose the hack

  • Loading branch information...
commit 9d04c9ebda2ccdb5ccf30ac405ae24511c444e85 1 parent 11c6991
Colin Jones trptcolin authored
2  project.clj
@@ -4,7 +4,7 @@
4 4 [org.clojars.trptcolin/jline "2.6-alpha1"]
5 5 [org.thnetos/cd-client "0.3.1" :exclusions [org.clojure/clojure]]
6 6 [clj-stacktrace "0.2.4"]
7   - [clojure-complete "0.1.4" :exclusions [org.clojure/clojure]]
  7 + [clojure-complete "0.2.1" :exclusions [org.clojure/clojure]]
8 8 [org.clojure/tools.nrepl "0.2.0-beta1"]]
9 9 :dev-dependencies [[midje "1.3-alpha4" :exclusions [org.clojure/clojure]]
10 10 [lein-midje "[1.0.0,)"]]
12 src/clj/reply/initialization.clj
@@ -31,15 +31,6 @@
31 31 (with-meta sym (meta value-var))
32 32 @value-var))
33 33
34   -(def resolve-class
35   - (fn [sym]
36   - (try (let [val (resolve sym)]
37   - (when (class? val) val))
38   - (catch Exception e
39   - (when (not= ClassNotFoundException
40   - (class (clojure.main/repl-exception e)))
41   - (throw e))))))
42   -
43 34 (defn export-definition [s]
44 35 (read-string (clojure.repl/source-fn s)))
45 36
@@ -74,9 +65,6 @@
74 65 ~(export-definition 'reply.initialization/sourcery)
75 66 (~'intern-with-meta '~'user '~'sourcery ~'#'sourcery)
76 67
77   - ~(export-definition 'reply.initialization/resolve-class)
78   - (~'intern-with-meta '~'complete '~'resolve-class ~'#'resolve-class)
79   -
80 68 (in-ns '~'user)
81 69
82 70 ; assumes cd-client is on the execution classpath by now
4 src/clj/reply/reader/jline/completion.clj
... ... @@ -1,12 +1,12 @@
1 1 (ns reply.reader.jline.completion
2 2 (:require [reply.completion :as completion]
3 3 [reply.eval-state :as eval-state]
4   - [complete :as ninjudd.complete])
  4 + [complete.core :as ninjudd.complete])
5 5 (:import [jline.console.completer Completer]))
6 6
7 7 (defn construct-possible-completions-form [prefix]
8 8 `(do
9   - (~'require '[~'complete :as ~'ninjudd.complete])
  9 + (~'require '[~'complete.core :as ~'ninjudd.complete])
10 10 (~'sort (~'ninjudd.complete/completions (~'str ~prefix) ~'*ns*))))
11 11
12 12 (defn make-completer [eval-fn redraw-line-fn]
2  test/reply/reader/jline/completion_test.clj
@@ -4,6 +4,6 @@
4 4
5 5 (fact "correct quoting in completions form request"
6 6 (construct-possible-completions-form "clojure.core/map-") =>
7   - '(do (require '[complete :as ninjudd.complete])
  7 + '(do (require '[complete.core :as ninjudd.complete])
8 8 (sort (ninjudd.complete/completions (str "clojure.core/map-") *ns*)))
9 9 )

0 comments on commit 9d04c9e

Please sign in to comment.
Something went wrong with that request. Please try again.