Merge 2a16454 into 071247b

mltony · web-flow · commit 9d1cf1176ed0 · 2025-06-25T13:15:07.000-07:00
diff --git a/source/NVDAObjects/window/scintilla.py b/source/NVDAObjects/window/scintilla.py
@@ -313,7 +313,7 @@ def _getCharacterOffsets(self, offset):
 				tempOffset -= 1
 		return [start, end]
 
-	def collapse(self, end: bool = False):
+	def collapseAndMaybeMoveToNextParagraph(self, end: bool = False):
 		"""Before collapsing to end, if no text is selected, TextInfo is expanded to line.
 		This fixes a bug where next braille line command didn't move the cursor to the last empty line
 		in Notepad++ documents.
diff --git a/source/braille.py b/source/braille.py
@@ -1661,7 +1661,7 @@ def nextLine(self):
 					dest = dest.obj.makeTextInfo(textInfos.POSITION_FIRST)
 			else:  # no page turn support
 				shouldCollapseToEnd = True
-		dest.collapse(shouldCollapseToEnd)
+		dest.collapseAndMaybeMoveToNextParagraph(shouldCollapseToEnd)
 		self._setCursor(dest)
 		_speakOnNavigatingByUnit(dest, self._getReadingUnit())
 
diff --git a/source/textInfos/__init__.py b/source/textInfos/__init__.py
@@ -519,6 +519,9 @@ def collapse(self, end=False):
 		"""
 		raise NotImplementedError
 
+	def collapseAndMaybeMoveToNextParagraph(self, end: bool = False):
+		return self.collapse(end)
+
 	@abstractmethod
 	def copy(self):
 		"""duplicates this text info object so that changes can be made to either one with out afecting the other"""
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -47,6 +47,7 @@
 * It is now possible to route to any braille cell on the Humanware Monarch multiline braille device, using their point and click action. (#18248)
 * In focus mode in web browsers, it is now possible to review and spell the labels of controls when those labels are specifically provided for accessibility; e.g. via `aria-label` or `aria-labelledby`. (#15159, @jcsteh)
 * It is now possible to review and spell the labels of controls in Google Chrome menus and dialogs. (#11285, @jcsteh)
+* Fixed behavior of `TextInfo.collapse()` - previously it was moving TextInfo to the next paragraph in some cases. (#18320, @mltony).
 
 ### Changes for Developers
 
