Fix the debugger in case of a local shadows a var

[darkleaf]

Fixes #846

Before submitting a PR make sure the following things have been done:

• [x] The commits are consistent with our contribution guidelines
• [x] You've added tests to cover your change(s)
• [x] All tests are passing
• [x] You've updated the README
• [x] Middleware documentation is up to date
  • Please check out and modify the cider.nrepl ns which has all middleware documentation.
  • Run lein docs afterwards, and commit the results.

Note: If you're just starting out to hack on cider-nrepl you might find nREPL's documentation and the "Design" section of the README extremely useful.*

Thanks!

---

1. resolve have an extra arity for &env
2. I added arity for looks-step-innable? for backwards compatibility

(defn ns-resolve
  "Returns the var or Class to which a symbol will be resolved in the
  namespace (unless found in the environment), else nil.  Note that
  if the symbol is fully qualified, the var/Class to which it resolves
  need not be present in the namespace."
  {:added "1.0"
   :static true}
  ([ns sym]
    (ns-resolve ns nil sym))
  ([ns env sym]
    (when-not (contains? env sym)
      (clojure.lang.Compiler/maybeResolveIn (the-ns ns) sym))))

(defn resolve
  "same as (ns-resolve *ns* symbol) or (ns-resolve *ns* &env symbol)"
  {:added "1.0"
   :static true}
  ([sym] (ns-resolve *ns* sym))
  ([env sym] (ns-resolve *ns* env sym)))

[vemv]

Nice fix, thanks much!

I will merge it. First, please:

• satisfy the small suggestion
• satisfy the PR checklist
• add an entry to the CHANGELOG
• run export LEIN_JVM_OPTS="-Dmranderson.internal.no-parallelism=true"; PROJECT_VERSION=0.45.0 make install in the project root
  • make sure 0.45.0 matches with the version you normally use
  • use this locally-installed version for a reasonable period, so that we can gain confidence in that nothing in the debugger broke.

Cheers - V

[darkleaf]

[bbatsov]

The changes look good to me. @vemv did you by any chance forgot to revisit this PR?

[vemv]

@darkleaf have you been testing out this changes locally in the meantime?

[darkleaf]

@darkleaf have you been testing out this changes locally in the meantime?

Yes

[vemv]

Awesome - thank you!

PR LGTM after addressing @bbatsov 's feedback

[vemv]

Thanks much!

There should be a release within the next few days.