Oct 1, 2019 · Sep 20, 2019 · Sep 23, 2019 · Sep 24, 2019 · Sep 27, 2019
diff --git a/src/buffer/out/Row.cpp b/src/buffer/out/Row.cpp
 // Arguments:
 // - it - custom console iterator to use for seeking input data. bool() false when it becomes invalid while seeking.
 // - index - column in row to start writing at
 // -setWrap -set the wrapflags if we hit the end of the row while writing and there's still more data in the iterator.
 // -wrap -change the wrapflag if we hit the end of the row while writing and there's still more data in the iterator.
 // - limitRight - right inclusive column ID for the last write in this row. (optional, will just write to the end of row if nullopt)
 // Return Value:
 // - iterator to first cell that was not written to this row.
 OutputCellIterator ROW::WriteCells(OutputCellIterator it, const size_t index, const bool setWrap, std::optional<size_t> limitRight)
 OutputCellIterator ROW::WriteCells(OutputCellIterator it, const size_t index, conststd::optional<bool> wrap, std::optional<size_t> limitRight)
 {
    THROW_HR_IF(E_INVALIDARG, index >= _charRow.size());
    THROW_HR_IF(E_INVALIDARG, limitRight.value_or(0) >= _charRow.size());
                ++it;
            }

            // If we're asked to set the wrap status and we just filled the last column with some text, set wrap status on the row.
            if (setWrap && fillingLastColumn)
            // If we're asked to (un)set the wrap status and we just filled the last column with some text...
            // NOTE:
            //  - wrap = std::nullopt    --> don't change the wrap value
            //  - wrap = true            --> we're filling cells as a steam, consider this a wrap
            //  - wrap = false           --> we're filling cells as a block, unwrap
            if (wrap.has_value() && fillingLastColumn)
            {
                _charRow.SetWrapForced(true);
                // set wrap status on the row to parameter's value.
                _charRow.SetWrapForced(wrap.value());
            }
        }
        else
diff --git a/src/buffer/out/Row.hpp b/src/buffer/out/Row.hpp
    UnicodeStorage& GetUnicodeStorage() noexcept;
    const UnicodeStorage& GetUnicodeStorage() const noexcept;

    OutputCellIterator WriteCells(OutputCellIterator it, const size_t index, const bool setWrap, std::optional<size_t> limitRight = std::nullopt);
    OutputCellIterator WriteCells(OutputCellIterator it, const size_t index, conststd::optional<bool> wrap = std::nullopt, std::optional<size_t> limitRight = std::nullopt);

    friend bool operator==(const ROW& a, const ROW& b) noexcept;

