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

some cleanups. Tabs to spaces, etc

Browse source
This commit is contained in:
Fabian Jakobs 2012-04-11 16:55:27 +02:00
commit 94eddc1362
2 changed files with 59 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/ace/multi_select.js
View file

@ -45,8 +45,8 @@ var onMouseDown = require("./mouse/multi_select_handler").onMouseDown;
exports.commands = require("./commands/multi_select_commands"); exports.commands = require("./commands/multi_select_commands");
// Todo // Todo
var Search = require("ace/search").Search var Search = require("./search").Search;
var search = new Search var search = new Search();
function find(session, needle, dir) { function find(session, needle, dir) {
search.$options.wrap = true; search.$options.wrap = true;
@ -67,6 +67,7 @@ var EditSession = require("./edit_session").EditSession;
;(function() { ;(function() {
// list of ranges in reverse addition order // list of ranges in reverse addition order
this.ranges = null; this.ranges = null;
// automatically sorted list of ranges // automatically sorted list of ranges
this.rangeList = null; this.rangeList = null;
@ -391,9 +392,9 @@ var Editor = require("./editor").Editor;
for (var i = 0; i < ranges.length; i++) { for (var i = 0; i < ranges.length; i++) {
text += this.session.getTextRange(ranges[i]); text += this.session.getTextRange(ranges[i]);
} }
} else if (!this.selection.isEmpty()) } else if (!this.selection.isEmpty()) {
text = this.session.getTextRange(this.getSelectionRange()); text = this.session.getTextRange(this.getSelectionRange());
}
return text; return text;
}; };
@ -514,7 +515,6 @@ var Editor = require("./editor").Editor;
if (skip) if (skip)
this.multiSelect.substractPoint(range.cursor); this.multiSelect.substractPoint(range.cursor);
} }
}).call(Editor.prototype); }).call(Editor.prototype);
@ -574,8 +574,6 @@ function MultiSelect(editor) {
editor.commands.addCommands(exports.commands.defaultCommands); editor.commands.addCommands(exports.commands.defaultCommands);
} }
exports.MultiSelect = MultiSelect; exports.MultiSelect = MultiSelect;
}); });

108
lib/ace/multi_select_test.js
View file

@ -48,16 +48,16 @@ var Editor = require("./editor").Editor;
var MockRenderer = require("./test/mockrenderer").MockRenderer; var MockRenderer = require("./test/mockrenderer").MockRenderer;
var Range = require("./range").Range; var Range = require("./range").Range;
var assert = require("./test/assertions"); var assert = require("./test/assertions");
var MultiSelect = require("ace/multi_select").MultiSelect; var MultiSelect = require("./multi_select").MultiSelect;
var editor var editor
var exec = function(name, times, args) { var exec = function(name, times, args) {
do { do {
editor.commands.exec(name, editor, args); editor.commands.exec(name, editor, args);
} while(times --> 1) } while(times --> 1)
}; };
var testRanges = function(str) { var testRanges = function(str) {
assert.equal(editor.selection.getAllRanges()+"", str); assert.equal(editor.selection.getAllRanges()+"", str);
} }
module.exports = { module.exports = {
@ -66,74 +66,74 @@ module.exports = {
"test: multiselect editing": function() { "test: multiselect editing": function() {
var doc = new EditSession([ var doc = new EditSession([
"w1.w2", "w1.w2",
" wtt.w", " wtt.w",
" wtt.w" " wtt.w"
]); ]);
editor = new Editor(new MockRenderer(), doc); editor = new Editor(new MockRenderer(), doc);
MultiSelect(editor); MultiSelect(editor);
editor.navigateFileEnd(); editor.navigateFileEnd();
exec("selectMoreBefore", 3); exec("selectMoreBefore", 3);
assert.ok(editor.inMultiSelectMode); assert.ok(editor.inMultiSelectMode);
assert.equal(editor.selection.getAllRanges().length, 4); assert.equal(editor.selection.getAllRanges().length, 4);
assert.equal(editor.getCopyText(), "wwww"); assert.equal(editor.getCopyText(), "wwww");
exec("insertstring", 1, "a"); exec("insertstring", 1, "a");
exec("backspace", 2); exec("backspace", 2);
assert.equal(editor.session.getValue(), "w1.w2\ntt\ntt"); assert.equal(editor.session.getValue(), "w1.w2\ntt\ntt");
assert.equal(editor.selection.getAllRanges().length, 4); assert.equal(editor.selection.getAllRanges().length, 4);
exec("selectall"); exec("selectall");
assert.ok(!editor.inMultiSelectMode); assert.ok(!editor.inMultiSelectMode);
//assert.equal(editor.selection.getAllRanges().length, 1); //assert.equal(editor.selection.getAllRanges().length, 1);
}, },
"test: multiselect navigation": function() { "test: multiselect navigation": function() {
var doc = new EditSession([ var doc = new EditSession([
"w1.w2", "w1.w2",
" wtt.w", " wtt.w",
" wtt.we" " wtt.we"
]); ]);
editor = new Editor(new MockRenderer(), doc); editor = new Editor(new MockRenderer(), doc);
MultiSelect(editor); MultiSelect(editor);
editor.selectMoreLines(1); editor.selectMoreLines(1);
testRanges("Range: [0/0] -> [0/0],Range: [1/0] -> [1/0]"); testRanges("Range: [0/0] -> [0/0],Range: [1/0] -> [1/0]");
assert.ok(editor.inMultiSelectMode); assert.ok(editor.inMultiSelectMode);
exec("golinedown"); exec("golinedown");
exec("gotolineend"); exec("gotolineend");
testRanges("Range: [1/9] -> [1/9],Range: [2/10] -> [2/10]"); testRanges("Range: [1/9] -> [1/9],Range: [2/10] -> [2/10]");
exec("selectwordleft"); exec("selectwordleft");
testRanges("Range: [1/8] -> [1/9],Range: [2/8] -> [2/10]"); testRanges("Range: [1/8] -> [1/9],Range: [2/8] -> [2/10]");
exec("golinedown", 2); exec("golinedown", 2);
assert.ok(!editor.inMultiSelectMode); assert.ok(!editor.inMultiSelectMode);
}, },
"test: multiselect session change": function() { "test: multiselect session change": function() {
var doc = new EditSession([ var doc = new EditSession([
"w1.w2", "w1.w2",
" wtt.w", " wtt.w",
" wtt.w" " wtt.w"
]); ]);
var editor = new Editor(new MockRenderer(), doc); var editor = new Editor(new MockRenderer(), doc);
MultiSelect(editor); MultiSelect(editor);
editor.selectMoreLines(1) editor.selectMoreLines(1)
assert.equal( assert.equal(
editor.selection.getAllRanges()+"", editor.selection.getAllRanges()+"",
"Range: [0/0] -> [0/0],Range: [1/0] -> [1/0]" "Range: [0/0] -> [0/0],Range: [1/0] -> [1/0]"
); );
assert.ok(editor.inMultiSelectMode); assert.ok(editor.inMultiSelectMode);
var doc2 = new EditSession(["w1"]); var doc2 = new EditSession(["w1"]);
editor.setSession(doc2); editor.setSession(doc2);
assert.ok(!editor.inMultiSelectMode); assert.ok(!editor.inMultiSelectMode);
editor.setSession(doc); editor.setSession(doc);
assert.ok(editor.inMultiSelectMode); assert.ok(editor.inMultiSelectMode);
} }
}; };