samgozman#30 fix non-alphanumeric lexems replacement with \b

nfrigus · Dec 7, 2016 · 215ccf2 · 215ccf2
1 parent 352f98d
commit 215ccf2
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/yoptascript.js b/src/yoptascript.js
@@ -2440,7 +2440,17 @@ var dictionary = [
 ];
 
 	function escapeRegExp(str) {
-	    return "\\b" + str.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&') + "\\b";
+		var str = str.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+
+        if (/^\w/.test(str)) {
+			str = "\\b" + str;
+        }
+
+        if (/\w$/.test(str)) {
+			str += "\\b";
+        }
+
+	    return  str;
     }
 
     function yoptReplaceAll(str, search, replacement) {