Update creation of initial environment #1052
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
Merged
let-def
requested changes
Nov 11, 2019
src/ocaml/utils/408/load_path.ml
Outdated
| (* Mapping from basenames to full filenames *) | ||
| type registry = string SMap.t ref | ||
|
|
||
| let state = Local_store.new_bindings () |
There was a problem hiding this comment.
The state value represents a list of dynamically-scoped variables.
With srefk create new variables, but at no point in time you redefine these variables.
See https://github.com/ocaml/merlin/blob/master/src/kernel/mocaml.ml#L30 for instance.
The original design assumed that there might be different notion of global scopes, hence the distinction between Btype.state and Env.state.
However I think a single typechecker_state might be sufficient, and so this notion of binding could be removed.
I will write a PR to simplify this.
There was a problem hiding this comment.
Thanks, I rebased and this should now be fixed.
There was a problem hiding this comment.
Actually, the last commit (which uses Local_store.Typechecker) breaks the tests.
I guess there's something I missunderstood.
let-def
approved these changes
Nov 11, 2019
This pulls in the new Load_path module from the compiler distribution, but adds a layer of caching on directories content.
let-def
added a commit
to let-def/opam-repository
that referenced
this pull request
Nov 29, 2019
CHANGES:
Fri Nov 29 17:35:58 CET 2019
+ backend
- support OCaml 4.09 (ocaml/merlin#1055)
- fix parse errors in 4.08 (ocaml/merlin#1037)
- update 4.08 support to OCaml 4.08.1 (ocaml/merlin#1053)
- support `without_cmis`
- separate reading from caching in file-cache, use caching in
`Env.check_state_consistency` (ocaml/merlin#1044)
- simplify compiler state management (ocaml/merlin#1056, ocaml/merlin#1059)
- fix creation of initial environment, improve compatibility with
upstream 4.08 (ocaml/merlin#1052)
+ frontend
- code re-organization (ocaml/merlin#1042)
- error command: select which kind of errors to show (ocaml/merlin#995)
- print value types in outline (ocaml/merlin#1014)
- fix process handling in windows (ocaml/merlin#1005)
+ editor modes
- emacs
+ bugfixes in merlin-imenu, merlin-xref (ocaml/merlin#1000, ocaml/merlin#1021, ocaml/merlin#1001)
+ show types in merlin-imenu (ocaml/merlin#1013)
+ reset buffer local configurations when resetting server (ocaml/merlin#1004)
+ remove merlin-use-tuareg-imenu
+ fix stack overflow (ocaml/merlin#1024)
+ fix merlin-occurrence (ocaml/merlin#1043)
- vim
+ display warn-error warnings as errors (ocaml/merlin#1009)
+ testsuite
- cover file-cache and `check_state_consistency` (ocaml/merlin#1044)
- check inconsistent assumptions, test server versus single modes (ocaml/merlin#1047)
let-def
added a commit
to let-def/opam-repository
that referenced
this pull request
Mar 2, 2020
CHANGES:
Fri Nov 29 17:35:58 CET 2019
+ backend
- support OCaml 4.09 (ocaml/merlin#1055)
- fix parse errors in 4.08 (ocaml/merlin#1037)
- update 4.08 support to OCaml 4.08.1 (ocaml/merlin#1053)
- support `without_cmis`
- separate reading from caching in file-cache, use caching in
`Env.check_state_consistency` (ocaml/merlin#1044)
- simplify compiler state management (ocaml/merlin#1056, ocaml/merlin#1059)
- fix creation of initial environment, improve compatibility with
upstream 4.08 (ocaml/merlin#1052)
+ frontend
- code re-organization (ocaml/merlin#1042)
- error command: select which kind of errors to show (ocaml/merlin#995)
- print value types in outline (ocaml/merlin#1014)
- fix process handling in windows (ocaml/merlin#1005)
+ editor modes
- emacs
+ bugfixes in merlin-imenu, merlin-xref (ocaml/merlin#1000, ocaml/merlin#1021, ocaml/merlin#1001)
+ show types in merlin-imenu (ocaml/merlin#1013)
+ reset buffer local configurations when resetting server (ocaml/merlin#1004)
+ remove merlin-use-tuareg-imenu
+ fix stack overflow (ocaml/merlin#1024)
+ fix merlin-occurrence (ocaml/merlin#1043)
- vim
+ display warn-error warnings as errors (ocaml/merlin#1009)
+ testsuite
- cover file-cache and `check_state_consistency` (ocaml/merlin#1044)
- check inconsistent assumptions, test server versus single modes (ocaml/merlin#1047)
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.
Merlin and the compiler behaved differently since 4.07 (and ocaml/ocaml#1010) (cf. #1003).
This PR fixes that, and also updates 4.08 to use the new
Load_pathmodule from the compiler distribution.While I'm confident about the 4.07 fix, the 4.08 might degrade performances, I'll be monitoring that at janestreet over the next few weeks before merging this PR.