Remove ignoreEditableText param

feerrenrut · feerrenrut · commit 6262596d093d · 2021-08-03T14:06:08.000+08:00
ControlStack previously had None inserted, now it can be empty.
diff --git a/source/NVDAObjects/IAccessible/ia2TextMozilla.py b/source/NVDAObjects/IAccessible/ia2TextMozilla.py
@@ -65,8 +65,8 @@ def _getEmbedded(obj, offset) -> typing.Optional[IAccessible]:
 
 class MozillaCompoundTextInfo(CompoundTextInfo):
 
-	def _getControlFieldForObject(self, obj, ignoreEditableText=True):
-		controlField = super()._getControlFieldForObject(obj, ignoreEditableText=ignoreEditableText)
+	def _getControlFieldForObject(self, obj):
+		controlField = super()._getControlFieldForObject(obj)
 		if controlField is None:
 			return None
 		# Set the uniqueID of the controlField if we can get one
@@ -267,7 +267,13 @@ def _iterRecursiveText(self, ti: offsets.OffsetsTextInfo, controlStack, formatCo
 			elif isinstance(item, int): # Embedded object.
 				embedded: typing.Optional[IAccessible] = _getEmbedded(ti.obj, item)
 				notText = _getRawTextInfo(embedded) is NVDAObjectTextInfo
-				if controlStack is not None:
+				if (
+					controlStack is not None
+					and not (
+						self._isObjectEditableText(embedded)
+						or self._isNamedlinkDestination(embedded)
+					)
+				):
 					controlField = self._getControlFieldForObject(embedded)
 					controlStack.append(controlField)
 					if controlField:
@@ -313,16 +319,19 @@ def _getText(self, withFields, formatConfig=None):
 			ti = self._start
 			cannotBeStart = False
 			while obj and obj != rootObj:
-				field = self._getControlFieldForObject(obj)
-				if field:
+				if not (
+					self._isObjectEditableText(obj)
+					or self._isNamedlinkDestination(obj)
+				):
+					field = self._getControlFieldForObject(obj)
 					if ti._startOffset == 0:
 						if not cannotBeStart:
 							field["_startOfNode"] = True
 					else:
 						# We're not at the start of this object, which also means we're not at the start of any ancestors.
 						cannotBeStart = True
 					fields.insert(0, textInfos.FieldCommand("controlStart", field))
-				controlStack.insert(0, field)
+					controlStack.insert(0, field)
 				ti = self._getEmbedding(obj)
 				if not ti:
 					log.debugWarning(
@@ -341,7 +350,7 @@ def _getText(self, withFields, formatConfig=None):
 			# (We already handled collapsed above.)
 			return fields
 		obj = self._startObj
-		while fields[-1] is not None:
+		while fields[-1] is not None and controlStack:
 			# The end hasn't yet been reached, which means it isn't a descendant of obj.
 			# Therefore, continue from where obj was embedded.
 			if withFields:
@@ -354,10 +363,9 @@ def _getText(self, withFields, formatConfig=None):
 					# range is invalid, so just return nothing.
 					log.debugWarning("Tried to walk up past the root. Objects probably dead.")
 					return []
-				if field:
-					# This object had a control field.
-					field["_endOfNode"] = True
-					fields.append(textInfos.FieldCommand("controlEnd", None))
+				# This object had a control field.
+				field["_endOfNode"] = True
+				fields.append(textInfos.FieldCommand("controlEnd", None))
 			ti = self._getEmbedding(obj)
 			if not ti:
 				log.debugWarning(
@@ -377,13 +385,11 @@ def _getText(self, withFields, formatConfig=None):
 			# Determine whether the range covers the end of any ancestors of endObj.
 			obj = self._endObj
 			ti = self._end
-			while obj and obj != rootObj:
+			while obj and obj != rootObj and controlStack:
 				field = controlStack.pop()
-				if field:
-					fields.append(textInfos.FieldCommand("controlEnd", None))
+				fields.append(textInfos.FieldCommand("controlEnd", None))
 				if ti.compareEndPoints(self._makeRawTextInfo(obj, textInfos.POSITION_ALL), "endToEnd") == 0:
-					if field:
-						field["_endOfNode"] = True
+					field["_endOfNode"] = True
 				else:
 					# We're not at the end of this object, which also means we're not at the end of any ancestors.
 					break
diff --git a/source/appModules/kindle.py b/source/appModules/kindle.py
@@ -346,8 +346,8 @@ def updateSelection(self):
 		log.debug("Setting selection to (%d, %d)" % (sel._startOffset, sel._endOffset))
 		sel.updateSelection()
 
-	def _getControlFieldForObject(self, obj, ignoreEditableText=True):
-		field = super(BookPageViewTextInfo, self)._getControlFieldForObject(obj, ignoreEditableText=ignoreEditableText)
+	def _getControlFieldForObject(self, obj):
+		field = super(BookPageViewTextInfo, self)._getControlFieldForObject(obj)
 		if field and field["role"] == controlTypes.Role.MATH:
 			try:
 				field["mathMl"] = obj.mathMl
diff --git a/source/compoundDocuments.py b/source/compoundDocuments.py
@@ -124,18 +124,21 @@ def _get_NVDAObjectAtStart(self):
 	def _get_pointAtStart(self):
 		return self._start.pointAtStart
 
-	def _isObjectEditableText(self, obj):
-		return obj.role in (controlTypes.Role.PARAGRAPH, controlTypes.Role.EDITABLETEXT)
-
-	def _getControlFieldForObject(self, obj, ignoreEditableText=True):
-		if ignoreEditableText and self._isObjectEditableText(obj):
-			# This is basically just a text node.
-			return None
+	def _isObjectEditableText(self, obj: NVDAObject) -> bool:
+		return obj.role in (
+			controlTypes.Role.PARAGRAPH,
+			controlTypes.Role.EDITABLETEXT,
+		)
+
+	def _isNamedlinkDestination(self, obj: NVDAObject) -> bool:
+		return (  # Named link destination, not a link that can be activated.
+			obj.role == controlTypes.Role.LINK
+			and controlTypes.STATE_LINKED not in obj.states
+		)
+
+	def _getControlFieldForObject(self, obj: NVDAObject):
 		role = obj.role
 		states = obj.states
-		if role == controlTypes.Role.LINK and controlTypes.STATE_LINKED not in states:
-			# Named link destination, not a link that can be activated.
-			return None
 		field = textInfos.ControlField()
 		field["role"] = role
 		field['roleText'] = obj.roleText
@@ -266,8 +269,11 @@ def getTextWithFields(self, formatConfig=None):
 		rootObj = self.obj.rootNVDAObject
 		obj = self._startObj
 		while obj and obj != rootObj:
-			field = self._getControlFieldForObject(obj)
-			if field:
+			if not (
+				self._isObjectEditableText(obj)
+				or self._isNamedlinkDestination(obj)
+			):
+				field = self._getControlFieldForObject(obj)
 				fields.insert(0, textInfos.FieldCommand("controlStart", field))
 			obj = obj.parent
 
@@ -282,13 +288,18 @@ def getTextWithFields(self, formatConfig=None):
 					else:
 						embedIndex += 1
 					field = ti.obj.getChild(embedIndex)
-					controlField = self._getControlFieldForObject(field, ignoreEditableText=False)
-					controlField["content"] = field.name
-					fields.extend((
-						textInfos.FieldCommand("controlStart", controlField),
-						textUtils.OBJ_REPLACEMENT_CHAR,
-						textInfos.FieldCommand("controlEnd", None)
-					))
+					if not (
+						# Don't check for self._isObjectEditableText
+						# Only for named link destinations.
+						self._isNamedlinkDestination(obj)
+					):
+						controlField = self._getControlFieldForObject(field)
+						controlField["content"] = field.name
+						fields.extend((
+							textInfos.FieldCommand("controlStart", controlField),
+							textUtils.OBJ_REPLACEMENT_CHAR,
+							textInfos.FieldCommand("controlEnd", None),
+						))
 				else:
 					fields.append(field)
 		return fields
