Merge 5662532 into 1af8775

lukaszgo1 · web-flow · commit 092fb8352c5e · 2019-08-01T16:30:18.000Z
diff --git a/source/NVDAObjects/window/scintilla.py b/source/NVDAObjects/window/scintilla.py
@@ -1,7 +1,8 @@
-#A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2009-2019 NV Access Limited, Arnold Loubriat, Babbage B.V.
-#This file is covered by the GNU General Public License.
-#See the file COPYING for more details.
+# -*- coding: UTF-8 -*-
+# A part of NonVisual Desktop Access (NVDA)
+# Copyright (C) 2009-2019 NV Access Limited, Arnold Loubriat, Babbage B.V., Łukasz Golonka
+# This file is covered by the GNU General Public License.
+# See the file COPYING for more details.
 
 import ctypes
 import IAccessibleHandler
@@ -42,6 +43,7 @@
 SCI_POSITIONFROMLINE=2167
 SCI_LINELENGTH=2350
 SCI_GETSTYLEAT=2010
+SCI_GETCHARAT = 2007
 SCI_STYLEGETFONT=2486
 SCI_STYLEGETSIZE=2485
 SCI_STYLEGETBOLD=2483
@@ -59,6 +61,7 @@
 INVALID_POSITION=-1
 STYLE_DEFAULT=32
 SC_CP_UTF8=65001
+space = 32
 
 class CharacterRangeStruct(ctypes.Structure):
 	_fields_=[
@@ -195,6 +198,12 @@ def _getWordOffsets(self,offset):
 		if end<=offset:
 			start=end
 			end=watchdog.cancellableSendMessage(self.obj.windowHandle,SCI_WORDENDPOSITION,offset,0)
+		# #8295: When calculating offsets with Scintilla messages spaces are considered to be words.
+		# Therefore check if character at offset is  a space, and if so calculate it again.
+		if watchdog.cancellableSendMessage(self.obj.windowHandle, SCI_GETCHARAT, end, 0) == space:
+			end=watchdog.cancellableSendMessage(self.obj.windowHandle, SCI_WORDENDPOSITION, end, 0)
+		if watchdog.cancellableSendMessage(self.obj.windowHandle, SCI_GETCHARAT, start, 0) == space:
+			start=watchdog.cancellableSendMessage(self.obj.windowHandle, SCI_WORDSTARTPOSITION, start, 0)
 		return [start,end]
 
 	def _getLineNumFromOffset(self,offset):
