Skip to content

Jump to fsti's when jumping to a module. Allow user preference for this. #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Jump to fsti's when jumping to a module. Allow user preference for this. #108

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
939c8de
Jump to fsti's when jumping to a module. Allow user preference for this.
jaybosamiya May 25, 2019
151942b
Be a little smarter when performing the test
jaybosamiya May 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion fstar-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3757,6 +3757,22 @@ CONTEXT indicates where SYMBOL comes from."
:line-to (elt .end 0)
:col-to (elt .end 1)))))

(defcustom fstar-prefer-fsti-when-jumping-to-modules t
"If non-nil (default), prefer jumping to the fsti when jumping to a module."
:group 'fstar
:type 'boolean)

(defun fstar--module-path (path)
"Chose module path based upon user preference"
(if fstar-prefer-fsti-when-jumping-to-modules
(let ((testpath (concat path "i")))
(if (and
(string-suffix-p ".fst" path)
(file-readable-p testpath))
testpath
path))
path))

(defun fstar-subp-json--parse-info (json)
"Parse info structure from JSON."
(pcase (or (cdr (assq 'kind json)) "symbol")
Expand All @@ -3777,7 +3793,7 @@ CONTEXT indicates where SYMBOL comes from."
((or "module" "namespace")
(let-alist json
(make-fstar-ns-or-mod-info
:name .name :doc nil :def-loc .path :kind .kind
:name .name :doc nil :def-loc (fstar--module-path .path) :kind .kind
:loaded (fstar--lispify-false .loaded))))
(other
(message "Unrecognized info kind: %s. Try updating fstar-mode." other))))
Expand Down