Skip to content
Browse files

Bump clojure-complete version and lose the hack

  • Loading branch information...
1 parent 11c6991 commit 9d04c9ebda2ccdb5ccf30ac405ae24511c444e85 @trptcolin trptcolin committed Feb 15, 2012
View
2 project.clj
@@ -4,7 +4,7 @@
[org.clojars.trptcolin/jline "2.6-alpha1"]
[org.thnetos/cd-client "0.3.1" :exclusions [org.clojure/clojure]]
[clj-stacktrace "0.2.4"]
- [clojure-complete "0.1.4" :exclusions [org.clojure/clojure]]
+ [clojure-complete "0.2.1" :exclusions [org.clojure/clojure]]
[org.clojure/tools.nrepl "0.2.0-beta1"]]
:dev-dependencies [[midje "1.3-alpha4" :exclusions [org.clojure/clojure]]
[lein-midje "[1.0.0,)"]]
View
12 src/clj/reply/initialization.clj
@@ -31,15 +31,6 @@
(with-meta sym (meta value-var))
@value-var))
-(def resolve-class
- (fn [sym]
- (try (let [val (resolve sym)]
- (when (class? val) val))
- (catch Exception e
- (when (not= ClassNotFoundException
- (class (clojure.main/repl-exception e)))
- (throw e))))))
-
(defn export-definition [s]
(read-string (clojure.repl/source-fn s)))
@@ -74,9 +65,6 @@
~(export-definition 'reply.initialization/sourcery)
(~'intern-with-meta '~'user '~'sourcery ~'#'sourcery)
- ~(export-definition 'reply.initialization/resolve-class)
- (~'intern-with-meta '~'complete '~'resolve-class ~'#'resolve-class)
-
(in-ns '~'user)
; assumes cd-client is on the execution classpath by now
View
4 src/clj/reply/reader/jline/completion.clj
@@ -1,12 +1,12 @@
(ns reply.reader.jline.completion
(:require [reply.completion :as completion]
[reply.eval-state :as eval-state]
- [complete :as ninjudd.complete])
+ [complete.core :as ninjudd.complete])
(:import [jline.console.completer Completer]))
(defn construct-possible-completions-form [prefix]
`(do
- (~'require '[~'complete :as ~'ninjudd.complete])
+ (~'require '[~'complete.core :as ~'ninjudd.complete])
(~'sort (~'ninjudd.complete/completions (~'str ~prefix) ~'*ns*))))
(defn make-completer [eval-fn redraw-line-fn]
View
2 test/reply/reader/jline/completion_test.clj
@@ -4,6 +4,6 @@
(fact "correct quoting in completions form request"
(construct-possible-completions-form "clojure.core/map-") =>
- '(do (require '[complete :as ninjudd.complete])
+ '(do (require '[complete.core :as ninjudd.complete])
(sort (ninjudd.complete/completions (str "clojure.core/map-") *ns*)))
)

0 comments on commit 9d04c9e

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