Beta to master

source/NVDAObjects/window/edit.py

@@ -718,7 +718,11 @@ def __init__(self,obj,position,_rangeObj=None):
 			self._rangeObj=self.obj.ITextSelectionObject.duplicate
 		elif position==textInfos.POSITION_CARET:
 			self._rangeObj=self.obj.ITextSelectionObject.duplicate
-			self._rangeObj.Collapse(True)
+			startActive: bool = (self.obj.ITextSelectionObject.Flags & comInterfaces.tom.tomSelStartActive) > 0
+			# Notice: in the following line Collapse() method is called on ITextRange object, not on TextInfo.
+			# It's boolean argument has the opposite meaning from the one in TextInfo:
+			# True means collapse to the start, while False means collapse to the end
+			self._rangeObj.Collapse(startActive)
 		elif position==textInfos.POSITION_FIRST:
 			self._rangeObj=self.obj.ITextDocumentObject.range(0,0)
 		elif position==textInfos.POSITION_LAST:

source/addonStore/dataManager.py

@@ -17,6 +17,7 @@
 
 import requests
 from requests.structures import CaseInsensitiveDict
+from json import JSONDecodeError
 
 import addonAPIVersion
 from baseObject import AutoPropertyObject
@@ -183,16 +184,17 @@ def _getCachedAddonData(self, cacheFilePath: str) -> Optional[CachedAddonsModel]
 			return None
 		try:
 			data = cacheData["data"]
+			cachedAddonData = _createStoreCollectionFromJson(data)
 			cacheHash = cacheData["cacheHash"]
 			cachedLanguage = cacheData["cachedLanguage"]
 			nvdaAPIVersion = cacheData["nvdaAPIVersion"]
-		except KeyError:
+		except (KeyError, JSONDecodeError):
 			log.exception(f"Invalid add-on store cache:\n{cacheData}")
 			if NVDAState.shouldWriteToDisk():
 				os.remove(cacheFilePath)
 			return None
 		return CachedAddonsModel(
-			cachedAddonData=_createStoreCollectionFromJson(data),
+			cachedAddonData=cachedAddonData,
 			cacheHash=cacheHash,
 			cachedLanguage=cachedLanguage,
 			nvdaAPIVersion=tuple(nvdaAPIVersion),  # loads as list,

source/browseMode.py

@@ -2392,6 +2392,8 @@ def _iterTextStyle(
 		# if direction == "previous" then it spans from the beginning of current paragraph until cursor+1
 		# For all following iterations paragraph will represent a complete paragraph.
 		styles = self._mergeIdenticalStyles(self._extractStyles(paragraph))
+		if len(styles) < 2:
+			return
 		initialStyle = styles[0 if direction == documentBase._Movement.NEXT else -2]
 		# Creating currentTextInfo - text written in initialStyle in this paragraph.
 		currentTextInfo = initialTextInfo.copy()
@@ -2545,17 +2547,7 @@ def _iterSimilarParagraph(
 			desiredValue = paragraphFunction(info)
 		for i in range(self.MAX_ITERATIONS_FOR_SIMILAR_PARAGRAPH):
 			# move by one paragraph in the desired direction
-			try:
-				info.collapse(end=direction == _Movement.NEXT)
-			except RuntimeError:
-				# Microsoft Word raises RuntimeError when collapsing textInfo to the last character of the document.
-				return
-
-			if direction == _Movement.PREVIOUS:
-				if info.move(textInfos.UNIT_CHARACTER, -1) == 0:
-					return
-			info.expand(textInfos.UNIT_PARAGRAPH)
-			if info.isCollapsed:
+			if not self._moveToNextParagraph(info, direction):
 				return
 			value = paragraphFunction(info)
 			if value == desiredValue: