-
Notifications
You must be signed in to change notification settings - Fork 124
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.
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
Fix prefix parsing to start method completion when typing #
#1363
Merged
Conversation
This file contains 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
Object methods are not completed
voodoos
added a commit
to voodoos/ocaml-lsp
that referenced
this pull request
Aug 23, 2024
voodoos
added a commit
to voodoos/ocaml-lsp
that referenced
this pull request
Aug 23, 2024
Pull Request Test Coverage Report for Build 4494Details
💛 - Coveralls |
rgrinberg
approved these changes
Aug 23, 2024
How about this is moved to a separate PR? It should also have its own CHANGES entry I believe |
voodoos
added a commit
to voodoos/ocaml-lsp
that referenced
this pull request
Aug 26, 2024
When completing module paths or record fields Merlin expects the beginning of the path and the `.` to be part of the prefix. But when accessing an object's methods, the prefix should not contain the `#` sign. We use a sub-matching group to that effect. - Prefix for [my_record.|] is ["my_record."] (handled by [name_or_label]) - Prefix for [my_object#|] is [""] (handled by [method_call])
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Nov 29, 2024
CHANGES: ## Features - Add custom [`ocamllsp/typeSearch`](/ocaml-lsp-server/docs/ocamllsp/typeSearch-spec.md) request (ocaml/ocaml-lsp#1369) - Make MerlinJump code action configurable (ocaml/ocaml-lsp#1376) - Add custom [`ocamllsp/jump`](/ocaml-lsp-server/docs/ocamllsp/merlinJump-spec.md) request (ocaml/ocaml-lsp#1374) ## Fixes - Fix fd leak in running external processes for preprocessing (ocaml/ocaml-lsp#1349) - Fix prefix parsing for completion of object methods (ocaml/ocaml-lsp#1363, fixes ocaml/ocaml-lsp#1358) - Remove some duplicates in the `selectionRange` answers (ocaml/ocaml-lsp#1368)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Nov 29, 2024
CHANGES: ## Features - Add custom [`ocamllsp/typeSearch`](/ocaml-lsp-server/docs/ocamllsp/typeSearch-spec.md) request (ocaml/ocaml-lsp#1369) - Make MerlinJump code action configurable (ocaml/ocaml-lsp#1376) - Add custom [`ocamllsp/jump`](/ocaml-lsp-server/docs/ocamllsp/merlinJump-spec.md) request (ocaml/ocaml-lsp#1374) ## Fixes - Fix fd leak in running external processes for preprocessing (ocaml/ocaml-lsp#1349) - Fix prefix parsing for completion of object methods (ocaml/ocaml-lsp#1363, fixes ocaml/ocaml-lsp#1358) - Remove some duplicates in the `selectionRange` answers (ocaml/ocaml-lsp#1368)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Nov 29, 2024
CHANGES: ## Features - Add custom [`ocamllsp/typeSearch`](/ocaml-lsp-server/docs/ocamllsp/typeSearch-spec.md) request (ocaml/ocaml-lsp#1369) - Make MerlinJump code action configurable (ocaml/ocaml-lsp#1376) - Add custom [`ocamllsp/jump`](/ocaml-lsp-server/docs/ocamllsp/merlinJump-spec.md) request (ocaml/ocaml-lsp#1374) ## Fixes - Fix fd leak in running external processes for preprocessing (ocaml/ocaml-lsp#1349) - Fix prefix parsing for completion of object methods (ocaml/ocaml-lsp#1363, fixes ocaml/ocaml-lsp#1358) - Remove some duplicates in the `selectionRange` answers (ocaml/ocaml-lsp#1368)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When completing method access like in
my_object#a|
Merlin expect the "prefix" to bea
and notmyobject#a
as it would be for accessing a record field.This PR introduces a special case in the parsing of prefixes.
Additionally I found the
in
keyword completion a bit too aggressive and removed on of the cases. @ulugbekna do you remember why you made completions with an empty prefix always suggest thein
keyword ?