Completion and documentation with leading literals #97
Conversation
| @@ -94,11 +95,12 @@ | |||
| ;; If prefix doesn't contain a period, using fuziness produces too many | |||
| ;; irrelevant candidates. | |||
| (for [{:keys [^String ns-str, ^String file]} (utils/namespaces&files-on-classpath) | |||
| :let [[_ quoted prefix] (re-matches #"(@|@?#'|')?(.+)" prefix)] | |||
There was a problem hiding this comment.
Three usages of a not-so-trivial regex, I think this can be extracted into a function.
| @@ -115,7 +117,8 @@ | |||
|
|
|||
| (defn doc [ns-or-class-str curr-ns] | |||
| (when (nscl-symbol? ns-or-class-str) | |||
| (let [ns-or-class-sym (symbol ns-or-class-str)] | |||
| (let [strip-literals #(->> % (re-find #"^[@#']*(.+)") last) | |||
There was a problem hiding this comment.
Two usages, can be extracted into the utils namespace too.
| \"@#'some-alias/db\" => #'some.full.ns/db | ||
| " | ||
| [symbol-str ns] | ||
| (let [strip-literals #(->> % (re-find #"^[@#']*(.+)") last) |
There was a problem hiding this comment.
The code here allows multiple @ while the code above doesn't. Regardless of which way you want it, I'd rather have it consistent across all code that does this.
| symbol-ns (when alias-or-ns-str | ||
| (str (or (find-ns (symbol alias-or-ns-str)) | ||
| (get (ns-aliases ns) (symbol alias-or-ns-str)))))] | ||
| (ns-resolve ns (symbol symbol-ns symbol-name-str)))) |
There was a problem hiding this comment.
I wonder how much of this has to be done manually since ns-resolve already handles a lot of cases. E.g.:
user=> (ns-resolve *ns* (symbol "set/difference"))
#'clojure.set/difference
user=> (ns-resolve *ns* (symbol "clojure.set/difference"))
#'clojure.set/differenceThere was a problem hiding this comment.
Woha!, stripping lots of code 👍🏻
|
@alexander-yakushev really appreciate the quick feedback (and the new release), thanks! Made the changes. |
| (src/doc "#'clojure.core/map" (-ns)) => (checker string?) | ||
| (src/doc "#'src/var-symbol?" (-ns)) => (checker string?) | ||
| (src/doc "bogus" (-ns)) => nil | ||
| (src/doc "bo/gus" (-ns)) => nil)) |
There was a problem hiding this comment.
Could you please indent-2 these?
src/compliment/utils.clj
Outdated
| \"nothing-todo\" => '(nil \"nothing-todo\") | ||
| " | ||
| [symbol-str] | ||
| (rest (re-matches #"(@{0,2}#'|'|@)?(.+)" symbol-str))) |
There was a problem hiding this comment.
next would work better here because (next nil) => nil but (rest nil) => (). That way it would stay more consistent with re-matches returns.
There was a problem hiding this comment.
OTOH, it can't really not match (except on an empty string), so it doesn't matter.
| @@ -115,7 +117,8 @@ | |||
|
|
|||
| (defn doc [ns-or-class-str curr-ns] | |||
| (when (nscl-symbol? ns-or-class-str) | |||
| (let [ns-or-class-sym (symbol ns-or-class-str)] | |||
| (let [strip-literals #(-> % utils/split-by-leading-literals last) | |||
There was a problem hiding this comment.
I think second instead of last would be a more common way to refer to a tuple part. last to me implies a variadic collection rather than a tuple.
Also, (comp second utils/split-by-leading-literals) would look more idiomatic.
Namespace completion works on inputs with leading literals, e.g. "@clojure.", "#'clojure.", "'some.alias". Documentation works on inputs with leading literals: "#'clojure.core", "'some-alias" "#'clojure.core/map"
|
Awesome! Thank you for coming up with all these improvements! If you want to tackle private completion for |
Addresses 1, 2 and 3 as described in #95