Accept the -safe-string flag but make it a no-op
#1544
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
|
As far as I know it's the only one but i haven't kept track of this too much. @dra27 do you know? |
|
Let's merge this. @kit-ty-kate do you think we should make a patch-release for this ? |
|
Yes I think so. |
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Dec 13, 2022
CHANGES:
Thu Dec 13 11:49:42 CEST 2022
+ merlin binary
- Restore compatibility with the compiler's command line by accepting
the `-safe-string` flag as a no-op instead of rejecting it. (ocaml/merlin#1544,
fixes ocaml/merlin#1518)
- Mark some C variables as unused to remove warnings (ocaml/merlin#1541, @antalsz)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Feb 24, 2023
CHANGES:
Fri Feb 24 16:55:42 CEST 2023
+ merlin binary
- Recognize OCaml 5.0 cmi magic number in compiler version mismatch message
(ocaml/merlin#1554, fixes ocaml/merlin#1553)
- Upgrade Merlin from the RC2 to the stable 5.0.0 compiler release (ocaml/merlin#1559,
fixes ocaml/merlin#1558)
- Improve type-enclosing behaviour when used on records' labels (ocaml/merlin#1565,
fixes ocaml/merlin#1564)
- Restore compatibility with the compiler's command line by accepting the
`-safe-string` flag as a no-op instead of rejecting it (ocaml/merlin#1544, fixes
ocaml/merlin#1518)
- Traverse aliases when jumping to declaration. This matches
jump-to-definition's behavior (ocaml/merlin#1563)
- Improve locate's behavior in various ill-typed expressions (ocaml/merlin#1546, fixes
ocaml/merlin#1567 and partially ocaml/merlin#1543)
- Correctly traverse patterns when looking for docs in the typedtree (ocaml/merlin#1572)
- Get documentation when the declaration or definition is selected (ocaml/merlin#1542,
fixes ocaml/merlin#1540)
- On Windows, change to a harmless directory when launching server to avoid
locking down current directory (ocaml/merlin#1569, fixes ocaml/merlin#1474)
+ editor modes
- emacs: Fix misuse of `eq` comparison (ocaml/merlin#1549, @mattiase)
- emacs: xref works from context menus; better highlighting of xref matches;
xref recognises operators and binding operators at the cursor position;
bad locations are filtered out (ocaml/merlin#1385, fixes ocaml/merlin#1410, @mattiase)
+ test suite
- Add a test for incorrect alert defaults (ocaml/merlin#1559)
- Add multiple tests for locate over ill-typed expressions (ocaml/merlin#1546)
- Add non-regression tests for other fixes in this release
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Feb 24, 2023
CHANGES:
Fri Feb 24 16:55:42 CEST 2023
+ merlin binary
- Recognize OCaml 5.0 cmi magic number in compiler version mismatch message
(ocaml/merlin#1554, fixes ocaml/merlin#1553)
- Upgrade Merlin from the RC2 to the stable 5.0.0 compiler release (ocaml/merlin#1559,
fixes ocaml/merlin#1558)
- Improve type-enclosing behaviour when used on records' labels (ocaml/merlin#1565,
fixes ocaml/merlin#1564)
- Restore compatibility with the compiler's command line by accepting the
`-safe-string` flag as a no-op instead of rejecting it (ocaml/merlin#1544, fixes
ocaml/merlin#1518)
- Traverse aliases when jumping to declaration. This matches
jump-to-definition's behavior (ocaml/merlin#1563)
- Improve locate's behavior in various ill-typed expressions (ocaml/merlin#1546, fixes
ocaml/merlin#1567 and partially ocaml/merlin#1543)
- Correctly traverse patterns when looking for docs in the typedtree (ocaml/merlin#1572)
- Get documentation when the declaration or definition is selected (ocaml/merlin#1542,
fixes ocaml/merlin#1540)
- On Windows, change to a harmless directory when launching server to avoid
locking down current directory (ocaml/merlin#1569, fixes ocaml/merlin#1474)
+ editor modes
- emacs: Fix misuse of `eq` comparison (ocaml/merlin#1549, @mattiase)
- emacs: xref works from context menus; better highlighting of xref matches;
xref recognises operators and binding operators at the cursor position;
bad locations are filtered out (ocaml/merlin#1385, fixes ocaml/merlin#1410, @mattiase)
+ test suite
- Add a test for incorrect alert defaults (ocaml/merlin#1559)
- Add multiple tests for locate over ill-typed expressions (ocaml/merlin#1546)
- Add non-regression tests for other fixes in this release
voodoos
added a commit
to voodoos/merlin
that referenced
this pull request
May 2, 2024
voodoos
added a commit
to voodoos/merlin
that referenced
this pull request
May 2, 2024
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.
This should fix #1518
@kit-ty-kate do you no if other configuration options have been removed from OCaml 5 but are still accepted by the compiler as a no-op ?