Merge 9ba60ae into a9bcdff

LeonarddeR · web-flow · commit b7e31d0f8746 · 2025-04-10T19:28:14.000+02:00
diff --git a/source/NVDAObjects/UIA/__init__.py b/source/NVDAObjects/UIA/__init__.py
@@ -729,15 +729,15 @@ def _getTextWithFieldsForUIARange(  # noqa: C901
 	) -> Generator[textInfos.TextInfo.TextOrFieldsT, None, None]:
 		"""
 		Yields start and end control fields, and text, for the given UI Automation text range.
-		@param rootElement: the highest ancestor that encloses the given text range. This function will not walk higher than this point.
-		@param textRange: the UI Automation text range whos content should be fetched.
-		@param formatConfig: the types of formatting requested.
-		@type formatConfig: a dictionary of NVDA document formatting configuration keys
+		:param rootElement: the highest ancestor that encloses the given text range. This function will not walk higher than this point.
+		:param textRange: the UI Automation text range whos content should be fetched.
+		:param formatConfig: the types of formatting requested.
+		:type formatConfig: a dictionary of NVDA document formatting configuration keys
 			with values set to true for those types that should be fetched.
-		@param includeRoot: If true, then a control start and end will be yielded for the root element.
-		@param alwaysWalkAncestors: If true then control fields will be yielded for any element enclosing the given text range, that is a descendant of the root element. If false then the root element may be  assumed to be the only ancestor.
-		@param recurseChildren: If true, this function will be recursively called for each child of the given text range, clipped to the bounds of this text range. Formatted text between the children will also be yielded. If false, only formatted text will be yielded.
-		@param _rootElementClipped: Indicates if textRange represents all of the given rootElement,
+		:param includeRoot: If true, then a control start and end will be yielded for the root element.
+		:param alwaysWalkAncestors: If true then control fields will be yielded for any element enclosing the given text range, that is a descendant of the root element. If false then the root element may be  assumed to be the only ancestor.
+		:param recurseChildren: If true, this function will be recursively called for each child of the given text range, clipped to the bounds of this text range. Formatted text between the children will also be yielded. If false, only formatted text will be yielded.
+		:param _rootElementClipped: Indicates if textRange represents all of the given rootElement,
 			or is clipped at the start or end.
 		"""
 		debug = UIAHandler._isDebug() and log.isEnabledFor(log.DEBUG)
@@ -777,7 +777,7 @@ def _getTextWithFieldsForUIARange(  # noqa: C901
 					break
 				else:
 					if debug:
-						log.debug("parentElement: %s" % parentElement.currentLocalizedControlType)
+						log.debug(f"parentElement: {parentElement.currentLocalizedControlType!r}")
 					try:
 						parentRange = self.obj.UIATextPattern.rangeFromChild(parentElement)
 					except COMError:
@@ -786,22 +786,26 @@ def _getTextWithFieldsForUIARange(  # noqa: C901
 						if debug:
 							log.debug("parentRange is NULL. Breaking")
 						break
-					clippedStart = (
-						textRange.CompareEndpoints(
-							UIAHandler.TextPatternRangeEndpoint_Start,
-							parentRange,
-							UIAHandler.TextPatternRangeEndpoint_Start,
-						)
-						> 0
+					startCmp = textRange.CompareEndpoints(
+						UIAHandler.TextPatternRangeEndpoint_Start,
+						parentRange,
+						UIAHandler.TextPatternRangeEndpoint_Start,
 					)
-					clippedEnd = (
-						textRange.CompareEndpoints(
-							UIAHandler.TextPatternRangeEndpoint_End,
-							parentRange,
-							UIAHandler.TextPatternRangeEndpoint_End,
-						)
-						< 0
+					endCmp = textRange.CompareEndpoints(
+						UIAHandler.TextPatternRangeEndpoint_End,
+						parentRange,
+						UIAHandler.TextPatternRangeEndpoint_End,
 					)
+					clippedStart = startCmp > 0
+					if endCmp == startCmp and endCmp > 0:
+						if debug:
+							log.debug(
+								f"The end of the inner range is greater than the end of the outer range ({endCmp}). "
+								"This is likely a bug in the UIA implementation. Assuming clippedEnd=True",
+							)
+						clippedEnd = True
+					else:
+						clippedEnd = endCmp < 0
 					parentElements.append((parentElement, (clippedStart, clippedEnd)))
 				parentElement = UIAHandler.handler.baseTreeWalker.getParentElementBuildCache(
 					parentElement,
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -12,6 +12,7 @@
 
 * In WinUI 3 apps including Microsoft Copilot and parts of Windows 11 File Explorer, NVDA will no longer fail to announce controls when using mouse and touch interaction. (#17407, #17771, @josephsl)
 * Fixed some rare cases where NVDA playing sounds could result in unexpected errors. (#17918, @LeonarddeR)
+* In Microsoft Word, when UIA is enabled, NVDA will no longer braille redundant table end markers when the cursor is in a table cell. (#15828, @LeonarddeR)
 
 ### Changes for Developers
 
