jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add multiline string support to editor find

Browse source 
(works for plain text searches not regexps)
This commit is contained in:
nightwing 2012-05-08 14:11:00 +04:00
commit 707adc2ff5
1 changed files with 112 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

195
lib/ace/search.js
View file

@ -116,9 +116,7 @@ Search.SELECTION = 2;
if (!this.$options.needle)
return null;
var iterator = this.$options.backwards
? this.$backwardMatchIterator(session)
: this.$forwardMatchIterator(session);
var iterator = this.$matchIterator(session);
if (!iterator)
return false;
@ -144,9 +142,7 @@ Search.SELECTION = 2;
if (!options.needle)
return [];
var iterator = options.backwards
? this.$backwardMatchIterator(session)
: this.$forwardMatchIterator(session);
var iterator = this.$matchIterator(session);
if (!iterator)
return false;
@ -175,8 +171,6 @@ Search.SELECTION = 2;
*
* Searches for `options.needle` in `input`, and, if found, replaces it with `replacement`.
*
*
*
**/
this.replace = function(input, replacement) {
var re = this.$assembleRegExp();
@ -196,89 +190,97 @@ Search.SELECTION = 2;
};
/** internal, hide
* Search.$forwardMatchIterator(session) -> String | Boolean
* Search.$matchIterator(session) -> String | Boolean
* - session (EditSession): The session to search with
*
*
*
**/
this.$forwardMatchIterator = function(session) {
this.$matchIterator = function(session) {
var re = this.$assembleRegExp();
if (!re)
return false;
var self = this;
var self = this, callback, backwards = this.$options.backwards;
return {
forEach: function(callback) {
self.$forwardLineIterator(session).forEach(function(line, startIndex, row) {
if (startIndex) {
line = line.substring(startIndex);
}
if (this.$options.$isMultiLine) {
var matchIterator = function(line, startIndex, row) {
var startLine = line;
if (startIndex)
line = line.substring(startIndex);
var matches = [];
var len = re.length;
var part = re[0];
if (line.slice(-part.length) != part)
return;
line.replace(re, function(str) {
var offset = arguments[arguments.length-2];
matches.push({
str: str,
offset: startIndex + offset
});
return str;
});
for (var i = 1; i < len - 1; i++)
if (re[i] != session.getLine(row + i))
return;
for (var i=0; i<matches.length; i++) {
var match = matches[i];
var range = self.$rangeFromMatch(row, match.offset, match.str.length);
if (callback(range))
return true;
}
part = re[len - 1];
if (session.getLine(row + len - 1).slice(0, part.length) != part)
return;
});
var range = new Range(
row, startLine.length - re[0].length,
row + len - 1, re[len - 1].length
);
if (callback(range))
return true;
}
};
};
} else if (backwards) {
var matchIterator = function(line, startIndex, row) {
if (startIndex)
line = line.substring(startIndex);
/** internal, hide
* Search.$backwardMatchIterator(session) -> String
* - session (EditSession): The session to search with
*
*
*
**/
this.$backwardMatchIterator = function(session) {
var re = this.$assembleRegExp();
if (!re)
return false;
var matches = [];
var self = this;
return {
forEach: function(callback) {
self.$backwardLineIterator(session).forEach(function(line, startIndex, row) {
if (startIndex) {
line = line.substring(startIndex);
}
var matches = [];
line.replace(re, function(str, offset) {
matches.push({
str: str,
offset: startIndex + offset
});
return str;
line.replace(re, function(str) {
var offset = arguments[arguments.length-2];
matches.push({
str: str,
offset: startIndex + offset
});
for (var i=matches.length-1; i>= 0; i--) {
var match = matches[i];
var range = self.$rangeFromMatch(row, match.offset, match.str.length);
if (callback(range))
return true;
}
return str;
});
for (var i=matches.length-1; i>= 0; i--) {
var match = matches[i];
var range = self.$rangeFromMatch(row, match.offset, match.str.length);
if (callback(range))
return true;
}
}
};
} else {
var matchIterator = function(line, startIndex, row) {
if (startIndex)
line = line.substring(startIndex);
var matches = [];
line.replace(re, function(str) {
var offset = arguments[arguments.length-2];
matches.push({
str: str,
offset: startIndex + offset
});
return str;
});
for (var i=0; i<matches.length; i++) {
var match = matches[i];
var range = self.$rangeFromMatch(row, match.offset, match.str.length);
if (callback(range))
return true;
}
}
}
return {forEach: function(_callback) {
callback = _callback;
self.$lineIterator(session).forEach(matchIterator);
}};
};
this.$rangeFromMatch = function(row, column, length) {
@ -289,12 +291,18 @@ Search.SELECTION = 2;
if (typeof this.$options.needle != 'string')
return this.$options.needle;
if (this.$options.regExp) {
var needle = this.$options.needle;
} else {
needle = lang.escapeRegExp(this.$options.needle);
var needle = this.$options.needle;
if (!this.$options.regExp) {
if (/[\n\r]/.test(needle)){
this.$options.$isMultiLine = true;
return needle.split(/\r\n|\r|\n/)
}
needle = lang.escapeRegExp(needle);
}
this.$options.$isMultiLine = false;
if (this.$options.wholeWord) {
needle = "\\b" + needle + "\\b";
}
@ -314,11 +322,12 @@ Search.SELECTION = 2;
return re;
};
this.$forwardLineIterator = function(session) {
this.$lineIterator = function(session) {
var searchSelection = this.$options.scope == Search.SELECTION;
var backwards = this.$options.backwards;
var range = this.$options.range || session.getSelection().getRange();
var start = this.$options.start || range[searchSelection ? "start" : "end"];
var start = this.$options.start || range[searchSelection != backwards ? "start" : "end"];
var firstRow = searchSelection ? range.start.row : 0;
var firstColumn = searchSelection ? range.start.column : 0;
@ -338,8 +347,8 @@ Search.SELECTION = 2;
return line;
}
return {
forEach: function(callback) {
if (!backwards) {
var forEach = function(callback) {
var row = start.row;
var line = getLine(row);
@ -349,10 +358,8 @@ Search.SELECTION = 2;
inWrap = false;
while (!callback(line, startIndex, row)) {
if (stop) {
if (stop)
return;
}
row++;
startIndex = 0;
@ -373,23 +380,8 @@ Search.SELECTION = 2;
line = getLine(row);
}
}
};
};
this.$backwardLineIterator = function(session) {
var searchSelection = this.$options.scope == Search.SELECTION;
var range = this.$options.range || session.getSelection().getRange();
var start = this.$options.start || range[searchSelection ? "end" : "start"];
var firstRow = searchSelection ? range.start.row : 0;
var firstColumn = searchSelection ? range.start.column : 0;
var lastRow = searchSelection ? range.end.row : session.getLength() - 1;
var wrap = this.$options.wrap;
return {
forEach : function(callback) {
} else {
var forEach = function(callback) {
var row = start.row;
var line = session.getLine(row).substring(0, start.column);
@ -398,7 +390,6 @@ Search.SELECTION = 2;
var inWrap = false;
while (!callback(line, startIndex, row)) {
if (stop)
return;
@ -429,7 +420,9 @@ Search.SELECTION = 2;
startIndex = start.column;
}
}
};
}
return {forEach: forEach};
};
}).call(Search.prototype);