Emacs completion: Include module prefix in completion candidates #497
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
juergenhoetzel
force-pushed
the
capf-module-completion
branch
from
1fbf45c to
ae644e9
Compare
Contributor
Author
|
@bbatsov You contributed the original code: Could you take a look? |
juergenhoetzel
force-pushed
the
capf-module-completion
branch
2 times, most recently
from
e99219b to
b684685
Compare
bbatsov
reviewed
Mar 8, 2025
src/top/utop.el
Outdated
| (push argument utop-completion) | ||
| (throw 'done t)))))) | ||
| (when-let* ((pos (string-match "[^.]*$" prefix)) | ||
| ((string-prefix-p (substring prefix pos) argument))) |
Contributor
There was a problem hiding this comment.
I don't like much pushing conditional checks without bindings to when-let, as this makes a bit harder to understand what the code does.
bbatsov
reviewed
Mar 8, 2025
src/top/utop.el
Outdated
| (throw 'done t)))))) | ||
| (when-let* ((pos (string-match "[^.]*$" prefix)) | ||
| ((string-prefix-p (substring prefix pos) argument))) | ||
| (push (concat (substring prefix 0 pos) argument) utop-completion) |
Contributor
There was a problem hiding this comment.
Probably a binding for (substring prefix 0 pos) will make this bit of code slightly easier to understand.
Contributor
Author
There was a problem hiding this comment.
Thanks for your helpful suggestions. I amended the commit.
Fixes a mismatch of the completion START position in the Emacs buffer and the candidatates that didn't include the expected module-prefix. Fixes ocaml-community#455
juergenhoetzel
force-pushed
the
capf-module-completion
branch
from
b684685 to
1b0d11a
Compare
bbatsov
approved these changes
Apr 3, 2025
Contributor
bbatsov
left a comment
bbatsov
left a comment
There was a problem hiding this comment.
The proposed change seems solid to me!
Member
|
The code looks correct from afar (I am unfortunately less familiar with emacs than with the compiler), however I am not been able to reproduce the bug report yet. @juergenhoetzel , do you have a full reproduction case that I could follow to check the bug and the fix in order to move forward with this PR? |
Contributor
Author
Of course:
Result: No completions Using this PR, this will result in |
Member
|
I finally found the time to test the fix, sorry for the wait ! I have merged the PR and it should be part of the upcomong 2.16.0 release this week. |
Octachron
added a commit
to Octachron/opam-repository
that referenced
this pull request
Jul 25, 2025
CHANGES: * Add support for OCaml 5.4 (ocaml-community/utop#500, @Octachron, @anmonteiro) * restore backtrace (ocaml-community/utop#503, fixes ocaml-community/utop#501, @ysalmon) * support camlp$n preprocessor (ocaml-community/utop#486, fixes ocaml-community/utop#485, @aqjune) * utop configuration and state files (utoprc, utop-history) are now always in the relevant utop subdirectory (ocaml-community/utop#484, fixes ocaml-community/utop#478, ocaml-community/utop#481 and ocaml-community/utop#499, @tuohy). * fix emacs completion for qualified paths (Module.M.some_name) (ocaml-community/utop#497, fix ocaml-community/utop#455, @juergenhoetzel, @bbatsov) * implicit bindings for emacs mode (ocaml-community/utop#465, fix ocaml-community/utop#412, @bencef)
Octachron
added a commit
to Octachron/opam-repository
that referenced
this pull request
Jul 25, 2025
CHANGES: * Add support for OCaml 5.4 (ocaml-community/utop#500, @Octachron, @anmonteiro) * restore backtrace (ocaml-community/utop#503, fixes ocaml-community/utop#501, @ysalmon) * support camlp$n preprocessor (ocaml-community/utop#486, fixes ocaml-community/utop#485, @aqjune) * utop configuration and state files (utoprc, utop-history) are now always in the relevant utop subdirectory (ocaml-community/utop#484, fixes ocaml-community/utop#478, ocaml-community/utop#481 and ocaml-community/utop#499, @tuohy). * fix emacs completion for qualified paths (Module.M.some_name) (ocaml-community/utop#497, fix ocaml-community/utop#455, @juergenhoetzel, @bbatsov) * implicit bindings for emacs mode (ocaml-community/utop#465, fix ocaml-community/utop#412, @bencef)
Octachron
added a commit
to Octachron/opam-repository
that referenced
this pull request
Jul 25, 2025
CHANGES: * Add support for OCaml 5.4 (ocaml-community/utop#500, @Octachron, @anmonteiro) * restore backtrace (ocaml-community/utop#503, fixes ocaml-community/utop#501, @ysalmon) * support camlp$n preprocessor (ocaml-community/utop#486, fixes ocaml-community/utop#485, @aqjune) * utop configuration and state files (utoprc, utop-history) are now always in the relevant utop subdirectory (ocaml-community/utop#484, fixes ocaml-community/utop#478, ocaml-community/utop#481 and ocaml-community/utop#499, @tuohy). * fix emacs completion for qualified paths (Module.M.some_name) (ocaml-community/utop#497, fix ocaml-community/utop#455, @juergenhoetzel, @bbatsov) * implicit bindings for emacs mode (ocaml-community/utop#465, fix ocaml-community/utop#412, @bencef)
Octachron
added a commit
to Octachron/opam-repository
that referenced
this pull request
Jul 25, 2025
CHANGES: * Add support for OCaml 5.4 (ocaml-community/utop#500, @Octachron, @anmonteiro) * restore backtrace (ocaml-community/utop#503, fixes ocaml-community/utop#501, @ysalmon) * support camlp$n preprocessor (ocaml-community/utop#486, fixes ocaml-community/utop#485, @aqjune) * utop configuration and state files (utoprc, utop-history) are now always in the relevant utop subdirectory (ocaml-community/utop#484, fixes ocaml-community/utop#478, ocaml-community/utop#481 and ocaml-community/utop#499, @tuohy). * fix emacs completion for qualified paths (Module.M.some_name) (ocaml-community/utop#497, fix ocaml-community/utop#455, @juergenhoetzel, @bbatsov) * implicit bindings for emacs mode (ocaml-community/utop#465, fix ocaml-community/utop#412, @bencef)
Octachron
added a commit
to Octachron/opam-repository
that referenced
this pull request
Jul 25, 2025
CHANGES: * Add support for OCaml 5.4 (ocaml-community/utop#500, @Octachron, @anmonteiro) * restore backtrace (ocaml-community/utop#503, fixes ocaml-community/utop#501, @ysalmon) * support camlp$n preprocessor (ocaml-community/utop#486, fixes ocaml-community/utop#485, @aqjune) * utop configuration and state files (utoprc, utop-history) are now always in the relevant utop subdirectory (ocaml-community/utop#484, fixes ocaml-community/utop#478, ocaml-community/utop#481 and ocaml-community/utop#499, @tuohy). * fix emacs completion for qualified paths (Module.M.some_name) (ocaml-community/utop#497, fix ocaml-community/utop#455, @juergenhoetzel, @bbatsov) * implicit bindings for emacs mode (ocaml-community/utop#465, fix ocaml-community/utop#412, @bencef)
Octachron
added a commit
to Octachron/opam-repository
that referenced
this pull request
Jul 25, 2025
CHANGES: * Add support for OCaml 5.4 (ocaml-community/utop#500, @Octachron, @anmonteiro) * restore backtrace (ocaml-community/utop#503, fixes ocaml-community/utop#501, @ysalmon) * support camlp$n preprocessor (ocaml-community/utop#486, fixes ocaml-community/utop#485, @aqjune) * utop configuration and state files (utoprc, utop-history) are now always in the relevant utop subdirectory (ocaml-community/utop#484, fixes ocaml-community/utop#478, ocaml-community/utop#481 and ocaml-community/utop#499, @tuohy). * fix emacs completion for qualified paths (Module.M.some_name) (ocaml-community/utop#497, fix ocaml-community/utop#455, @juergenhoetzel, @bbatsov) * implicit bindings for emacs mode (ocaml-community/utop#465, fix ocaml-community/utop#412, @bencef)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes a mismatch of the completion START position in the Emacs buffer and the candidatates that didn't include the expected module-prefix.
Fixes #455