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

Test and fix wrong error with string literal in comment #1754

Merged
merged 4 commits into from
Apr 30, 2024
Merged

Test and fix wrong error with string literal in comment #1754

merged 4 commits into from
Apr 30, 2024

Conversation

voodoos
Copy link
Collaborator

@voodoos voodoos commented Apr 24, 2024 •
edited
Loading

This test illustrate issue #1753

Commit f07d346 should fix issue #1753

@voodoos voodoos linked an issue Apr 25, 2024 that may be closed by this pull request
string litteral with an extension node is wrongly marked as being unterminated #1753
Closed
@voodoos voodoos changed the title tests: wrong error with string literal in comment Test and fix wrong error with string literal in comment Apr 25, 2024
@voodoos voodoos requested a review from xvw April 25, 2024 13:01
xvw
xvw approved these changes Apr 26, 2024
View reviewed changes
Copy link
Collaborator

@xvw xvw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix is good and well tested !

@voodoos voodoos merged commit 4ede924 into ocaml:master Apr 30, 2024
12 checks passed
voodoos added a commit to voodoos/merlin that referenced this pull request May 13, 2024
@voodoos
[B] Merge pull request ocaml#1754 from voodoos/test-issue-1753
5de6854 
Test and fix wrong error with string literal in comment
voodoos added a commit to voodoos/opam-repository that referenced this pull request May 17, 2024
@voodoos
[new release] merlin (3 packages) (5.0-502)
1fded17 
CHANGES:

Fri May 17 19:59:42 CET 2024

  + merlin binary
    - Support for OCaml 5.2 (ocaml/merlin#1757)
    - destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
    - Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
      fixes ocaml/merlin#1661)
    - Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
    - Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
    - Improve cursor position detection in longidents (ocaml/merlin#1756)
    - Addition of a `merlin-lib.commands` library which disassociates the
      execution of commands from the `new_protocol`, from the binary, allowing
      it to be invoked from other projects (ocaml/merlin#1758)
    - New occurrences backend: Don't index occurrences when `merlin.hide`
      attribute is present. (ocaml/merlin#1768)
    - Use the new `uid_to_decl` table in 5.2's cmt files to get documentation.
      (ocaml/merlin#1773)
@voodoos voodoos mentioned this pull request May 17, 2024
Merged
voodoos added a commit to voodoos/opam-repository that referenced this pull request May 31, 2024
@voodoos
[new release] merlin (3 packages) (4.15-501)
2cf5ede 
CHANGES:

May May 31 14:02:42 CET 2024

  + merlin binary
    - destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
    - Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
      fixes ocaml/merlin#1661)
    - Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
    - Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
    - Improve cursor position detection in longidents (ocaml/merlin#1756)
voodoos added a commit to voodoos/opam-repository that referenced this pull request May 31, 2024
@voodoos
[new release] merlin (3 packages) (4.15-414)
49ef452 
CHANGES:

Fri May 31 14:02:42 CEST 2024

  + merlin binary
    - destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
    - Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
      fixes ocaml/merlin#1661)
    - Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
    - Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
    - Improve cursor position detection in longidents (ocaml/merlin#1756)
voodoos added a commit to voodoos/opam-repository that referenced this pull request May 31, 2024
@voodoos
[new release] merlin (3 packages) (4.15-501)
f6fdba8 
CHANGES:

Fri May 31 14:02:42 CEST 2024

  + merlin binary
    - destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
    - Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
      fixes ocaml/merlin#1661)
    - Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
    - Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
    - Improve cursor position detection in longidents (ocaml/merlin#1756)
voodoos added a commit to voodoos/opam-repository that referenced this pull request May 31, 2024
@voodoos
[new release] merlin and merlin-lib v4.15-414/501
776ae45 
CHANGES:

Fri May 31 14:02:42 CEST 2024

  + merlin binary
    - destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
    - Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
      fixes ocaml/merlin#1661)
    - Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
    - Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
    - Improve cursor position detection in longidents (ocaml/merlin#1756)
@voodoos voodoos mentioned this pull request May 31, 2024
Merged
@liam923 liam923 mentioned this pull request Jun 21, 2024
Merged
avsm pushed a commit to avsm/opam-repository that referenced this pull request Sep 5, 2024
@voodoos @avsm
[new release] merlin and merlin-lib v4.15-414/501
c9ab3f5 
CHANGES:

Fri May 31 14:02:42 CEST 2024

  + merlin binary
    - destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
    - Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
      fixes ocaml/merlin#1661)
    - Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
    - Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
    - Improve cursor position detection in longidents (ocaml/merlin#1756)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xvw xvw xvw approved these changes

Assignees
No one assigned
Labels
None yet
Projects
Backport to 501
Status: 5.0-501
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

string litteral with an extension node is wrongly marked as being unterminated
2 participants
@voodoos @xvw