Rewrite

keyboard-watcher.user.js

@@ -18,8 +18,7 @@ globalThis.document.styleSheets[0].insertRule('tbody tr.athing>td.title>span.tit
 const requery = () => globalThis.document.querySelectorAll('tbody tr.athing')
 let
 	query = requery(),
-	selected = -1,
+	selected = -1
-	lastCollapsed
 const
 	// This is a Firefox only option. For some reason older versions of Firefox can't set outline: none.
 	focusInvisible = { __proto__: null, focusVisible: false },
@@ -37,25 +36,15 @@ const
 	keydown = event => {
 		switch (event.key) {
 			case 'j':
-				const lastIndex = query.length - 1
+				if (selected + 1 === query.length)
-				if (selected === lastIndex)
 					return
 
 				if (selected !== -1)
 					query[selected].style.boxShadow = ''
 
-				let hiddenChain = 0
+				while (selected < query.length && query[++selected].classList.contains('noshow'));
-				while (selected < lastIndex) {
-					const hidden = query[++selected].classList.contains('noshow')
-					hiddenChain = hiddenChain * hidden + hidden
 
-					if (!hidden) {
+				if (!query[selected].classList.contains('noshow'))
-						lastCollapsed = query[selected].classList.contains('coll') ? selected : undefined
-						break
-					}
-				}
-
-				selected -= hiddenChain * (selected - hiddenChain === lastCollapsed)
 					highlightSelected()
 				return
 			case 'k':
@@ -63,8 +52,9 @@ const
 					return
 
 				query[selected].style.boxShadow = ''
-
 				while (selected >= 0 && query[--selected].classList.contains('noshow'));
+
+				if (!query[selected].classList.contains('noshow'))
 					highlightSelected()
 				return
 			case 'h':
@@ -77,7 +67,7 @@ const
 						else
 							query[selected].nextSibling.querySelector('a.clicky.hider')?.click()
 
-				if (selected + 1 <= query?.length)
+				if (selected + 1 <= query.length && !query[selected].classList.contains('noshow'))
 					highlightSelected()
 				return
 			case 'c':