vt: make sure to Flush the entire parsed sequence #4870
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
When we had to flush unknown sequences to the terminal, we were only taking the _most recent run_ with us; therefore, if we received `\e[?12` and `34h` in separate packets we would _only_ send out `34h`. This change fixes that issue by ensuring that we cache partial bits of sequences we haven't yet completed, just in case we need to flush them. Fixes #3080. Fixes #3081.
zadjii-msft
approved these changes
Mar 10, 2020
|
You should test that this correctly flushes/ignores SIXEL data too... |
|
Chatted offline; since SIXEL data isn't encoded in an escape but rather as a separate "mode" the terminal needs to be put into, this doesn't change how it's handled/passed through/ignored. |
zadjii-msft
added
Area-VT
ghost
requested review from
carlos-zamora
approved these changes
Mar 11, 2020
miniksa
reviewed
Mar 11, 2020
src/terminal/parser/stateMachine.cpp
Outdated
Comment on lines
1235
to
1241
| bool succeeded = true; | ||
| if (succeeded && _cachedSequence.has_value()) | ||
| { | ||
| succeeded = _engine->ActionPassThroughString(*_cachedSequence); | ||
| _cachedSequence.reset(); | ||
| } | ||
| return succeeded && _engine->ActionPassThroughString(_run); |
There was a problem hiding this comment.
You're being tricky here and it's taking more than instantaneous to figure out what you're doing. Can you please add more comments to explain your trickery?
(Also that first succeeded test is weird given it's always true...)
There was a problem hiding this comment.
the first succeeded test is in case anybody ever adds another thing that might fail in this flow ;P but yeah, fair. I'll comment it
miniksa
approved these changes
Mar 11, 2020
DHowett-MSFT
changed the title
abhijeetviswam
pushed a commit
to abhijeetviswam/terminal
that referenced
this pull request
Mar 12, 2020
When we had to flush unknown sequences to the terminal, we were only taking the _most recent run_ with us; therefore, if we received `\e[?12` and `34h` in separate packets we would _only_ send out `34h`. This change fixes that issue by ensuring that we cache partial bits of sequences we haven't yet completed, just in case we need to flush them. Fixes microsoft#3080. Fixes microsoft#3081.
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.
When we had to flush unknown sequences to the terminal, we were only
taking the most recent run with us; therefore, if we received
\e[?12and
34hin separate packets we would only send out34h.This change fixes that issue by ensuring that we cache partial bits of
sequences we haven't yet completed, just in case we need to flush them.
Fixes #3080.
Fixes #3081.
PR Checklist
Validation Steps Performed
Ran new tests!