ROW: clean up in preparation to hide CharRow & AttrRow by DHowett · Pull Request #8446 · microsoft/terminal

Dustin L. Howett (DHowett) · 2020-11-30T22:23:11Z

Moving things out of CharRow into ROW helps us hide it as an implementation detail.
This is part one of many.

CharRow: Hide ClearCell, use ROW::ClearColumn

CharRow: Hide GetText, use ROW::GetText

CharRowBaseTests: remove dead file (never used!)

CharRow: Move DoubleBytePadded into ROW

CharRow: Move WrapForced into ROW

Char/AttrRow: Hide Reset, use ROW::Reset

Remove RowCellIterator (dead code)

RCI was unused; it was replaced by TextBufferCellIterator shortly after its creation

Move AttrRowTests to ut_textbuffer from ut_host

It had no reliance on the host.

Mike Griese (zadjii-msft) · 2020-12-01T13:46:16Z

@msftbot make sure Michael Niksa (@miniksa) signs off on this

Deleted user (ghost) · 2020-12-01T13:46:21Z

Hello Mike Griese (@zadjii-msft)!

Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:

I'll only merge this pull request if it's approved by Michael Niksa (@miniksa)

If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you".

Michael Niksa (miniksa) · 2020-12-03T22:01:24Z


    size_t size() const noexcept;

+    void SetWrapForced(const bool wrap) noexcept;


Could just move the getters/setters up here per the other PR and chat recently about inline potential.

no reason not to

…clean_1

This reverts commit d226521.

Dustin L. Howett (DHowett) · 2021-01-12T21:20:17Z

/azp run

azure-pipelines · 2021-01-12T21:20:34Z

Azure Pipelines successfully started running 1 pipeline(s).

Mike Griese (zadjii-msft)

Seems straightforward

This is by no means comprehensive. It will be unmarked as draft when it is more comprehensive. This pull request adds some tests for resizing a TextBuffer and reflowing its contents. Each test takes the form of an initial state and a number of buffers of different sizes. The initial state is used to seed the first TextBuffer, and the subsequent buffers are only used to compare. I manually reimplemented some of the DBCS logic to ensure that the buffers contain _exactly_ what they're supposed to. I know this is non-ideal. After some of the CharRow changes in #8446 land, this will need to be updated. There's a cool bit of TAEF gore in here: the IDataSource. An IDataSource allows us to programmatically return test cases. It's a code-only version of its support for parameterized tests of the form `Data:x = {0, 1, 2}` . The only downsides are... 1. It looks like COM (it is not using COM under the hood, just the COM ABI) 2. Property values must be returned as strings. To best support rich test types, I used IDataSource to produce _a lit of array indices_ and nothing more. The test is run once for array member, and it is the test's responsibility to look up the object to which that index refers. Works great though! Each reflow test is its own unit, and a failure in an earlier reflow test will not tank a later one.

…clean_1

Michael Niksa (miniksa)

Lookin' good. Can't wait until the next step!

Deleted user (ghost) · 2021-01-20T21:16:30Z

Hello Dustin L. Howett (@DHowett)!

Because this pull request has the AutoMerge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.

This is by no means comprehensive. It will be unmarked as draft when it is more comprehensive. This pull request adds some tests for resizing a TextBuffer and reflowing its contents. Each test takes the form of an initial state and a number of buffers of different sizes. The initial state is used to seed the first TextBuffer, and the subsequent buffers are only used to compare. I manually reimplemented some of the DBCS logic to ensure that the buffers contain _exactly_ what they're supposed to. I know this is non-ideal. After some of the CharRow changes in microsoft#8446 land, this will need to be updated. There's a cool bit of TAEF gore in here: the IDataSource. An IDataSource allows us to programmatically return test cases. It's a code-only version of its support for parameterized tests of the form `Data:x = {0, 1, 2}` . The only downsides are... 1. It looks like COM (it is not using COM under the hood, just the COM ABI) 2. Property values must be returned as strings. To best support rich test types, I used IDataSource to produce _a lit of array indices_ and nothing more. The test is run once for array member, and it is the test's responsibility to look up the object to which that index refers. Works great though! Each reflow test is its own unit, and a failure in an earlier reflow test will not tank a later one.

Moving things out of CharRow into ROW helps us hide it as an implementation detail. This is part one of many. ### CharRow: Hide ClearCell, use ROW::ClearColumn ### CharRow: Hide GetText, use ROW::GetText ### CharRowBaseTests: remove dead file (never used!) ### CharRow: Move DoubleBytePadded into ROW ### CharRow: Move WrapForced into ROW ### Char/AttrRow: Hide Reset, use ROW::Reset ### Remove RowCellIterator (dead code) RCI was unused; it was replaced by TextBufferCellIterator shortly after its creation ### Move AttrRowTests to ut_textbuffer from ut_host It had no reliance on the host.

Dustin L. Howett (DHowett) added 7 commits November 23, 2020 15:04

ROW Cleanup: Hide Reset inside CharRow/AttrRow

a83c9b1

ROW Cleanup: Move WrapForced into ROW (from CharRow)

d4fadb6

ROW Cleanup: Move DoubleBytePadded into ROW (from CharRow)

331fe14

CharRow: remove UpdateParent -- we never re-seat CharRows

d226521

CharRowBaseTests: remove dead file

1c11356

CharRow: Hide GetText, use ROW::GetText

46b1a79

CharRow: Hide ClearCell, use ROW::ClearColumn

89b0195

ghost added the AutoMerge Marked for automatic merge by the bot when requirements are met label Dec 1, 2020

