Fix skip clutter

mltony · Dec 21, 2024 · d92177b · d92177b
1 parent b792759
commit d92177b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/addon/globalPlugins/browserNav/__init__.py b/addon/globalPlugins/browserNav/__init__.py
@@ -508,15 +508,8 @@ def preCaretMovementScriptHelper(self, gesture,unit, direction=None,posConstant=
     oldSelection = self.selection
     if (
         (
-            (
-                getConfig("skipEmptyParagraphs")
-                and unit == textInfos.UNIT_PARAGRAPH
-            ) or  (
-                getConfig("skipEmptyLines")
-                and unit == textInfos.UNIT_LINE
-            ) or (
-                quickJump.needOverride_caretMovement(self)
-            )
+            quickJump.isSkipClutterEnabledForThisUnit(unit)
+            or quickJump.needOverride_caretMovement(self)
         )
         and direction is not None
         and posConstant==textInfos.POSITION_SELECTION

diff --git a/addon/globalPlugins/browserNav/quickJump.py b/addon/globalPlugins/browserNav/quickJump.py
@@ -1702,6 +1702,16 @@ def needOverride_caretMovement(self):
     suppressTreeLevel = getSuppressTreeLevel(url, globalConfig)
     return suppressAriaLabelEditable or suppressTreeLevel
 
+def isSkipClutterEnabledForThisUnit(unit):
+    return (
+        (
+            getConfig("skipEmptyParagraphs")
+            and unit == textInfos.UNIT_PARAGRAPH
+        ) or  (
+            getConfig("skipEmptyLines")
+            and unit == textInfos.UNIT_LINE
+        )
+    )
 
 def caretMovementWithAutoSkip(self, gesture,unit, direction=None,posConstant=textInfos.POSITION_SELECTION, *args, **kwargs):
     url = getUrl(self)
@@ -1722,7 +1732,7 @@ def caretMovementWithAutoSkip(self, gesture,unit, direction=None,posConstant=tex
         expandInfo = info.copy()
         expandInfo.expand(unit)
         expandText = expandInfo.text
-        if shouldSkipClutter(expandInfo, bookmarks):
+        if isSkipClutterEnabledForThisUnit(unit) and shouldSkipClutter(expandInfo, bookmarks):
             skipped = True
             continue
         break