Merge 150be44 into 8cbdb79

LeonarddeR · web-flow · commit 4452b742054c · 2022-04-21T11:30:01.000+10:00
diff --git a/source/appModules/devenv.py b/source/appModules/devenv.py
@@ -1,7 +1,8 @@
 # A part of NonVisual Desktop Access (NVDA)
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
-# Copyright (C) 2010-2019 NV Access Limited, Soronel Haetir, Babbage B.V., Francisco Del Roio
+# Copyright (C) 2010-2022 NV Access Limited, Soronel Haetir, Babbage B.V., Francisco Del Roio,
+# Leonard de Ruijter
 
 import objbase
 import comtypes
@@ -14,11 +15,12 @@
 from comtypes.automation import IDispatch
 from NVDAObjects.window import DisplayModelEditableText
 from NVDAObjects.IAccessible import IAccessible
-from NVDAObjects.UIA import UIA
+from NVDAObjects.UIA import UIA, WpfTextView, UIATextInfo
 from enum import IntEnum
 import appModuleHandler
 import controlTypes
 import threading
+import UIAHandler
 
 
 # A few helpful constants
@@ -43,9 +45,12 @@ def __init__(self, *args, **kwargs):
 		self.vsMajor, self.vsMinor = int(vsMajor), int(vsMinor)
 
 	def chooseNVDAObjectOverlayClasses(self, obj, clsList):
+		if WpfTextView in clsList:
+			clsList.remove(WpfTextView)
+			clsList.insert(0, VsWpfTextView)
 		# Only use this overlay class if the top level automation object for the IDE can be retrieved,
 		# as it will not work otherwise.
-		if obj.windowClassName == "VsTextEditPane" and self.DTE:
+		elif obj.windowClassName == "VsTextEditPane" and self.DTE:
 			try:
 				clsList.remove(DisplayModelEditableText)
 			except ValueError:
@@ -82,6 +87,44 @@ def _get_DTE(self):
 		return DTE
 
 
+class VsWpfTextViewTextInfo(UIATextInfo):
+
+	def _getLineNumberString(self, textRange):
+		# Visual Studio exposes line numbers as part of the actual text.
+		# We want to store the line number in a format field instead.
+		lineNumberRange = textRange.Clone()
+		lineNumberRange.MoveEndpointByRange(
+			UIAHandler.TextPatternRangeEndpoint_End,
+			lineNumberRange,
+			UIAHandler.TextPatternRangeEndpoint_Start
+		)
+		return lineNumberRange.GetText(-1)
+
+	def _getFormatFieldAtRange(self, textRange, formatConfig, ignoreMixedValues=False):
+		formatField = super()._getFormatFieldAtRange(textRange, formatConfig, ignoreMixedValues=ignoreMixedValues)
+		if not formatField or not formatConfig['reportLineNumber']:
+			return formatField
+		lineNumberStr = self._getLineNumberString(textRange)
+		if lineNumberStr:
+			try:
+				formatField.field['line-number'] = int(lineNumberStr)
+			except ValueError:
+				log.debugWarning(
+					f"Couldn't parse {lineNumberStr} as integer to report a line number",
+					exc_info=True
+				)
+		return formatField
+
+	def _getTextFromUIARange(self, textRange):
+		text = super()._getTextFromUIARange(textRange)
+		lineNumberStr = self._getLineNumberString(textRange)
+		return text[(0 if not lineNumberStr else len(lineNumberStr)):]
+
+
+class VsWpfTextView(WpfTextView):
+	TextInfo = VsWpfTextViewTextInfo
+
+
 class VsTextEditPaneTextInfo(textInfos.offsets.OffsetsTextInfo):
 
 	def _get__selectionObject(self):
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -31,6 +31,10 @@ What's New in NVDA
 - When reading non-interactive PDFs in Adobe Reader, the type and state of form fields (such as checkboxes and radio buttons) are now reported. (#13285)
 - "Reset configuration to factory defaults" is now accessible in the NVDA menu during secure mode. (#13547)
 - Any locked mouse keys will be unlocked when NVDA exits, previously the mouse button would remain locked. (#13410)
+- Visual Studio now reports line numbers. (#13604)
+  - Note that for line number reporting to work, showing line numbers must be enabled in Visual Studio and NVDA.
+  -
+- Visual Studio now correctly reports line indentation. (#13574)
 - NVDA can now beep or speak on Java application progress bars (#13594)
 -
 
