From 6ceb8ac075499f0039875b6533a9f384b9eb2b60 Mon Sep 17 00:00:00 2001 From: Bill Dengler Date: Fri, 16 Oct 2020 08:02:41 -0400 Subject: [PATCH] Fix _getTextLines for 21H1 UIA console (PR #11760) Fixes #11740 --- source/NVDAObjects/UIA/winConsoleUIA.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/source/NVDAObjects/UIA/winConsoleUIA.py b/source/NVDAObjects/UIA/winConsoleUIA.py index 3e3b8f186c1..03513bf48f1 100644 --- a/source/NVDAObjects/UIA/winConsoleUIA.py +++ b/source/NVDAObjects/UIA/winConsoleUIA.py @@ -48,10 +48,8 @@ def _getBoundingRange(self, obj, position): if position == textInfos.POSITION_FIRST: collapseToEnd = False elif position == textInfos.POSITION_LAST: - # We must pull back the end by one character otherwise when we collapse to end, - # a console bug results in a textRange covering the entire console buffer! - # Strangely the *very* last character is a special blank point - # so we never seem to miss a real character. + # The exclusive end hangs off the end of the visible ranges. + # Move back one character to remain within bounds. _rangeObj.MoveEndpointByUnit( UIAHandler.TextPatternRangeEndpoint_End, UIAHandler.NVDAUnitsToUIAUnits['character'], @@ -366,6 +364,11 @@ def _get_TextInfo(self): return consoleUIATextInfo if self.is21H1Plus else consoleUIATextInfoPre21H1 def _getTextLines(self): + if self.is21H1Plus: + # #11760: the 21H1 UIA console wraps across lines. + # When text wraps, NVDA starts reading from the beginning of the visible text for every new line of output. + # Use the superclass _getTextLines instead. + return super()._getTextLines() # This override of _getTextLines takes advantage of the fact that # the console text contains linefeeds for every line # Thus a simple string splitlines is much faster than splitting by unit line. @@ -373,6 +376,7 @@ def _getTextLines(self): text = ti.text or "" return text.splitlines() + def detectPossibleSelectionChange(self): try: return super().detectPossibleSelectionChange()