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

[incremental search] forward / backward movement

Browse source
This commit is contained in:
Robert Krahn 2013-03-10 06:59:35 -07:00
commit d6be35e8e1
2 changed files with 47 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lib/ace/incremental_search.js
View file

@ -76,24 +76,36 @@ oop.inherits(IncrementalSearch, Search);
delete this.$editor; delete this.$editor;
} }
iSearch.highlightAndFindWithNeedle = function(dir, moveToMatch, needleUpdateFunc) { iSearch.cancelSearch = function() {
var session = this.$editor.session,
sel = this.$editor.selection;
this.$options.needle = '';
session.highlight(null);
sel.setRange(this.$startRange);
return this.$currentRange = this.$startRange;
}
iSearch.highlightAndFindWithNeedle = function(dir, moveToNext, needleUpdateFunc) {
if (!this.$editor) return null; if (!this.$editor) return null;
dir = dir || 'forward'; dir = dir || 'forward';
var session = this.$editor.session, var session = this.$editor.session,
options = this.$options; options = this.$options;
if (needleUpdateFunc) options.needle = needleUpdateFunc(options.needle || '') || ''; if (needleUpdateFunc) options.needle = needleUpdateFunc(options.needle || '') || '';
if (options.needle.length === 0) {
return this.cancelSearch();
}
if (dir === "forward") { if (dir === "forward") {
options.start = this.$currentRange.end; options.start = moveToNext ? this.$currentRange.end : this.$currentRange.start;
options.backwards = false; options.backwards = false;
} else { } else {
options.start = this.$currentRange.start; options.start = moveToNext ? this.$currentRange.start : this.$currentRange.end;
options.backwards = true; options.backwards = true;
} }
var range = this.find(session); var range = this.find(session);
if (range && moveToMatch) { if (!range) range = this.$currentRange;
this.$editor.selection.setRange(range);
this.$currentRange = range; this.$editor.selection.setRange(range);
} this.$currentRange = range;
session.highlight(options.re); session.highlight(options.re);
return range; return range;

31
lib/ace/incremental_search_test.js
View file

@ -90,6 +90,7 @@ module.exports = {
highlightRanges = callHighlighterUpdate(editor.session); highlightRanges = callHighlighterUpdate(editor.session);
testRanges("Range: [0/3] -> [0/5]", [range], "range"); testRanges("Range: [0/3] -> [0/5]", [range], "range");
testRanges("Range: [0/3] -> [0/5],Range: [1/3] -> [1/5]", highlightRanges, "highlight"); testRanges("Range: [0/3] -> [0/5],Range: [1/3] -> [1/5]", highlightRanges, "highlight");
range = iSearch.addChar('3'); // "123" range = iSearch.addChar('3'); // "123"
highlightRanges = callHighlighterUpdate(editor.session); highlightRanges = callHighlighterUpdate(editor.session);
testRanges("Range: [0/3] -> [0/6]", [range], "range"); testRanges("Range: [0/3] -> [0/6]", [range], "range");
@ -99,12 +100,36 @@ module.exports = {
highlightRanges = callHighlighterUpdate(editor.session); highlightRanges = callHighlighterUpdate(editor.session);
testRanges("Range: [0/3] -> [0/5]", [range], "range"); testRanges("Range: [0/3] -> [0/5]", [range], "range");
testRanges("Range: [0/3] -> [0/5],Range: [1/3] -> [1/5]", highlightRanges, "highlight"); testRanges("Range: [0/3] -> [0/5],Range: [1/3] -> [1/5]", highlightRanges, "highlight");
},
range = iSearch.forward(); // "12", cursor forward "test: forward / backward" : function() {
highlightRanges = callHighlighterUpdate(editor.session); iSearch.activate(editor);
iSearch.addChar('1'); iSearch.addChar('2');
var range = iSearch.forward();
testRanges("Range: [1/3] -> [1/5]", [range], "range"); testRanges("Range: [1/3] -> [1/5]", [range], "range");
testRanges("Range: [0/3] -> [0/5],Range: [1/3] -> [1/5]", highlightRanges, "highlight");
range = iSearch.forward();
testRanges("Range: [1/3] -> [1/5]", [range], "range");
range = iSearch.backward();
testRanges("Range: [0/3] -> [0/5]", [range], "range");
},
"test: cancelSearch" : function() {
iSearch.activate(editor);
iSearch.addChar('1'); iSearch.addChar('2');
var range = iSearch.cancelSearch();
testRanges("Range: [0/0] -> [0/0]", [range], "range");
iSearch.addChar('1'); range = iSearch.addChar('2');
testRanges("Range: [0/3] -> [0/5]", [range], "range");
},
"test: failing search keeps range" : function() {
iSearch.activate(editor);
iSearch.addChar('1'); iSearch.addChar('2');
var range = iSearch.addChar('x');
testRanges("Range: [0/3] -> [0/5]", [range], "range");
} }
// // "test: find simple text in document" : function() { // // "test: find simple text in document" : function() {