Dustin L. Howett (DHowett) removed the AutoMerge Marked for automatic merge by the bot when requirements are met label Dec 1, 2020

Michael Niksa (miniksa) reviewed Dec 3, 2020

View reviewed changes

Comment thread src/host/ut_host/CharRowBaseTests.cpp Resolved

Dustin L. Howett (DHowett) added 5 commits January 4, 2021 16:50

Merge remote-tracking branch 'origin/main' into dev/duhowett/charrow_…

c83256f

…clean_1

ROW: Move new booleans into header

5f356c0

Revert "CharRow: remove UpdateParent -- we never re-seat CharRows"

226e2e7

This reverts commit d226521.

Remove RowCellIterator (dead code)

07ca956

and the header

9871f12

Dustin L. Howett (DHowett) mentioned this pull request Jan 6, 2021

Add some tests for TextBuffer::Reflow #8715

Merged

Fix SA/Build

b57b930

Dustin L. Howett (DHowett) marked this pull request as ready for review January 11, 2021 19:02

Dustin L. Howett (DHowett) requested a review from Mike Griese (zadjii-msft) January 11, 2021 19:02

Move AttrRowTests to buffer

3ab0638

Dustin L. Howett (DHowett) changed the title ~~ROW/CharRow: clean up in preparation to hide CharRow~~ ROW: clean up in preparation to hide CharRow & AttrRow Jan 11, 2021

Dustin L. Howett (DHowett) mentioned this pull request Jan 12, 2021

[Epic] Text Buffer rewrite #8000

Closed

13 of 15 tasks

Michael Niksa (miniksa) mentioned this pull request Jan 15, 2021

til::rle<T, S> - a run length encoded storage template #8794

Closed

4 of 6 tasks

Mike Griese (zadjii-msft) assigned Mike Griese (zadjii-msft) and Michael Niksa (miniksa) Jan 15, 2021

Mike Griese (zadjii-msft) approved these changes Jan 15, 2021

View reviewed changes

Comment thread src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj Resolved

Mike Griese (zadjii-msft) removed their assignment Jan 15, 2021

Mike Griese (zadjii-msft) added Area-CodeHealth Issues related to code cleanliness, linting, rules, warnings, errors, static analysis, etc. Product-Conhost For issues in the Console codebase Needs-Second It's a PR that needs another sign-off labels Jan 15, 2021

ghost requested review from PankajBhojwani, Carlos Zamora (carlos-zamora) and Leon Liang (leonMSFT) January 15, 2021 15:19

Dustin L. Howett (DHowett) added 3 commits January 19, 2021 13:59

Merge remote-tracking branch 'origin/main' into dev/duhowett/charrow_…

63e70c1

…clean_1

Dep on Types

80db868

Update for updat

8419546

Michael Niksa (miniksa) approved these changes Jan 20, 2021

View reviewed changes

Dustin L. Howett (DHowett) added the AutoMerge Marked for automatic merge by the bot when requirements are met label Jan 20, 2021

ghost merged commit e7592ec into main Jan 20, 2021

ghost deleted the dev/duhowett/charrow_clean_1 branch January 20, 2021 21:16

This pull request was closed.

Navigation Menu

Repository navigation

ROW: clean up in preparation to hide CharRow & AttrRow - #8446

ROW: clean up in preparation to hide CharRow & AttrRow#8446
17 commits merged into
mainfrom
dev/duhowett/charrow_clean_1

Dustin L. Howett (DHowett) commented Nov 30, 2020 •

edited

Loading

Uh oh!

Mike Griese (zadjii-msft) commented Dec 1, 2020

Uh oh!

Deleted user (ghost) commented Dec 1, 2020

Uh oh!

Michael Niksa (miniksa) Dec 3, 2020

Uh oh!

Dustin L. Howett (DHowett) Dec 14, 2020

Uh oh!

Uh oh!

Dustin L. Howett (DHowett) commented Jan 12, 2021

Uh oh!

azure-pipelines Bot commented Jan 12, 2021

Uh oh!

Mike Griese (zadjii-msft) left a comment

Uh oh!

Uh oh!

Michael Niksa (miniksa) left a comment

Uh oh!

Deleted user (ghost) commented Jan 20, 2021

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants


		size_t size() const noexcept;

		void SetWrapForced(const bool wrap) noexcept;

Conversation

Dustin L. Howett (DHowett) commented Nov 30, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CharRow: Hide ClearCell, use ROW::ClearColumn

CharRow: Hide GetText, use ROW::GetText

CharRowBaseTests: remove dead file (never used!)

CharRow: Move DoubleBytePadded into ROW

CharRow: Move WrapForced into ROW

Char/AttrRow: Hide Reset, use ROW::Reset

Remove RowCellIterator (dead code)

Move AttrRowTests to ut_textbuffer from ut_host

Uh oh!

Mike Griese (zadjii-msft) commented Dec 1, 2020

Uh oh!

Deleted user (ghost) commented Dec 1, 2020

Uh oh!

Michael Niksa (miniksa) Dec 3, 2020

Choose a reason for hiding this comment

Uh oh!

Dustin L. Howett (DHowett) Dec 14, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Dustin L. Howett (DHowett) commented Jan 12, 2021

Uh oh!

azure-pipelines Bot commented Jan 12, 2021

Uh oh!

Mike Griese (zadjii-msft) left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Michael Niksa (miniksa) left a comment

Choose a reason for hiding this comment

Uh oh!

Deleted user (ghost) commented Jan 20, 2021

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Dustin L. Howett (DHowett) commented Nov 30, 2020 •

edited

Loading

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.