Merge 1c8d243 into c4de9f9

michaelDCurran · web-flow · commit b662c7fb33c7 · 2020-09-15T09:57:05.000+10:00
diff --git a/source/NVDAObjects/IAccessible/ia2TextMozilla.py b/source/NVDAObjects/IAccessible/ia2TextMozilla.py
@@ -99,7 +99,7 @@ def __init__(self, obj, position):
 				# The caret is at the end of an inline object.
 				# This will report "blank", but we want to report the character just after the caret.
 				try:
-					caretTi, caretObj = self._findNextContent(caretTi)
+					caretTi, caretObj = self._findNextContent(caretTi, limitToInline=True)
 				except LookupError:
 					pass
 			self._start = self._end = caretTi
@@ -513,7 +513,7 @@ def expand(self, unit):
 		self._end = end
 		self._endObj = endObj
 
-	def _findNextContent(self, origin, moveBack=False):
+	def _findNextContent(self, origin, moveBack=False, limitToInline=False):
 		if isinstance(origin, textInfos.TextInfo):
 			ti = origin
 			obj = ti.obj
@@ -529,6 +529,12 @@ def _findNextContent(self, origin, moveBack=False):
 			if obj == self.obj:
 				# We're at the root. Don't go any further.
 				raise LookupError
+			if limitToInline:
+				if obj.IA2Attributes.get('display') != 'inline':
+					# The caller requested to limit to inline objects. 
+					# As this container is not inline,
+					# We cannot go above this container.
+					raise LookupError
 			ti = self._getEmbedding(obj)
 			if not ti:
 				raise LookupError
