Improve word boundries

FIameCaster · Dec 19, 2023 · ea955f7 · ea955f7
1 parent a585839
commit ea955f7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/package/src/extensions/search/selection.ts b/package/src/extensions/search/selection.ts
@@ -83,17 +83,18 @@ const highlightCurrentWord = (
 			return ([start, end], value) => {
 				if (start < end || !editor.focused || noHighlight) searchAPI.search("")
 				else {
-					let group = `[\\p{L}_$\\d${includeHyphens && includeHyphens(start) ? "-" : ""}]*`
-					let before = value.slice(0, start).match(RegExp(group + "$", "u"))!
+					let group = `[_$\\p{L}\\d${includeHyphens && includeHyphens(start) ? "-" : ""}]`
+					let before = value.slice(0, start).match(RegExp(group + "*$", "u"))!
 					let index = before.index!
-					let word = before[0] + value.slice(start).match(RegExp("^" + group, "u"))![0]
+					let word = before[0] + value.slice(start).match(RegExp("^" + group + "*", "u"))![0]
 					searchAPI.search(
 						/^-*(\d|$)/.test(word) || (filter && !filter(index, index + word.length)) ? "" : word,
 						true,
 						true,
 						false,
 						undefined,
 						filter,
+						RegExp(group + "{2}", "u"),
 					)
 				}
 				noHighlight = false