Merge pull request #17085 from nvaccess/beta

Beta to master

source/NVDAObjects/JAB/__init__.py

@@ -184,11 +184,8 @@ def _getLineOffsets(self, offset: int) -> tuple[int, int]:
 		if end == -1 and offset > 0:
 			# #1892: JAB returns -1 for the end insertion position
 			# instead of returning the offsets for the last line.
-			# Try one character back, unless we're on a new line.
-			if self.obj.jabContext.getAccessibleTextRange(offset - 1, offset - 1) != "\n":
-				(start, end) = self.obj.jabContext.getAccessibleTextLineBounds(offset - 1)
-			else:
-				(start, end) = (offset, offset)
+			# Try one character back.
+			(start, end) = self.obj.jabContext.getAccessibleTextLineBounds(offset - 1)
 		# Java gives end as the last character, not one past the last character
 		end = end + 1
 		return (start, end)

user_docs/en/changes.md

@@ -101,6 +101,7 @@ There have also been a number of fixes, including to mouse tracking in Firefox,
 * It is now possible to interact with Data validation dropdown lists in Microsoft Excel 365. (#15138)
 * NVDA is no longer as sluggish when arrowing up and down through large files in VS Code. (#17039)
 * NVDA no longer becomes unresponsive after holding down an arrow key for a long time while in browse mode, particularly in Microsoft Word and Microsoft Outlook. (#16812)
+* NVDA no longer reads the last line when the cursor is on the second-last line of a multiline edit control in Java applications. (#17027)
 
 ### Changes for Developers