Fix completion for polymorphic variants#473
Merged
ulugbekna merged 3 commits intoocaml:masterfrom Jul 12, 2021
Merged
Conversation
rgrinberg
approved these changes
Jul 10, 2021
Member
rgrinberg
left a comment
There was a problem hiding this comment.
Looks good. Please add a CHANGES entry since this is bug of our own making.
| false | ||
| else ( | ||
| should_terminate := true; | ||
| true |
Member
There was a problem hiding this comment.
This is a bit tidier:
if not !has_seen_dot then should_terminate := true;
not !has_seen_dotAlternatively, we could track the negative with waiting_for_dot and remove the extra not.
Collaborator
Author
There was a problem hiding this comment.
If you do not have strong preference here, I'd keep the current version: it seems simpler to understand (to me).
Collaborator
Author
|
Thanks for the review! I added the changes entry. |
rgrinberg
added a commit
to rgrinberg/opam-repository
that referenced
this pull request
Aug 19, 2021
CHANGES:
## Features
- Add a new code action `Add missing rec keyword`, which is available when
adding a `rec` keyword can fix `Unbound value ...` error, e.g.,
```ocaml
let fact n = if n = 0 then 1 else n * fact (n - 1)
(* ^^^^ Unbound value fact *)
```
Adding `rec` to the definition of `fact` will fix the problem. The new code
action offers adding `rec`.
- Jump to the first hole on calling `Destruct` code action (only with client
VSCode OCaml Platform) (ocaml/ocaml-lsp#468)
Example: when a user invokes `Destruct` code action on `Some 1`, this code is
replaced by `match Some 1 with None -> _ | Some _ -> _`, where the 1st and
3rd underscores are "typed holes", a concept created by Merlin to be able to
put "holes" in OCaml code.
With this change, now for VSCode OCaml Platform users, on such invocation of
`Destruct`, the cursor will jump to the first typed hole and select it, so
that user can start editing right away.
- Use ocamlformat to properly format type snippets. This feature requires the
`ocamlformat-rpc` opam package to be installed. (ocaml/ocaml-lsp#386)
- Add completion support for polymorphic variants, when it is possible to pin
down the precise type. Examples (`<|>` stands for the cursor) when completion
will work (ocaml/ocaml-lsp#473)
Function application:
```
let foo (a: [`Alpha | `Beta]) = ()
foo `A<|>
```
Type explicitly shown:
```
let a : [`Alpha | `Beta] = `B<|>
```
Note: this is actually a bug fix, since we were ignoring the backtick when
constructing the prefix for completion.
- Parse merlin errors (best effort) into a more structured form. This allows
reporting all locations as "related information" (ocaml/ocaml-lsp#475)
- Add support for Merlin `Construct` command as completion suggestions, i.e.,
show complex expressions that could complete the typed hole. (ocaml/ocaml-lsp#472)
- Add a code action `Construct an expression` that is shown when the cursor is
at the end of the typed hole, i.e., `_|`, where `|` is the cursor. The code
action simply triggers the client (currently only VS Code is supported) to
show completion suggestions. (ocaml/ocaml-lsp#472)
- Change the formatting-on-save error notification to a warning notification
(ocaml/ocaml-lsp#472)
- Code action to qualify ("put module name in identifiers") and unqualify
("remove module name from identifiers") module names in identifiers (ocaml/ocaml-lsp#399)
Starting from:
```ocaml
open Unix
let times = Unix.times ()
let f x = x.Unix.tms_stime, x.Unix.tms_utime
```
Calling "remove module name from identifiers" with the cursor on the open
statement will produce:
```ocaml
open Unix
let times = times ()
let f x = x.tms_stime, x.tms_utime
```
Calling "put module name in identifiers" will restore:
```ocaml
open Unix
let times = Unix.times ()
let f x = x.Unix.tms_stime, x.Unix.tms_utime
```
## Fixes
- Do not show "random" documentation on hover
- fixed by [merlin#1364](ocaml/merlin#1364)
- fixes duplicate:
- [ocaml-lsp#344](ocaml/ocaml-lsp#344)
- [vscode-ocaml-platform#111](ocamllabs/vscode-ocaml-platform#111)
- Correctly rename a variable used as a named/optional argument (ocaml/ocaml-lsp#478)
- When reporting an error at the beginning of the file, use the first line not
the second (ocaml/ocaml-lsp#489)
rgrinberg
added a commit
to rgrinberg/opam-repository
that referenced
this pull request
Aug 25, 2021
CHANGES:
## Features
- Add a new code action `Add missing rec keyword`, which is available when
adding a `rec` keyword can fix `Unbound value ...` error, e.g.,
```ocaml
let fact n = if n = 0 then 1 else n * fact (n - 1)
(* ^^^^ Unbound value fact *)
```
Adding `rec` to the definition of `fact` will fix the problem. The new code
action offers adding `rec`.
- Use ocamlformat to properly format type snippets. This feature requires the
`ocamlformat-rpc` opam package to be installed. (ocaml/ocaml-lsp#386)
- Add completion support for polymorphic variants, when it is possible to pin
down the precise type. Examples (`<|>` stands for the cursor) when completion
will work (ocaml/ocaml-lsp#473)
Function application:
```
let foo (a: [`Alpha | `Beta]) = ()
foo `A<|>
```
Type explicitly shown:
```
let a : [`Alpha | `Beta] = `B<|>
```
Note: this is actually a bug fix, since we were ignoring the backtick when
constructing the prefix for completion.
- Parse merlin errors (best effort) into a more structured form. This allows
reporting all locations as "related information" (ocaml/ocaml-lsp#475)
- Add support for Merlin `Construct` command as completion suggestions, i.e.,
show complex expressions that could complete the typed hole. (ocaml/ocaml-lsp#472)
- Add a code action `Construct an expression` that is shown when the cursor is
at the end of the typed hole, i.e., `_|`, where `|` is the cursor. The code
action simply triggers the client (currently only VS Code is supported) to
show completion suggestions. (ocaml/ocaml-lsp#472)
- Change the formatting-on-save error notification to a warning notification
(ocaml/ocaml-lsp#472)
- Code action to qualify ("put module name in identifiers") and unqualify
("remove module name from identifiers") module names in identifiers (ocaml/ocaml-lsp#399)
Starting from:
```ocaml
open Unix
let times = Unix.times ()
let f x = x.Unix.tms_stime, x.Unix.tms_utime
```
Calling "remove module name from identifiers" with the cursor on the open
statement will produce:
```ocaml
open Unix
let times = times ()
let f x = x.tms_stime, x.tms_utime
```
Calling "put module name in identifiers" will restore:
```ocaml
open Unix
let times = Unix.times ()
let f x = x.Unix.tms_stime, x.Unix.tms_utime
```
## Fixes
- Do not show "random" documentation on hover
- fixed by [merlin#1364](ocaml/merlin#1364)
- fixes duplicate:
- [ocaml-lsp#344](ocaml/ocaml-lsp#344)
- [vscode-ocaml-platform#111](ocamllabs/vscode-ocaml-platform#111)
- Correctly rename a variable used as a named/optional argument (ocaml/ocaml-lsp#478)
- When reporting an error at the beginning of the file, use the first line not
the second (ocaml/ocaml-lsp#489)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
When reconstructing prefix, we were ignoring backtick, which resulted in wrong completion entries, see the first commit.
I modified prefix building function to
Fiber.return, we ignore the backtick that, say, comes before that prefix ie `Fiber.return. (I understand that the user shouldn't put the backtick there in the first place, but let's provide the best completions when we can)I used some mutations along with
String.rfindiinstead of hand-writing the loop because I though it's still easier to reason about that a hand-written loop.