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

Fixed a deadlock when printing surrogate pairs #4150

Merged
3 commits merged into from
Jan 15, 2020
Merged

Fixed a deadlock when printing surrogate pairs #4150

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6776f5
Fixed a deadlock when printing surrogate pairs
lhecker Jan 8, 2020
ca65a41
Addressed review comments
lhecker Jan 8, 2020
c4c07be
Added a surrogate printing test case
lhecker Jan 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions src/cascadia/TerminalCore/Terminal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,21 +456,17 @@ void Terminal::_WriteBuffer(const std::wstring_view& stringView)
{
// TODO: MSFT 21006766
// This is not great but I need it demoable. Fix by making a buffer stream writer.
if (wch >= 0xD800 && wch <= 0xDFFF)
{
const OutputCellIterator it{ stringView.substr(i, 2), _buffer->GetCurrentAttributes() };
const auto end = _buffer->Write(it);
const auto cellDistance = end.GetCellDistance(it);
i += cellDistance - 1;
miniksa marked this conversation as resolved.
Show resolved Hide resolved
proposedCursorPosition.X += gsl::narrow<SHORT>(cellDistance);
}
else
{
const OutputCellIterator it{ stringView.substr(i, 1), _buffer->GetCurrentAttributes() };
const auto end = _buffer->Write(it);
const auto cellDistance = end.GetCellDistance(it);
proposedCursorPosition.X += gsl::narrow<SHORT>(cellDistance);
}
//
// If wch is a surrogate character we need to read 2 code units
// from the stringView to form a single code point.
const auto isSurrogate = wch >= 0xD800 && wch <= 0xDFFF;
const size_t codePointLength = isSurrogate ? 2 : 1;
miniksa marked this conversation as resolved.
Show resolved Hide resolved
const auto view = stringView.substr(i, codePointLength);
const OutputCellIterator it{ view, _buffer->GetCurrentAttributes() };
const auto end = _buffer->Write(it);
const auto cellDistance = end.GetCellDistance(it);
proposedCursorPosition.X += gsl::narrow<SHORT>(cellDistance);
i += codePointLength - 1;
}

// If we're about to scroll past the bottom of the buffer, instead cycle the buffer.
Expand Down