update addon to work for 2022.1 release

Author: derek riemer

addon/appModules/notepad++/__init__.py

@@ -1,6 +1,6 @@
 #__init__.py
 #A part of theNotepad++ addon for NVDA
-#Copyright (C) 2016-2019 Tuukka Ojala, Derek Riemer
+#Copyright (C) 2016-2022 Tuukka Ojala, Derek Riemer
 #This file is covered by the GNU General Public License.
 #See the file COPYING for more details.
 

addon/appModules/notepad++/addonSettingsPanel.py

@@ -1,6 +1,6 @@
 #addonGui.py
 #A part of theNotepad++ addon for NVDA
-#Copyright (C) 2016 Tuukka Ojala, Derek Riemer
+#Copyright (C) 2016-2022 Tuukka Ojala, Derek Riemer
 #This file is covered by the GNU General Public License.
 #See the file COPYING for more details.
 

addon/appModules/notepad++/autocomplete.py

@@ -1,4 +1,10 @@
 # coding: utf-8
+#autocomplete.py
+#A part of theNotepad++ addon for NVDA
+#Copyright (C) 2016-2022 Tuukka Ojala, Derek Riemer
+#This file is covered by the GNU General Public License.
+#See the file COPYING for more details.
+
 from NVDAObjects.IAccessible  import IAccessible
 import speech
 import braille

addon/appModules/notepad++/editWindow.py

@@ -1,6 +1,6 @@
 #editWindow.py
 #A part of theNotepad++ addon for NVDA
-#Copyright (C) 2016-2019 Tuukka Ojala, Derek Riemer
+#Copyright (C) 2016-2022 Tuukka Ojala, Derek Riemer
 #This file is covered by the GNU General Public License.
 #See the file COPYING for more details.
 
@@ -28,9 +28,10 @@
 class EditWindow(EditWindowBaseCls, EditableTextWithSuggestions):
 	"""An edit window that implements all of the scripts on the edit field for Notepad++"""
 
-	
 	def event_loseFocus(self):
 		#Hack: finding the edit field from the foreground window is unreliable, so cache it here.
+		# The object tree is all sorts of fubar,
+		# And actually can have cycles (so it's not a tree).
 		#We can't use the weakref cache, because NVDA probably (?) kill this object off when it loses focus.
 		#Also, derek is too lazy to verify this when it already works.
 		self.appModule.edit = self
@@ -43,6 +44,7 @@ def event_gainFocus(self):
 
 	def initOverlayClass(self):
 		#Notepad++ names the edit window "N" for some stupid reason.
+		# Nuke it.
 		self.name = ""
 
 	def script_goToMatchingBrace(self, gesture):
@@ -52,9 +54,9 @@ def script_goToMatchingBrace(self, gesture):
 		info.expand(textInfos.UNIT_LINE)
 		if info.text.strip() in ('{', '}'):
 			#This line is only one brace. Not very helpful to read, lets read the previous and next line as well.
-			#Move it's start back a line.
+			#Move its start back a line.
 			info.move(textInfos.UNIT_LINE, -1, endPoint = "start")
-			# Move it's end one line, forward.
+			# Move its end one line forward.
 			info.move(textInfos.UNIT_LINE, 1, endPoint = "end")
 			#speak the info.
 			registerGeneratorObject((speech.speakMessage(i) for i in info.text.split("\n")))

addon/appModules/notepad++/incrementalFind.py

@@ -1,6 +1,6 @@
 #incrementalFind.py
 #A part of theNotepad++ addon for NVDA
-#Copyright (C) 2016 Tuukka Ojala, Derek Riemer
+#Copyright (C) 2016-2022 Tuukka Ojala, Derek Riemer
 #This file is covered by the GNU General Public License.
 #See the file COPYING for more details.
 
@@ -15,41 +15,32 @@
 
 
 class IncrementalFind(NVDAObject):
-	debug = False
 	cacheBookmark = None
 	die = False
-	debug=False
 
 	def schedule(self):
-		log.debug("may schedule a round.")
+		log.debug("Scheduling round.")
 		if self.die:
-			log.debug("Not rescheduling")
 			self.die=False
 			return
-		log.debug("Scheduling change watcher in 5 ms")
 		core.callLater(5, self.changeWatcher)
 
 	def event_gainFocus(self):
 		super(IncrementalFind, self).event_gainFocus()
-		log.debug("Gain focus fired")
 		self.schedule()
 
 	def event_loseFocus(self):
 		self.die = True
-		log.debug("Scheduling distruction.")
 
 	def changeWatcher(self):
-		
 		self.schedule()
-		log.debug("Preparing change watcher.")
 		edit = self.appModule.edit
 		if None is edit:
 			#The editor gained focus. We're gonna die anyway on the next round.
 			return
 		textInfo = edit.makeTextInfo(textInfos.POSITION_SELECTION)
 		if textInfo.bookmark == IncrementalFind.cacheBookmark:
 			#Nothing has changed. Just go away.
-			log.debug("Nothing has changed since the last round.")
 			return
 		IncrementalFind.cacheBookmark = textInfo.bookmark
 		textInfo.expand(textInfos.UNIT_LINE)
@@ -64,11 +55,6 @@ def event_stateChange(self):
 		#Squelch the "pressed" message as this gets quite annoying, I must say.
 		pass
 
-	#Debug script for testing why the thing isn't firing.
-	@script(gesture = 'kb:nvda+d')
-	def script_debug(self, gesture):
-		speech.speakMessage("Prepare for log spam")
-	
 
 class LiveTextControl(NVDAObject):
 	_cache = None

buildVars.py

@@ -20,7 +20,7 @@
 	"addon_description" : _("""Notepad++ App Module.
 This addon improves the accessibility of Notepad ++. To learn more, press the add-on help button."""),
 	# version
-	"addon_version" : "2021.10.1",
+	"addon_version" : "2022.05.1",
 	# Author(s)
 	"addon_author" : u"Derek Riemer <[email protected]>, Tuukka Ojala <[email protected]>",
 	# URL for the add-on documentation support
@@ -48,3 +48,5 @@
 # Files that will be ignored when building the nvda-addon file
 # Paths are relative to the addon directory, not to the root directory of your addon sources.
 excludedFiles = []
+
+