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.

Sign up for GitHub

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

Jump to bottom

Emacs: reset configuration in all buffers when stopping the merlin server #1004

Merged
merged 1 commit into from
Sep 10, 2019
Merged

Emacs: reset configuration in all buffers when stopping the merlin server #1004

merged 1 commit into from
Sep 10, 2019

Conversation

Wilfred
Copy link
Contributor

@Wilfred Wilfred commented Jul 24, 2019 •
edited
Loading

Otherwise, restarting the server after changing merlin-command has no effect, because the old value for merlin-command is cached in merlin-buffer-configuration.

@Wilfred
Emacs: reset configuration in all buffers when stopping the merlin se…
878d5c4 
…rver

Otherwise, restarting the server after changing merlin-command has no
effect, because the old value for merlin-command is cached in
merlin-buffer-configuration.
@Wilfred Wilfred changed the title Emacs: reset buffer configuration when stopping the merlin server Emacs: reset configuration in all buffers when stopping the merlin server Jul 24, 2019
@trefis
Copy link
Contributor

trefis commented Sep 9, 2019

That looks right to me, but I'm not confident enough to press the merge button.
@rgrinberg: would you mind having a look?

@rgrinberg
Copy link
Member

Looks good to me.

@trefis trefis merged commit b236f7a into ocaml:master Sep 10, 2019
@trefis
Copy link
Contributor

trefis commented Sep 10, 2019

Thanks all!

@Wilfred Wilfred deleted the reset-config-on-restart branch September 12, 2019 10:12
@let-def let-def mentioned this pull request Nov 29, 2019
Merged
let-def added a commit to let-def/opam-repository that referenced this pull request Nov 29, 2019
@let-def
[new release] merlin (3.3.3)
75ea28f 
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 let-def mentioned this pull request Mar 2, 2020
Merged
let-def added a commit to let-def/opam-repository that referenced this pull request Mar 2, 2020
@let-def
[new release] merlin (3.3.4-4.10preview1)
bd38c15 
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
Reviewers

@fangyi-zhou fangyi-zhou fangyi-zhou left review comments

@trefis trefis trefis left review comments

@rgrinberg rgrinberg rgrinberg approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Wilfred @trefis @rgrinberg @fangyi-zhou