Studio app module/track finder and column search: apply track finder …

…text filtering to other track finder family commands.

Apply track finder text filtering to other track finder commands: column search, find next/previous tracks.
This will be backported to lTS20.

addon/appModules/splstudio/__init__.py

@@ -1494,6 +1494,10 @@ def script_findTrack(self, gesture):
 		description=_("Finds text in columns."))
 	def script_columnSearch(self, gesture):
 		if self._trackFinderCheck(1):
+			if self.findText is not None:
+				self.findText = list(filter(lambda x: x not in (None, ""), self.findText))
+				if not len(self.findText):
+					self.findText = None
 			self.trackFinderGUI(columnSearch=True)
 
 	# Find next and previous scripts.
@@ -1504,6 +1508,11 @@ def script_columnSearch(self, gesture):
 		gesture="kb:nvda+f3")
 	def script_findTrackNext(self, gesture):
 		if self._trackFinderCheck(0):
+			# Although counterintuitive, filtering must take place here as well to avoid finding nothing or everything.
+			# Passing in None or an empty string to track finder results in "finding" the next track.
+			self.findText = list(filter(lambda x: x not in (None, ""), self.findText))
+			if not len(self.findText):
+				self.findText = None
 			if self.findText is None:
 				self.trackFinderGUI()
 			else:
@@ -1518,6 +1527,10 @@ def script_findTrackNext(self, gesture):
 		gesture="kb:shift+nvda+f3")
 	def script_findTrackPrevious(self, gesture):
 		if self._trackFinderCheck(0):
+			# Same as find next: filter find text list here, too.
+			self.findText = list(filter(lambda x: x not in (None, ""), self.findText))
+			if not len(self.findText):
+				self.findText = None
 			if self.findText is None:
 				self.trackFinderGUI()
 			else: