Merge 657f601 into e82d24c

ABuffEr · web-flow · commit 7bad1d47d5f5 · 2023-04-05T16:17:58.000+10:00
diff --git a/source/speechDictHandler/__init__.py b/source/speechDictHandler/__init__.py
@@ -8,8 +8,8 @@
 from logHandler import log
 import os
 import codecs
+import review
 import api
-import config
 from . import dictFormatUpgrade
 from .speechDictVars import speechDictsPath
 
@@ -115,9 +115,25 @@ def sub(self, text):
 				del self[index]
 		return text
 
+
 def processText(text):
 	if not globalVars.speechDictionaryProcessing:
 		return text
+	# #14689: older (IMPROVED and END_INCLUSIVE) UIA consoles have many blank lines, which slows processing to a halt
+	focus = api.getFocusObject()
+	try:
+		# get TextInfo implementation for object review mode
+		textInfo, obj = review.getObjectPosition(focus)
+	except AttributeError:  # no makeTextInfo
+		textInfo = None
+	# late import to prevent circular dependency
+	# ConsoleUIATextInfo is used by IMPROVED and END_INCLUSIVE consoles
+	from NVDAObjects.UIA.winConsoleUIA import ConsoleUIATextInfo
+	if isinstance(textInfo, ConsoleUIATextInfo):
+		stripText = text.rstrip()
+		IGNORE_TRAILING_WHITESPACE_LENGTH = 100
+		if len(text) - len(stripText) > IGNORE_TRAILING_WHITESPACE_LENGTH:
+			text = stripText
 	for type in dictTypes:
 		text=dictionaries[type].sub(text)
 	return text
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -55,6 +55,7 @@ This only worked for Bluetooth Serial ports before. (#14524)
 Instead NVDA reports that the link has no destination. (#14723)
 - Several stability fixes to input/output for braille displays, resulting in less frequent errors and crashes of NVDA. (#14627)
 - NVDA again recovers from many more situations such as applications that stop responding which previously caused it to freeze completely. (#14759) 
+- When forcing UIA support with certain terminal and consoles, a bug is fixed which caused a freeze and the log file to be spammed. (#14689)
 -
 
 

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ This only worked for Bluetooth Serial ports before. (#14524)`
`55`	`55`	`Instead NVDA reports that the link has no destination. (#14723)`
`56`	`56`	`- Several stability fixes to input/output for braille displays, resulting in less frequent errors and crashes of NVDA. (#14627)`
`57`	`57`	`- NVDA again recovers from many more situations such as applications that stop responding which previously caused it to freeze completely. (#14759)`
	`58`	`+- When forcing UIA support with certain terminal and consoles, a bug is fixed which caused a freeze and the log file to be spammed. (#14689)`
`58`	`59`	`-`
`59`	`60`
`60`	`61`