[wicket] correctly wrap popup text within step logs #3081
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
Created using spr 1.3.4
Created using spr 1.3.4
Created using spr 1.3.4
jgallagher
approved these changes
May 11, 2023
| } | ||
|
|
||
| fn whitespace_width(&self) -> f64 { | ||
| // Since whitespace is always ASCII spaces, this is |
There was a problem hiding this comment.
this is... "equal to the number of whitespace characters", maybe?
There was a problem hiding this comment.
Addressed in #3126.
jgallagher
deleted the
sunshowers/spr/wicket-correctly-wrap-popup-text-within-step-logs
branch
sunshowers
added a commit
that referenced
this pull request
May 16, 2023
Deduplicate nested events coming from remote machines in a couple of spots: 1. When we're generating nested events, such that duplicate events don't make their way over the event channel. Maintain event buffers within `StepContext`s to handle that. 2. In `EventBuffer` itself, dedup events based on the leaf index rather than the root index. If two events have the same leaf event index and leaf execution ID, they can always be deduped. While testing this, I also realized it would be really useful to add a `root_execution_id` to every event report: do so, and depend on it (note that you'll have to rebuild installinator with this PR to pick up support for that). Finally, address the review comment in #3081 -- do it here to avoid having to create a whole separate PR for this. Fixes #3102.
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.
Previously, we were relying on tui's paragraph wrap functionality. This
had several limitations:
This meant that wrapped text was previously cut off.
To address these issues, we implement wrapping ourselves, via the
textwrap library. The library exposes support for wrapping strings, but
we're working with tui Spans (which have styles associated with them) so
we have to do some work ourselves. Thankfully, it isn't too much work:
textwrap exposes an abstract interface called
Fragment, so it's mostlya matter of copy-pasting some code from textwrap, and annotating each
word with its corresponding tui style.
This PR does not implement scrolling, but now that we're working with
pre-wrapped text in the popup, scrolling should be pretty simple to do
in a followup.
Screenshot of wrapped text: