Skip to content
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
merged 3 commits into from
Aug 26, 2024

Conversation

voodoos
Copy link
Collaborator

@voodoos voodoos commented Aug 23, 2024

When completing method access like in my_object#a| Merlin expect the "prefix" to be a and not myobject#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 the in keyword ?

Object methods are not completed
@voodoos voodoos linked an issue Aug 23, 2024 that may be closed by this pull request
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
@coveralls
Copy link

coveralls commented Aug 23, 2024

Pull Request Test Coverage Report for Build 4494

Details

  • 4 of 4 (100.0%) changed or added relevant lines in 1 file are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.02%) to 21.778%

Totals Coverage Status
Change from base Build 4488: 0.02%
Covered Lines: 5530
Relevant Lines: 25393

💛 - Coveralls

ocaml-lsp-server/src/prefix_parser.ml Outdated Show resolved Hide resolved
@rgrinberg
Copy link
Member

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 the in keyword ?

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 voodoos merged commit 51e16ea into ocaml:master Aug 26, 2024
7 checks passed
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Take class methods into account for suggestions
3 participants