Skip to content

Don't repeat environment entries in Typemod.check_type_decl (ocaml/ocaml#10382)#1334

Merged
voodoos merged 3 commits intoocaml:masterfrom
voodoos:issue1322
Nov 23, 2021
Merged

Don't repeat environment entries in Typemod.check_type_decl (ocaml/ocaml#10382)#1334
voodoos merged 3 commits intoocaml:masterfrom
voodoos:issue1322

Conversation

@voodoos
Copy link
Copy Markdown
Collaborator

@voodoos voodoos commented Apr 29, 2021

This cherry picks @lpw25 patch in ocaml/ocaml#10382.

Fixes #1322

@voodoos voodoos merged commit 5497c56 into ocaml:master Nov 23, 2021
voodoos added a commit to voodoos/opam-repository that referenced this pull request Nov 23, 2021
CHANGES:

Mon Jul 26 11:12:21 PM CET 2021

  + merlin binary
    - Mbrowse.select_leaf: correctly ignore merlin.hide (ocaml/merlin#1376)
    - enable `occurences` to work when looking for locally abstract types
      (ocaml/merlin#1382)
    - handle `-alert` compiler flag (ocaml/merlin#1401)
    - avoid a race condition when the process started to read a configuration
      file crashes/is not found (ocaml/merlin#1378, @antalsz)
    - log the backtrace even when the exception is a Failure (ocaml/merlin#1377, @antalsz)
    - ignore `-error-style` compiler flag (ocaml/merlin#1402, @nojb)
    - fix handling of record field expressions (ocaml/merlin#1375)
    - allow -pp to return an AST (ocaml/merlin#1394)
    - fix merlin crashing due to short-paths (ocaml/merlin#1334, fixes ocaml/merlin#1322)
  + editor modes
    - update quick setup instructions for emacs (ocaml/merlin#1380, @ScriptDevil)
  + test suite
    - improve record field destruction testing (ocaml/merlin#1375)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Nov 23, 2021
CHANGES:

Mon Jul 26 11:12:21 PM CET 2021

  + ocaml support
    - add support for 4.13
    - stopped actively supporting version older than 4.12
  + merlin binary
    - Mbrowse.select_leaf: correctly ignore merlin.hide (ocaml/merlin#1376)
    - enable `occurences` to work when looking for locally abstract types
      (ocaml/merlin#1382)
    - handle `-alert` compiler flag (ocaml/merlin#1401)
    - avoid a race condition when the process started to read a configuration
      file crashes/is not found (ocaml/merlin#1378, @antalsz)
    - log the backtrace even when the exception is a Failure (ocaml/merlin#1377, @antalsz)
    - ignore `-error-style` compiler flag (ocaml/merlin#1402, @nojb)
    - fix handling of record field expressions (ocaml/merlin#1375)
    - allow -pp to return an AST (ocaml/merlin#1394)
    - fix merlin crashing due to short-paths (ocaml/merlin#1334, fixes ocaml/merlin#1322)
  + editor modes
    - update quick setup instructions for emacs (ocaml/merlin#1380, @ScriptDevil)
  + test suite
    - improve record field destruction testing (ocaml/merlin#1375)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Nov 23, 2021
CHANGES:

Mon Jul 26 11:12:21 PM CET 2021

  + merlin binary
    - Mbrowse.select_leaf: correctly ignore merlin.hide (ocaml/merlin#1376)
    - enable `occurences` to work when looking for locally abstract types
      (ocaml/merlin#1382)
    - handle `-alert` compiler flag (ocaml/merlin#1401)
    - avoid a race condition when the process started to read a configuration
      file crashes/is not found (ocaml/merlin#1378, @antalsz)
    - log the backtrace even when the exception is a Failure (ocaml/merlin#1377, @antalsz)
    - ignore `-error-style` compiler flag (ocaml/merlin#1402, @nojb)
    - fix handling of record field expressions (ocaml/merlin#1375)
    - allow -pp to return an AST (ocaml/merlin#1394)
    - fix merlin crashing due to short-paths (ocaml/merlin#1334, fixes ocaml/merlin#1322)
  + editor modes
    - update quick setup instructions for emacs (ocaml/merlin#1380, @ScriptDevil)
  + test suite
    - improve record field destruction testing (ocaml/merlin#1375)
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.

module with type constraint crashes merlin

1 participant