starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-02-04 05:35:20 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

[PR #4373] [MERGED] Introduce UiaTextRangeBase::FindText() for Accessibility #25724

New Issue
Open
opened 2026-01-31 09:11:23 +00:00 by claunia · 0 comments
claunia commented 2026-01-31 09:11:23 +00:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/4373
Author: @carlos-zamora
Created: 1/28/2020
Status: ✅ Merged
Merged: 1/31/2020
Merged by: @undefined

Base: master ← Head: dev/cazamor/acc/find-text

📝 Commits (10+)

  • 719676c utr refactor
  • e7555dc Refactor UiaTextRange:
  • 76a26e3 remove accidental file
  • d4c4e29 Add accessibilityMode to GetWordStart/End and Viewport functions.
  • 3017aaa Testing!!!!
  • f6b2ea2 wtvr
  • 9a40869 Let's try doing word nav this way
  • ea22c8f Add testing for Compare, CompareEndpoint, Expand, and MoveEndpointByRange
  • bcfc522 Turns out, the bug is in our wrapper class. Not supposed to return nullptr when attribute not found. Don't know why this is an issue now
  • 71d50cb - Code format

📊 Changes

11 files changed (+79 additions, -87 deletions)

View changed files

📝 src/cascadia/TerminalControl/UiaTextRange.cpp (+0 -9)
📝 src/cascadia/TerminalControl/UiaTextRange.hpp (+0 -4)
📝 src/cascadia/TerminalControl/XamlUiaTextRange.cpp (+11 -7)
📝 src/inc/HostAndPropsheetIncludes.h (+4 -0)
📝 src/interactivity/win32/screenInfoUiaProvider.hpp (+2 -1)
📝 src/interactivity/win32/uiaTextRange.cpp (+0 -53)
📝 src/interactivity/win32/uiaTextRange.hpp (+0 -4)
📝 src/types/ScreenInfoUiaProviderBase.h (+2 -1)
📝 src/types/UiaTextRangeBase.cpp (+54 -1)
📝 src/types/UiaTextRangeBase.hpp (+5 -6)
📝 src/types/WindowUiaProviderBase.hpp (+1 -1)

📄 Description

Moved FindText to UiaTextRangeBase. Now that Search is a shared component (thanks #3279), I can just reuse it basically as-is.

#3279 - Make Search a shared component
#4018 - UiaTextRange Refactor

I removed it from the two different kinds of UiaTextRange and put it in the base class.

I needed a very minor change to ensure we convert from an inclusive end (from Search) to an exclusive end (in UTR).

Worked with FindText was globally messed with in windows.h. So we had to do a few weird things there (thanks Michael).

No need for additional tests because it literally just sets up a Searcher and calls it.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/microsoft/terminal/pull/4373 **Author:** [@carlos-zamora](https://github.com/carlos-zamora) **Created:** 1/28/2020 **Status:** ✅ Merged **Merged:** 1/31/2020 **Merged by:** [@undefined](undefined) **Base:** `master` ← **Head:** `dev/cazamor/acc/find-text` --- ### 📝 Commits (10+) - [`719676c`](https://github.com/microsoft/terminal/commit/719676c30dc79a770b1f407f23c0053ce075d516) utr refactor - [`e7555dc`](https://github.com/microsoft/terminal/commit/e7555dc1ece7dd57eb4bfd84960c377c0d649b5c) Refactor UiaTextRange: - [`76a26e3`](https://github.com/microsoft/terminal/commit/76a26e3f62f850270d585ee8c04f8682675b7d5d) remove accidental file - [`d4c4e29`](https://github.com/microsoft/terminal/commit/d4c4e29204f4fae95823cec7c471d2d3aa40c4ab) Add accessibilityMode to GetWordStart/End and Viewport functions. - [`3017aaa`](https://github.com/microsoft/terminal/commit/3017aaae9a8303dd531518f726d71e4d5831f005) Testing!!!! - [`f6b2ea2`](https://github.com/microsoft/terminal/commit/f6b2ea2b3fbc015a812e5784fa7f7f238a8e7bfc) wtvr - [`9a40869`](https://github.com/microsoft/terminal/commit/9a40869a4b7bfc27b872d6fe9f2d3a189e529220) Let's try doing word nav this way - [`ea22c8f`](https://github.com/microsoft/terminal/commit/ea22c8f360009889f893110c257d846615cbdbd3) Add testing for Compare, CompareEndpoint, Expand, and MoveEndpointByRange - [`bcfc522`](https://github.com/microsoft/terminal/commit/bcfc52245b91e67974d6ad3d91fe910a7347165e) Turns out, the bug is in our wrapper class. Not supposed to return nullptr when attribute not found. Don't know why this is an issue _now_ - [`71d50cb`](https://github.com/microsoft/terminal/commit/71d50cb936995725e6372dd94417153b7c80a75c) - Code format ### 📊 Changes **11 files changed** (+79 additions, -87 deletions) <details> <summary>View changed files</summary> 📝 `src/cascadia/TerminalControl/UiaTextRange.cpp` (+0 -9) 📝 `src/cascadia/TerminalControl/UiaTextRange.hpp` (+0 -4) 📝 `src/cascadia/TerminalControl/XamlUiaTextRange.cpp` (+11 -7) 📝 `src/inc/HostAndPropsheetIncludes.h` (+4 -0) 📝 `src/interactivity/win32/screenInfoUiaProvider.hpp` (+2 -1) 📝 `src/interactivity/win32/uiaTextRange.cpp` (+0 -53) 📝 `src/interactivity/win32/uiaTextRange.hpp` (+0 -4) 📝 `src/types/ScreenInfoUiaProviderBase.h` (+2 -1) 📝 `src/types/UiaTextRangeBase.cpp` (+54 -1) 📝 `src/types/UiaTextRangeBase.hpp` (+5 -6) 📝 `src/types/WindowUiaProviderBase.hpp` (+1 -1) </details> ### 📄 Description Moved `FindText` to `UiaTextRangeBase`. Now that Search is a shared component (thanks #3279), I can just reuse it basically as-is. #3279 - Make Search a shared component #4018 - UiaTextRange Refactor I removed it from the two different kinds of UiaTextRange and put it in the base class. I needed a very minor change to ensure we convert from an inclusive end (from Search) to an exclusive end (in UTR). Worked with `FindText` was globally messed with in windows.h. So we had to do a few weird things there (thanks Michael). No need for additional tests because it _literally_ just sets up a Searcher and calls it. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
claunia added the pull-request label 2026-01-31 09:11:23 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
⛺ Reserved
A11yCO
A11yMAS
A11ySev1
A11ySev2
A11ySev3
A11yTTValidated
A11yUsable
A11yVoiceAccess
A11yWCAG
Area-Accessibility
Area-AtlasEngine
Area-AzureShell
Area-Build
Area-Build
Area-Chat
Area-CmdPal
Area-CodeHealth
Area-Commandline
Area-CookedRead
Area-DefApp
Area-Extensibility
Area-Fonts
Area-GroupPolicy
Area-i18n
Area-Input
Area-Interaction
Area-Interop
Area-Localization
Area-Output
Area-Performance
Area-Portable
Area-Quality
Area-Remoting
Area-Rendering
Area-Schema
Area-Server
Area-Settings
Area-SettingsUI
Area-ShellExtension
Area-ShellExtension
Area-ShellExtension
Area-Suggestions
Area-Suggestions
Area-TerminalConnection
Area-TerminalControl
Area-Theming
Area-UserInterface
Area-VT
Area-Windowing
Area-WPFControl
AutoMerge
Blocking-Ingestion
Culprit-Centennial
Culprit-WinUI
Disability-All
Disability-Blind
Disability-LowVision
Disability-Mobility
External-Blocked-WinUI3
Fixed
Gathering-Data
good first issue
HCL-E+D
HCL-WindowsTerminal
Help Wanted
Impact-Compatibility
Impact-Compliance
Impact-Correctness
Impact-Visual
In-PR
InclusionBacklog
InclusionBacklog-Windows TerminalWin32
InclusionCommitted-202206
Issue-Bug
Issue-Docs
Issue-Feature
Issue-Feature
Issue-Question
Issue-Samples
Issue-Scenario
Issue-Task
Needs-Attention
Needs-Author-Feedback
Needs-Bisect
Needs-Discussion
Needs-Repro
Needs-Tag-Fix
Needs-Tag-Fix
Needs-Triage
No-Recent-Activity
Priority-0
Priority-1
Priority-2
Priority-3
Product-Cmd.exe
Product-Colortool
Product-Colortool
Product-Colortool
Product-Conhost
Product-Conpty
Product-Meta
Product-Powershell
Product-Terminal
Product-WSL
pull-request
Mirrored from GitHub Pull Request
 Resolution-Answered
Resolution-By-Design
Resolution-Duplicate
Resolution-External
Resolution-Fix-Available
Resolution-Fix-Committed
Resolution-No-Repro
Resolution-Won't-Fix
Severity-Blocking
Severity-Crash
Severity-DataLoss
spam
this-will-be-a-breaking-change
Tracking-External
WindowsTerminal_Win32
Work-Item
zAskModeBug
zInbox-Bug
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
claunia
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/terminal#25724
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?