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.

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

Fix letops tuples handling (fixes #1683 and ocaml/ocaml-lsp#1182) #1684

Merged
merged 3 commits into from
Sep 26, 2023

Conversation

voodoos
Copy link
Collaborator

@voodoos voodoos commented Sep 25, 2023

let+ pat1 = ... and+ pat2 = ... are internally represented by tuples of patterns, themself encoded by a succesion of couples:
[ ... [ pat1; pat2]; ...]

Merlin was too eager when flattening these tuples and messed with `pat1 if it happened to be a tuple itself.

Fixes #1683
Fixes ocaml/ocaml-lsp#1182

@voodoos voodoos merged commit 9b072a5 into ocaml:master Sep 26, 2023
7 checks passed
voodoos added a commit to voodoos/merlin that referenced this pull request Sep 26, 2023
voodoos added a commit that referenced this pull request Sep 26, 2023
voodoos added a commit to voodoos/opam-repository that referenced this pull request Sep 26, 2023
CHANGES:

Tue Sep 26 17:45:42 CEST 2023

  + merlin binary
    - Fix issue with let operators and tuples (ocaml/merlin#1684, fixes ocaml/merlin#1683, fixes
      ocaml/ocaml-lsp#1182)
    - Fix an issue causing Merlin locate queries to hang (ocaml/merlin#1686,
      fixes ocaml/ocaml-lsp#1192)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Sep 26, 2023
CHANGES:

Tue Sep 26 17:45:42 CEST 2023

  + merlin binary
    - Fix issue with let operators and tuples (ocaml/merlin#1684, fixes ocaml/merlin#1683, fixes
      ocaml/ocaml-lsp#1182)
    - Fix an issue causing Merlin locate queries to hang (ocaml/merlin#1686,
      fixes ocaml/ocaml-lsp#1192)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Sep 26, 2023
CHANGES:

Tue Sep 26 17:45:42 CEST 2023

  + merlin binary
    - Fix issue with let operators and tuples (ocaml/merlin#1684, fixes ocaml/merlin#1683, fixes
      ocaml/ocaml-lsp#1182)
    - Fix an issue causing Merlin locate queries to hang (ocaml/merlin#1686,
      fixes ocaml/ocaml-lsp#1192)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Sep 26, 2023
CHANGES:

Tue Sep 26 17:45:42 CEST 2023

  + merlin binary
    - Fix issue with let operators and tuples (ocaml/merlin#1684, fixes ocaml/merlin#1683, fixes
      ocaml/ocaml-lsp#1182)
    - Fix an issue causing Merlin locate queries to hang (ocaml/merlin#1686,
      fixes ocaml/ocaml-lsp#1192)
nberth pushed a commit to nberth/opam-repository that referenced this pull request Jun 18, 2024
CHANGES:

Tue Sep 26 17:45:42 CEST 2023

  + merlin binary
    - Fix issue with let operators and tuples (ocaml/merlin#1684, fixes ocaml/merlin#1683, fixes
      ocaml/ocaml-lsp#1182)
    - Fix an issue causing Merlin locate queries to hang (ocaml/merlin#1686,
      fixes ocaml/ocaml-lsp#1192)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: 4.12-500
Development

Successfully merging this pull request may close these issues.

Issue when destructing tuples in letops let* and let+ cause merlin crashes
1 participant