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

Keep degenerate UIA text ranges degenerate after movement #7530

Merged
7 commits merged into from
Sep 4, 2020
Merged

Keep degenerate UIA text ranges degenerate after movement #7530

7 commits merged into from
Sep 4, 2020

Conversation

codeofdusk
Copy link
Contributor

@codeofdusk codeofdusk commented Sep 4, 2020 •
edited
Loading

Conhost expands UIA text ranges when moved. This means that degenerate
ranges become non-degenerate after movement, leading to odd behaviour
from UIA clients. This PR doesn't expand degenerate ranges, but rather
keeps them degenerate by moving _end to the newly-changed _start.

Tested in the NVDA Python console (cases with setEndPoint and
compareEndPoints described in #7342). Also ran the logic by
@michaelDCurran.

Closes #7342 and nvaccess/nvda#11288

Also fixes an issue privately reported to
me by @Simon818 with copy/paste from review cursor which originally lead
me to believe the issue was with moveEndPointByRange.

@ghost ghost added Area-Accessibility Issues related to accessibility Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-1 A description (P1) Product-Conhost For issues in the Console codebase Product-Terminal The new Windows Terminal. labels Sep 4, 2020
carlos-zamora
carlos-zamora requested changes Sep 4, 2020
View reviewed changes
Copy link
Member

@carlos-zamora carlos-zamora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test is failing:

terminal/src/interactivity/win32/ut_interactivity_win32/UiaTextRangeTests.cpp

Line 578 in 9279b7a

MoveTest{

Not too bad though. Just change this line to:

{4, 0+1}

Bonus points if you add a similar test to CanMoveByLine tests here:

terminal/src/interactivity/win32/ut_interactivity_win32/UiaTextRangeTests.cpp

Line 619 in 9279b7a

TEST_METHOD(CanMoveByLine)

src/types/UiaTextRangeBase.cpp Outdated Show resolved Hide resolved
@ghost ghost added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Sep 4, 2020
@carlos-zamora
Copy link
Member

Forgot to say, other than that, it looks good! Thanks!

@ghost ghost removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Sep 4, 2020
carlos-zamora
carlos-zamora requested changes Sep 4, 2020
View reviewed changes
Copy link
Member

@carlos-zamora carlos-zamora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're close 😊

Also, we have a code formatter. To run it, do this in your terminal:

# in pwsh, go to the repo's directory
Import-Module .\tools\OpenConsole.psm1
Invoke-CodeFormat

src/interactivity/win32/ut_interactivity_win32/UiaTextRangeTests.cpp Outdated Show resolved Hide resolved
src/interactivity/win32/ut_interactivity_win32/UiaTextRangeTests.cpp Outdated Show resolved Hide resolved
@ghost ghost added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Sep 4, 2020
@ghost ghost removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Sep 4, 2020
@codeofdusk codeofdusk mentioned this pull request Sep 4, 2020
Merged
@ghost ghost added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Sep 4, 2020
@ghost ghost removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Sep 4, 2020
DHowett
DHowett approved these changes Sep 4, 2020
View reviewed changes
Copy link
Member

@DHowett DHowett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is excellent, and a very good catch. Thank you 😄L

@DHowett DHowett added the AutoMerge Marked for automatic merge by the bot when requirements are met label Sep 4, 2020
@ghost
Copy link

ghost commented Sep 4, 2020

Hello @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.

@DHowett
Copy link
Member

DHowett commented Sep 4, 2020

@carlos-zamora double-tap plz

@ghost ghost merged commit 7a03f75 into microsoft:master Sep 4, 2020
@codeofdusk codeofdusk deleted the dev/codeofusk/i7342 branch September 4, 2020 21:30
@codeofdusk codeofdusk mentioned this pull request Sep 4, 2020
Closed
@Sidneys1 Sidneys1 mentioned this pull request Sep 7, 2020
Closed
@codeofdusk
Copy link
Contributor Author

Any rough timeline for when this will make it to insider inbox?

@DHowett
Copy link
Member

DHowett commented Sep 16, 2020

This is merging to Windows today; it will be a couple weeks before it goes out to Insiders. 😄 Thanks again for the contribution.

I'll let you know when it's out.

@codeofdusk codeofdusk mentioned this pull request Sep 18, 2020
Closed
DHowett pushed a commit that referenced this pull request Sep 18, 2020
@codeofdusk @DHowett
Keep degenerate UIA text ranges degenerate after movement (#7530)
420d714 
Conhost expands UIA text ranges when moved. This means that degenerate
ranges become non-degenerate after movement, leading to odd behaviour
from UIA clients. This PR doesn't expand degenerate ranges, but rather
keeps them degenerate by moving `_end` to the newly-changed `_start`.

Tested in the NVDA Python console (cases with `setEndPoint` and
`compareEndPoints` described in #7342). Also ran the logic by
@michaelDCurran.

Closes #7342

Almost definitely addresses nvaccess/nvda#11288 (although I'll need to
test with my Braille display). Also fixes an issue privately reported to
me by @Simon818 with copy/paste from review cursor which originally lead
me to believe the issue was with `moveEndPointByRange`.

(cherry picked from commit 7a03f75)
@ghost
Copy link

ghost commented Sep 22, 2020

🎉Windows Terminal v1.3.2651.0 has been released which incorporates this pull request.:tada:

Handy links:

@ghost ghost mentioned this pull request Sep 22, 2020
Closed
@ghost
Copy link

ghost commented Sep 22, 2020

🎉Windows Terminal Preview v1.4.2652.0 has been released which incorporates this pull request.:tada:

Handy links:

@carlos-zamora carlos-zamora mentioned this pull request Oct 1, 2020
Merged
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carlos-zamora carlos-zamora carlos-zamora approved these changes

@DHowett DHowett DHowett approved these changes

Assignees
No one assigned
Labels
Area-Accessibility Issues related to accessibility AutoMerge Marked for automatic merge by the bot when requirements are met Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-1 A description (P1) Product-Conhost For issues in the Console codebase Product-Terminal The new Windows Terminal.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

UIA: degenerate text ranges not degenerate after move
3 participants
@codeofdusk @carlos-zamora @DHowett