diff --git a/src/buffer/out/textBuffer.cpp b/src/buffer/out/textBuffer.cpp
 // Arguments:
 // - givenIt - Iterator representing output cell data to write
 // - target - the row/column to start writing the text to
 // - wrap - change the wrap flag if we hit the end of the row while writing and there's still more data
 // Return Value:
 // - The final position of the iterator
 OutputCellIterator TextBuffer::Write(const OutputCellIterator givenIt,
                                     const COORD target)
                                     const COORD target,
                                     const std::optional<bool> wrap)
 {
    // Make mutable copy so we can walk.
    auto it = givenIt;
    while (it && size.IsInBounds(lineTarget))
    {
        // Attempt to write as much data as possible onto this line.
        it = WriteLine(it, lineTarget, true);
        // NOTE: if wrap = true/false, we want to set the line's wrap to true/false (respectively) if we reach the end of the line
        it = WriteLine(it, lineTarget, wrap);

        // Move to the next line down.
        lineTarget.X = 0;
 // Arguments:
 // - givenIt - The iterator that will dereference into cell data to insert
 // - target - Coordinate targeted within output buffer
 // -setWrap -Whether we should try to setthe wrap flag if wewrite up tothe end of thelineandhavemore data
 // -wrap -changethe wrap flag if wehitthe end of therow while writingandthere's stillmore data in the iterator.
 // - limitRight - Optionally restrict the right boundary for writing (e.g. stop writing earlier than the end of line)
 // Return Value:
 // - The iterator, but advanced to where we stopped writing. Use to find input consumed length or cells written length.
 OutputCellIterator TextBuffer::WriteLine(const OutputCellIterator givenIt,
                                         const COORD target,
                                         const bool setWrap,
                                         conststd::optional<bool> wrap,
                                         std::optional<size_t> limitRight)
 {
    // If we're not in bounds, exit early.

    //  Get the row and write the cells
    ROW& row = GetRowByOffset(target.Y);
    const auto newIt = row.WriteCells(givenIt, target.X,setWrap, limitRight);
    const auto newIt = row.WriteCells(givenIt, target.X,wrap, limitRight);

    // Take the cell distance written and notify that it needs to be repainted.
    const auto written = newIt.GetCellDistance(givenIt);
diff --git a/src/buffer/out/textBuffer.hpp b/src/buffer/out/textBuffer.hpp
    OutputCellIterator Write(const OutputCellIterator givenIt);

    OutputCellIterator Write(const OutputCellIterator givenIt,
                             const COORD target);
                             const COORD target,
                             const std::optional<bool> wrap = true);

    OutputCellIterator WriteLine(const OutputCellIterator givenIt,
                                 const COORD target,
                                 const bool setWrap =false,
                                 conststd::optional<bool> setWrap =std::nullopt,
                                 const std::optional<size_t> limitRight = std::nullopt);

    bool InsertCharacter(const wchar_t wch, const DbcsAttribute dbcsAttribute, const TextAttribute attr);
diff --git a/src/host/_output.cpp b/src/host/_output.cpp
    try
    {
        const OutputCellIterator it(character, lengthToWrite);
        const auto done = screenInfo.Write(it, startingCoordinate);

        // when writing to the buffer, specifically unset wrap if we get to the last column.
        // a fill operation should UNSET wrap in that scenario. See GH #1126 for more details.
        const auto done = screenInfo.Write(it, startingCoordinate, false);
        cellsModified = done.GetInputDistance(it);

        // Notify accessibility
diff --git a/src/host/screenInfo.cpp b/src/host/screenInfo.cpp
 // Arguments:
 // - it - Iterator representing output cell data to write.
 // - target - The position to start writing at
 // - wrap - change the wrap flag if we hit the end of the row while writing and there's still more data
 // Return Value:
 // - the iterator at its final position
 // Note:
 // - will throw exception on error.
 OutputCellIterator SCREEN_INFORMATION::Write(const OutputCellIterator it,
                                             const COORD target)
                                             const COORD target,
                                             const std::optional<bool> wrap)
 {
    return _textBuffer->Write(it, target);
    // NOTE: if wrap = true/false, we want to set the line's wrap to true/false (respectively) if we reach the end of the line
    return _textBuffer->Write(it, target, wrap);
 }

 // Routine Description:
diff --git a/src/host/screenInfo.hpp b/src/host/screenInfo.hpp
    OutputCellIterator Write(const OutputCellIterator it);

    OutputCellIterator Write(const OutputCellIterator it,
                             const COORD target);
                             const COORD target,
                             const std::optional<bool> wrap = true);

    OutputCellIterator WriteRect(const OutputCellIterator it,
                                 const Microsoft::Console::Types::Viewport viewport);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -147,11 +147,11 @@ const UnicodeStorage& ROW::GetUnicodeStorage() const noexcept
		// Arguments:
		// - it - custom console iterator to use for seeking input data. bool() false when it becomes invalid while seeking.
		// - index - column in row to start writing at
		// -setWrap -set the wrapflags if we hit the end of the row while writing and there's still more data in the iterator.
		// -wrap -change the wrapflag if we hit the end of the row while writing and there's still more data in the iterator.
		// - limitRight - right inclusive column ID for the last write in this row. (optional, will just write to the end of row if nullopt)
		// Return Value:
		// - iterator to first cell that was not written to this row.
		OutputCellIterator ROW::WriteCells(OutputCellIterator it, const size_t index, const bool setWrap, std::optional<size_t> limitRight)
		OutputCellIterator ROW::WriteCells(OutputCellIterator it, const size_t index, conststd::optional<bool> wrap, std::optional<size_t> limitRight)
		{
		THROW_HR_IF(E_INVALIDARG, index >= _charRow.size());
		THROW_HR_IF(E_INVALIDARG, limitRight.value_or(0) >= _charRow.size());
Expand DownExpand Up		@@ -202,10 +202,15 @@ OutputCellIterator ROW::WriteCells(OutputCellIterator it, const size_t index, co
		++it;
		}

		// If we're asked to set the wrap status and we just filled the last column with some text, set wrap status on the row.
		if (setWrap && fillingLastColumn)
		// If we're asked to (un)set the wrap status and we just filled the last column with some text...
		// NOTE:
		// - wrap = std::nullopt --> don't change the wrap value
		// - wrap = true --> we're filling cells as a steam, consider this a wrap
		// - wrap = false --> we're filling cells as a block, unwrap
		if (wrap.has_value() && fillingLastColumn)
		{
		_charRow.SetWrapForced(true);
		// set wrap status on the row to parameter's value.
		_charRow.SetWrapForced(wrap.value());
		}
		}
		else
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -57,7 +57,7 @@ class ROW final
		UnicodeStorage& GetUnicodeStorage() noexcept;
		const UnicodeStorage& GetUnicodeStorage() const noexcept;

		OutputCellIterator WriteCells(OutputCellIterator it, const size_t index, const bool setWrap, std::optional<size_t> limitRight = std::nullopt);
		OutputCellIterator WriteCells(OutputCellIterator it, const size_t index, conststd::optional<bool> wrap = std::nullopt, std::optional<size_t> limitRight = std::nullopt);

		friend bool operator==(const ROW& a, const ROW& b) noexcept;

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -318,10 +318,12 @@ OutputCellIterator TextBuffer::Write(const OutputCellIterator givenIt)
		// Arguments:
		// - givenIt - Iterator representing output cell data to write
		// - target - the row/column to start writing the text to
		// - wrap - change the wrap flag if we hit the end of the row while writing and there's still more data
		// Return Value:
		// - The final position of the iterator
		OutputCellIterator TextBuffer::Write(const OutputCellIterator givenIt,
		const COORD target)
		const COORD target,
		const std::optional<bool> wrap)
		{
		// Make mutable copy so we can walk.
		auto it = givenIt;
Expand All		@@ -336,7 +338,8 @@ OutputCellIterator TextBuffer::Write(const OutputCellIterator givenIt,
		while (it && size.IsInBounds(lineTarget))
		{
		// Attempt to write as much data as possible onto this line.
		it = WriteLine(it, lineTarget, true);
		// NOTE: if wrap = true/false, we want to set the line's wrap to true/false (respectively) if we reach the end of the line
		it = WriteLine(it, lineTarget, wrap);

		// Move to the next line down.
		lineTarget.X = 0;
Expand All		@@ -351,13 +354,13 @@ OutputCellIterator TextBuffer::Write(const OutputCellIterator givenIt,
		// Arguments:
		// - givenIt - The iterator that will dereference into cell data to insert
		// - target - Coordinate targeted within output buffer
		// -setWrap -Whether we should try to setthe wrap flag if wewrite up tothe end of thelineandhavemore data
		// -wrap -changethe wrap flag if wehitthe end of therow while writingandthere's stillmore data in the iterator.
		// - limitRight - Optionally restrict the right boundary for writing (e.g. stop writing earlier than the end of line)
		// Return Value:
		// - The iterator, but advanced to where we stopped writing. Use to find input consumed length or cells written length.
		OutputCellIterator TextBuffer::WriteLine(const OutputCellIterator givenIt,
		const COORD target,
		const bool setWrap,
		conststd::optional<bool> wrap,
		std::optional<size_t> limitRight)
		{
		// If we're not in bounds, exit early.
Expand All		@@ -368,7 +371,7 @@ OutputCellIterator TextBuffer::WriteLine(const OutputCellIterator givenIt,

		// Get the row and write the cells
		ROW& row = GetRowByOffset(target.Y);
		const auto newIt = row.WriteCells(givenIt, target.X,setWrap, limitRight);
		const auto newIt = row.WriteCells(givenIt, target.X,wrap, limitRight);

		// Take the cell distance written and notify that it needs to be repainted.
		const auto written = newIt.GetCellDistance(givenIt);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -89,11 +89,12 @@ class TextBuffer final
		OutputCellIterator Write(const OutputCellIterator givenIt);

		OutputCellIterator Write(const OutputCellIterator givenIt,
		const COORD target);
		const COORD target,
		const std::optional<bool> wrap = true);

		OutputCellIterator WriteLine(const OutputCellIterator givenIt,
		const COORD target,
		const bool setWrap =false,
		conststd::optional<bool> setWrap =std::nullopt,
		const std::optional<size_t> limitRight = std::nullopt);

		bool InsertCharacter(const wchar_t wch, const DbcsAttribute dbcsAttribute, const TextAttribute attr);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -290,7 +290,10 @@ void WriteToScreen(SCREEN_INFORMATION& screenInfo, const Viewport& region)
		try
		{
		const OutputCellIterator it(character, lengthToWrite);
		const auto done = screenInfo.Write(it, startingCoordinate);

		// when writing to the buffer, specifically unset wrap if we get to the last column.
		// a fill operation should UNSET wrap in that scenario. See GH #1126 for more details.
		const auto done = screenInfo.Write(it, startingCoordinate, false);
		cellsModified = done.GetInputDistance(it);

		// Notify accessibility
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2586,14 +2586,17 @@ OutputCellIterator SCREEN_INFORMATION::Write(const OutputCellIterator it)
		// Arguments:
		// - it - Iterator representing output cell data to write.
		// - target - The position to start writing at
		// - wrap - change the wrap flag if we hit the end of the row while writing and there's still more data
		// Return Value:
		// - the iterator at its final position
		// Note:
		// - will throw exception on error.
		OutputCellIterator SCREEN_INFORMATION::Write(const OutputCellIterator it,
		const COORD target)
		const COORD target,
		const std::optional<bool> wrap)
		{
		return _textBuffer->Write(it, target);
		// NOTE: if wrap = true/false, we want to set the line's wrap to true/false (respectively) if we reach the end of the line
		return _textBuffer->Write(it, target, wrap);
		}

		// Routine Description:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -131,7 +131,8 @@ class SCREEN_INFORMATION : public ConsoleObjectHeader, public Microsoft::Console
		OutputCellIterator Write(const OutputCellIterator it);

		OutputCellIterator Write(const OutputCellIterator it,
		const COORD target);
		const COORD target,
		const std::optional<bool> wrap = true);

		OutputCellIterator WriteRect(const OutputCellIterator it,
		const Microsoft::Console::Types::Viewport viewport);
Expand Down