Merge 6e75803 into 9dc9339

mltony · web-flow · commit e48645facdd6 · 2025-06-26T22:41:55.000Z
diff --git a/source/NVDAObjects/window/scintilla.py b/source/NVDAObjects/window/scintilla.py
@@ -313,16 +313,6 @@ def _getCharacterOffsets(self, offset):
 				tempOffset -= 1
 		return [start, end]
 
-	def collapse(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.
-		https://github.com/nvaccess/nvda/issues/17430
-		"""
-		if end and self.obj.makeTextInfo(textInfos.POSITION_SELECTION).isCollapsed:
-			self.expand(textInfos.UNIT_LINE)
-		super().collapse(end=end)
-
 
 # The Scintilla NVDA object, inherists the generic MSAA NVDA object
 class Scintilla(EditableTextWithAutoSelectDetection, Window):
diff --git a/source/textInfos/offsets.py b/source/textInfos/offsets.py
@@ -664,7 +664,7 @@ def move(self, unit, direction, endPoint=None):
 		count = 0
 		lowLimit = 0
 		highLimit = self._getStoryLength()
-		if self.allowMoveToOffsetPastEnd and unit == textInfos.UNIT_CHARACTER:
+		if self.allowMoveToOffsetPastEnd:
 			# #2096: There is often an uncounted character at the end of the text
 			# where the caret is placed to append text.
 			highLimit += 1
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -107,6 +107,8 @@ Please refer to [the developer guide](https://www.nvaccess.org/files/nvda/docume
 The several built-in table definitions are moved to the `__tables` module in that package. (#18194, @LeonarddeR)
 * Microsoft SQL Server Management Studio now uses the Visual Studio app module, as SSMS is based on Visual Studio. (#18176, @LeonarddeR)
 * NVDA will report Windows release revision number (for example: 10.0.26100.0) when `winVersion.getWinVer` is called and log this information at startup. (#18266, @josephsl)
+* Fixed behavior of `TextInfo.collapse()` - previously it was moving TextInfo to the next paragraph in some cases. (#18320, @mltony)
+* Fixed behavior of `OffsetTextInfo.move()` - previously it wouldn't move to the very end of the document unless moving by character. (@mltony)
 
 ## 2025.1.2
 
