fix: correctly print multi-line excerpts #7950
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
|
@emillon perhaps we can consider this for 3.8.2? |
|
yes, that would work |
nojb
approved these changes
Jun 13, 2023
rgrinberg
force-pushed
the
ps/rr/fix__correctly_print_multi_line_excerpts
branch
from
29076d1
to
a5e5b1f
Compare
The previous code would pretend that a multi-line excerpt was single-line whenever the stop character was outside the line. Fixes #7905 Signed-off-by: Rudi Grinberg <me@rgrinberg.com> <!-- ps-id: 9d20e3b2-2575-4910-b9a8-6722c6c6ccf3 -->
rgrinberg
force-pushed
the
ps/rr/fix__correctly_print_multi_line_excerpts
branch
from
a5e5b1f
to
32605d6
Compare
|
@emillon I put this as 3.9.0 tentatively, but feel free to re-adjust to 3.8.2 |
emillon
pushed a commit
to emillon/dune
that referenced
this pull request
Jun 15, 2023
The previous code would pretend that a multi-line excerpt was single-line whenever the stop character was outside the line. Fixes ocaml#7905 Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
emillon
pushed a commit
to emillon/dune
that referenced
this pull request
Jun 16, 2023
The previous code would pretend that a multi-line excerpt was single-line whenever the stop character was outside the line. Fixes ocaml#7905 Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
emillon
added a commit
that referenced
this pull request
Jun 16, 2023
* test: reproduce #7905 (#7949) Signed-off-by: Rudi Grinberg <me@rgrinberg.com> * fix: correctly print multi-line excerpts (#7950) The previous code would pretend that a multi-line excerpt was single-line whenever the stop character was outside the line. Fixes #7905 Signed-off-by: Rudi Grinberg <me@rgrinberg.com> --------- Signed-off-by: Rudi Grinberg <me@rgrinberg.com> Co-authored-by: Rudi Grinberg <me@rgrinberg.com>
emillon
added a commit
to emillon/opam-repository
that referenced
this pull request
Jun 16, 2023
CHANGES: - Switch back to threaded console for all systems; fix unresponsive console on Windows (ocaml/dune#7906, @nojb) - Respect `-p` / `--only-packages` for `melange.emit` artifacts (ocaml/dune#7849, @anmonteiro) - Fix scanning of Coq installed files (@ejgallego, reported by @palmskog, ocaml/dune#7895 , fixes ocaml/dune#7893) - Fix RPC buffer corruption issues due to multi threading. This issue was only reproducible with large RPC payloads (ocaml/dune#7418) - Fix printing errors from excerpts whenever character offsets span multiple lines (ocaml/dune#7950, fixes ocaml/dune#7905, @rgrinberg)
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.
The previous code would pretend that a multi-line excerpt was
single-line whenever the stop character was outside the line.
Fixes #7905
Signed-off-by: Rudi Grinberg me@rgrinberg.com