-
Notifications
You must be signed in to change notification settings - Fork 234
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
Handle Persistent_env.Error
in Typemod.initial_env
#1355
Merged
trefis
merged 1 commit into
ocaml:master
from
antalsz:initial-env-handle-persistent-env-error
Jul 15, 2021
Merged
Handle Persistent_env.Error
in Typemod.initial_env
#1355
trefis
merged 1 commit into
ocaml:master
from
antalsz:initial-env-handle-persistent-env-error
Jul 15, 2021
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
Thanks! |
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 04:45:37 PM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` can be use to change the depth of the recursive construction. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318) - disable tests failing in Opam's CI due to nested dune projects (ocaml/merlin#1373)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 04:45:37 PM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` can be use to change the depth of the recursive construction. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318) - disable tests failing in Opam's CI due to nested dune projects (ocaml/merlin#1373)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 04:45:37 PM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` can be use to change the depth of the recursive construction. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318) - disable tests failing in Opam's CI due to nested dune projects (ocaml/merlin#1373)
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.
We have some users who are nondeterministically getting the error
We believe this to be due to a race with writing out
.cmi
files during the build process, and think it can be fixed by handling this exception inTypemod.initial_env
in the same way other relevant errors are handled.This change should probably be added to the "Backport to 3.4" and "Backport to 411" projects, but as I'm not a member of this repository I don't seem to be able to do that.