fix: search box updateCounter

ajaxorg · Nov 22, 2024 · 861e5d8 · 861e5d8
1 parent d530af2
commit 861e5d8
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/ext/searchbox.js b/src/ext/searchbox.js
@@ -214,12 +214,12 @@ class SearchBox {
                 ? editor.session.getTextRange(this.searchRange)
                 : editor.getValue();
 
-            /**
-             * Convert all line ending variations to Unix-style = \n
-             * Windows (\r\n), MacOS Classic (\r), and Unix (\n)
-             */
-            if (editor.$search.$isMultilineSearch(editor.getLastSearchOptions()))
-                value = value.replace(/\r\n|\r|\n/g, "\n");
+            // Replace newline sequences (\r\n, \r, \n) in the regex pattern with the editor's newline character.
+            var rePattern = /\\r\\n|\\r|\\n/g;
+            if (editor.$search.$isMultilineSearch(editor.getLastSearchOptions()) && regex.source.search(rePattern) != -1) {
+                var regexPattern = regex.source.replace(rePattern, lang.escapeRegExp(editor.session.doc.getNewLineCharacter()));
+                regex = new RegExp(regexPattern, regex.flags);
+            }
 
             var offset = editor.session.doc.positionToIndex(editor.selection.anchor);
             if (this.searchRange)