feat: Multiline Search Support: line breaks \n
#5675
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -116,11 +116,17 @@ class Search { | |
| row = row + len - 2; | ||
| } | ||
| } else { | ||
| for (var matches, i = 0; i < lines.length; i++) { | ||
| if (this.$isMultilineSearch(options)) { | ||
| matches = this.$multiLineForward(session, re, i, lines.length); | ||
| ranges.push(new Range(matches.startRow, matches.startCol, matches.endRow, matches.endCol)); | ||
|
|
||
| } | ||
| else { | ||
| matches = lang.getMatchOffsets(lines[i], re); | ||
| for (var j = 0; j < matches.length; j++) { | ||
| var match = matches[j]; | ||
| ranges.push(new Range(i, match.offset, i, match.offset + match.length)); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -146,6 +152,74 @@ class Search { | |
| return ranges; | ||
| } | ||
|
|
||
| parseReplaceString(input, replaceString) { | ||
| var CharCode = { | ||
| DollarSign: 36, | ||
| Ampersand: 38, | ||
| Digit0: 48, | ||
| Digit1: 49, | ||
| Digit9: 57, | ||
| Backslash: 92, | ||
| n: 110, | ||
| t: 116 | ||
| }; | ||
|
|
||
| var replacement = ''; | ||
| for (var i = 0, len = replaceString.length; i < len; i++) { | ||
| var chCode = replaceString.charCodeAt(i); | ||
| if (chCode === CharCode.Backslash) { | ||
| // move to next char | ||
| i++; | ||
| if (i >= len) { | ||
| // string ends with a \ | ||
| break; | ||
| } | ||
| var nextChCode = replaceString.charCodeAt(i); | ||
| switch (nextChCode) { | ||
| case CharCode.Backslash: | ||
| // \\ => inserts a "\" | ||
| replacement = '\\'; | ||
| break; | ||
| case CharCode.n: | ||
| // \n => inserts a LF | ||
| replacement= '\n'; | ||
| break; | ||
| case CharCode.t: | ||
| // \t => inserts a TAB | ||
| replacement = '\t'; | ||
| break; | ||
| } | ||
| continue; | ||
| } | ||
|
|
||
| if (chCode === CharCode.DollarSign) { | ||
| // move to next char | ||
| i++; | ||
| if (i >= len) { | ||
| // string ends with a $ | ||
| break; | ||
| } | ||
| const nextChCode = replaceString.charCodeAt(i); | ||
| if (nextChCode === CharCode.DollarSign) { | ||
| // $$ => inserts a "$" | ||
| replacement = '$'; | ||
| continue; | ||
| } | ||
| if (nextChCode === CharCode.Digit0 || nextChCode === CharCode.Ampersand) { | ||
| // $& and $0 => inserts the matched substring. | ||
| replacement = input; | ||
| continue; | ||
| } | ||
| if (CharCode.Digit1 <= nextChCode && nextChCode <= CharCode.Digit9) { | ||
| // $n | ||
| replacement = replaceString; | ||
| continue; | ||
| } | ||
| } | ||
| } | ||
| return replacement; | ||
| } | ||
|
|
||
| /** | ||
| * Searches for `options.needle` in `input`, and, if found, replaces it with `replacement`. | ||
| * @param {String} input The text to search in | ||
|
|
@@ -166,11 +240,15 @@ class Search { | |
| if (!re) | ||
| return; | ||
|
|
||
| if (this.$isMultilineSearch(options)) | ||
|
There was a problem hiding this comment. these are used at 2 places should we create another method as this looks like the reusable code. |
||
| input = input.replace(/\r\n|\r|\n/g, "\n"); | ||
|
|
||
| var match = re.exec(input); | ||
| if (!match || (!this.$isMultilineSearch(options) && match[0].length != input.length)) | ||
| return null; | ||
|
|
||
| if (options.regExp) { | ||
| replacement = this.parseReplaceString(input, replacement); | ||
| } | ||
|
|
||
| replacement = input.replace(re, replacement); | ||
|
|
@@ -248,13 +326,86 @@ class Search { | |
| return re; | ||
| } | ||
|
|
||
| $isMultilineSearch(options) { | ||
| return options.re && /\\r\\n|\\r|\\n/.test(options.re.source) && options.regExp && !options.$isMultiLine; | ||
nlujjawal marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| $multiLineForward(session, re, start, last) { | ||
| var line, | ||
| chunk = chunkEnd(session, start); | ||
|
|
||
| for (var row = start; row <= last;) { | ||
| for (var i = 0; i < chunk; i++) { | ||
| if (row > last) | ||
| break; | ||
| var next = session.getLine(row++); | ||
| line = line == null ? next : line + "\n" + next; | ||
| } | ||
|
|
||
| var match = re.exec(line); | ||
| re.lastIndex = 0; | ||
| if (match) { | ||
| var before = line.slice(0, match.index).split("\n"); | ||
nlujjawal marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| var inside = match[0].split("\n"); | ||
| var startRow = start + before.length - 1; | ||
| var startCol = before[before.length - 1].length; | ||
| var endRow = startRow + inside.length - 1; | ||
| var endCol = inside.length == 1 ? startCol + inside[0].length : inside[inside.length - 1].length; | ||
|
|
||
| return { | ||
| startRow: startRow, | ||
| startCol: startCol, | ||
| endRow: endRow, | ||
| endCol: endCol | ||
| }; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| $multiLineBackward(session, re, endIndex, start, first) { | ||
| var line, | ||
| chunk = chunkEnd(session, start), | ||
| endMargin = session.getLine(start).length - endIndex; | ||
|
|
||
| for (var row = start; row >= first;) { | ||
| for (var i = 0; i < chunk && row >= first; i++) { | ||
| var next = session.getLine(row--); | ||
| line = line == null ? next : next + "\n" + line; | ||
| } | ||
|
|
||
| var match = multiLineBackwardMatch(line, re, endMargin); | ||
| if (match) { | ||
| var before = line.slice(0, match.index).split("\n"); | ||
| var inside = match[0].split("\n"); | ||
| var startRow = row + before.length; | ||
| var startCol = before[before.length - 1].length; | ||
| var endRow = startRow + inside.length - 1; | ||
| var endCol = inside.length == 1 ? startCol + inside[0].length : inside[inside.length - 1].length; | ||
|
|
||
| return { | ||
| startRow: startRow, | ||
| startCol: startCol, | ||
| endRow: endRow, | ||
| endCol: endCol | ||
| }; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * @param {EditSession} session | ||
| */ | ||
| $matchIterator(session, options) { | ||
| var re = this.$assembleRegExp(options); | ||
| if (!re) | ||
| return false; | ||
|
|
||
| var multiline = this.$isMultilineSearch(options); | ||
| var mtForward = this.$multiLineForward; | ||
| var mtBackward = this.$multiLineBackward; | ||
|
|
||
| var backwards = options.backwards == true; | ||
| var skipCurrent = options.skipCurrent != false; | ||
| var supportsUnicodeFlag = re.unicode; | ||
|
|
@@ -322,43 +473,61 @@ class Search { | |
| } | ||
| else if (backwards) { | ||
| var forEachInLine = function(row, endIndex, callback) { | ||
| if (multiline) { | ||
|
There was a problem hiding this comment. should we reset regex lastIndex above this line just to reset it? There was a problem hiding this comment. Yes, see: https://stackoverflow.com/a/4724920 There was a problem hiding this comment. Sorry, I wasn’t focused earlier. No need, because it’s already set in |
||
| var pos = mtBackward(session, re, endIndex, row, firstRow); | ||
| if (!pos) | ||
| return false; | ||
| if (callback(pos.startRow, pos.startCol, pos.endRow, pos.endCol)) | ||
| return true; | ||
| } | ||
| else { | ||
| var line = session.getLine(row); | ||
| var matches = []; | ||
| var m, last = 0; | ||
| re.lastIndex = 0; | ||
| while((m = re.exec(line))) { | ||
| var length = m[0].length; | ||
| last = m.index; | ||
| if (!length) { | ||
| if (last >= line.length) break; | ||
| re.lastIndex = last += lang.skipEmptyMatch(line, last, supportsUnicodeFlag); | ||
| } | ||
| if (m.index + length > endIndex) | ||
| break; | ||
| matches.push(m.index, length); | ||
| } | ||
| for (var i = matches.length - 1; i >= 0; i -= 2) { | ||
| var column = matches[i - 1]; | ||
| var length = matches[i]; | ||
| if (callback(row, column, row, column + length)) | ||
| return true; | ||
| } | ||
| } | ||
| }; | ||
| } | ||
| else { | ||
| var forEachInLine = function(row, startIndex, callback) { | ||
| re.lastIndex = startIndex; | ||
| if (multiline) { | ||
| var pos = mtForward(session, re, row, lastRow); | ||
nlujjawal marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (!pos) | ||
| return false; | ||
| if (callback(pos.startRow, pos.startCol, pos.endRow, pos.endCol)) | ||
| return true; | ||
| } | ||
| else { | ||
| var line = session.getLine(row); | ||
| var last; | ||
| var m; | ||
| while((m = re.exec(line))) { | ||
| var length = m[0].length; | ||
| last = m.index; | ||
| if (callback(row, last, row,last + length)) | ||
| return true; | ||
| if (!length) { | ||
| re.lastIndex = last += lang.skipEmptyMatch(line, last, supportsUnicodeFlag); | ||
| if (last >= line.length) return false; | ||
| } | ||
| } | ||
| } | ||
| }; | ||
|
|
@@ -397,4 +566,32 @@ function addWordBoundary(needle, options) { | |
| return wordBoundary(firstChar) + needle + wordBoundary(lastChar, false); | ||
| } | ||
|
|
||
| function multiLineBackwardMatch(line, re, endMargin) { | ||
| var match, | ||
| from = 0; | ||
| while (from <= line.length) { | ||
| re.lastIndex = from; | ||
| var newMatch = re.exec(line); | ||
| if (!newMatch) | ||
| break; | ||
| var end = newMatch.index + newMatch[0].length; | ||
| if (end > line.length - endMargin) | ||
| break; | ||
| if (!match || end > match.index + match[0].length) | ||
| match = newMatch; | ||
| from = newMatch.index + 1; | ||
| } | ||
| return match; | ||
| } | ||
|
|
||
| function chunkEnd(session, start) { | ||
| var base = 5000, | ||
| startPosition = { row: start, column: 0 }, | ||
| startIndex = session.doc.positionToIndex(startPosition), | ||
| targetIndex = startIndex + base, | ||
| targetPosition = session.doc.indexToPosition(targetIndex), | ||
| targetLine = targetPosition.row; | ||
| return targetLine + 1; | ||
| } | ||
|
|
||
| exports.Search = Search; | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please move this to an input event handler in searchbox, something like
editor.on('input', this.$onEditorInput)and remove the listener when deactivating.onDocumentChangecan be called multiple times during one edit, and input event debounces that with a timeout.Also in one of tests add a scenario of changing editor value, e.g.
to prevent coverlay complaining about untested lines