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

rename edit session to buffer

Browse source
This commit is contained in:
Fabian Jakobs 2011-07-27 11:15:11 +02:00
commit 89eeb3bd1a
23 changed files with 194 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build_support/boot_textarea.js
View file

@ -47,7 +47,7 @@ var Event = require("pilot/event");
var UA = require("pilot/useragent")
var Editor = require("ace/editor").Editor;
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var UndoManager = require("ace/undomanager").UndoManager;
var Renderer = require("ace/virtual_renderer").VirtualRenderer;
@ -56,7 +56,7 @@ window.__ace_shadowed__.edit = function(el) {
el = document.getElementById(el);
}
var doc = new EditSession(Dom.getInnerText(el));
var doc = new Buffer(Dom.getInnerText(el));
doc.setUndoManager(new UndoManager());
el.innerHTML = '';

42
demo/demo.js
View file

@ -48,7 +48,7 @@ define(function(require, exports, module) {
var Editor = require("ace/editor").Editor;
var Renderer = require("ace/virtual_renderer").VirtualRenderer;
var theme = require("ace/theme/textmate");
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var JavaScriptMode = require("ace/mode/javascript").Mode;
var CssMode = require("ace/mode/css").Mode;
@ -100,86 +100,86 @@ define(function(require, exports, module) {
for (var i = 0; i < 5; i++) {
loreIpsum += loreIpsum;
}
docs.plain = new EditSession(loreIpsum);
docs.plain = new Buffer(loreIpsum);
docs.plain.setUseWrapMode(true);
docs.plain.setWrapLimitRange(80, 80)
docs.plain.setMode(new TextMode());
docs.plain.setUndoManager(new UndoManager());
docs.js = new EditSession(require("text!demo/docs/javascript.js"));
docs.js = new Buffer(require("text!demo/docs/javascript.js"));
docs.js.setMode(new JavaScriptMode());
docs.js.setUndoManager(new UndoManager());
docs.css = new EditSession(require("text!demo/docs/css.css"));
docs.css = new Buffer(require("text!demo/docs/css.css"));
docs.css.setMode(new CssMode());
docs.css.setUndoManager(new UndoManager());
docs.scss = new EditSession(require("text!demo/docs/scss.scss"));
docs.scss = new Buffer(require("text!demo/docs/scss.scss"));
docs.scss.setMode(new ScssMode());
docs.scss.setUndoManager(new UndoManager());
docs.html = new EditSession(require("text!demo/docs/html.html"));
docs.html = new Buffer(require("text!demo/docs/html.html"));
docs.html.setMode(new HtmlMode());
docs.html.setUndoManager(new UndoManager());
docs.python = new EditSession(require("text!demo/docs/python.py"));
docs.python = new Buffer(require("text!demo/docs/python.py"));
docs.python.setMode(new PythonMode());
docs.python.setUndoManager(new UndoManager());
docs.php = new EditSession(require("text!demo/docs/php.php"));
docs.php = new Buffer(require("text!demo/docs/php.php"));
docs.php.setMode(new PhpMode());
docs.php.setUndoManager(new UndoManager());
docs.java = new EditSession(require("text!demo/docs/java.java"));
docs.java = new Buffer(require("text!demo/docs/java.java"));
docs.java.setMode(new JavaMode());
docs.java.setUndoManager(new UndoManager());
docs.java.addFold("...", new Range(8, 44, 13, 4));
docs.ruby = new EditSession(require("text!demo/docs/ruby.rb"));
docs.ruby = new Buffer(require("text!demo/docs/ruby.rb"));
docs.ruby.setMode(new RubyMode());
docs.ruby.setUndoManager(new UndoManager());
docs.csharp = new EditSession(require("text!demo/docs/csharp.cs"));
docs.csharp = new Buffer(require("text!demo/docs/csharp.cs"));
docs.csharp.setMode(new CSharpMode());
docs.csharp.setUndoManager(new UndoManager());
docs.c_cpp = new EditSession(require("text!demo/docs/cpp.cpp"));
docs.c_cpp = new Buffer(require("text!demo/docs/cpp.cpp"));
docs.c_cpp.setMode(new CCPPMode());
docs.c_cpp.setUndoManager(new UndoManager());
docs.coffee = new EditSession(require("text!demo/docs/coffeescript.coffee"));
docs.coffee = new Buffer(require("text!demo/docs/coffeescript.coffee"));
docs.coffee.setMode(new CoffeeMode());
docs.coffee.setUndoManager(new UndoManager());
docs.json = new EditSession(require("text!demo/docs/json.json"));
docs.json = new Buffer(require("text!demo/docs/json.json"));
docs.json.setMode(new JsonMode());
docs.json.setUndoManager(new UndoManager());
docs.perl = new EditSession(require("text!demo/docs/perl.pl"));
docs.perl = new Buffer(require("text!demo/docs/perl.pl"));
docs.perl.setMode(new PerlMode());
docs.perl.setUndoManager(new UndoManager());
docs.clojure = new EditSession(require("text!demo/docs/clojure.clj"));
docs.clojure = new Buffer(require("text!demo/docs/clojure.clj"));
docs.clojure.setMode(new ClojureMode());
docs.clojure.setUndoManager(new UndoManager());
docs.ocaml = new EditSession(require("text!demo/docs/ocaml.ml"));
docs.ocaml = new Buffer(require("text!demo/docs/ocaml.ml"));
docs.ocaml.setMode(new OcamlMode());
docs.ocaml.setUndoManager(new UndoManager());
docs.svg = new EditSession(require("text!demo/docs/svg.svg"));
docs.svg = new Buffer(require("text!demo/docs/svg.svg"));
docs.svg.setMode(new SvgMode());
docs.svg.setUndoManager(new UndoManager());
docs.textile = new EditSession(require("text!demo/docs/textile.textile"));
docs.textile = new Buffer(require("text!demo/docs/textile.textile"));
docs.textile.setMode(new TextileMode());
docs.textile.setUndoManager(new UndoManager());
docs.groovy = new EditSession(require("text!demo/docs/groovy.groovy"));
docs.groovy = new Buffer(require("text!demo/docs/groovy.groovy"));
docs.groovy.setMode(new GroovyMode());
docs.groovy.setUndoManager(new UndoManager());
docs.scala = new EditSession(require("text!demo/docs/scala.scala"));
docs.scala = new Buffer(require("text!demo/docs/scala.scala"));
docs.scala.setMode(new ScalaMode());
docs.scala.setUndoManager(new UndoManager());

4
lib/ace/ace.js
View file

@ -44,7 +44,7 @@ define(function(require, exports, module) {
var Event = require("pilot/event");
var Editor = require("ace/editor").Editor;
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var UndoManager = require("ace/undomanager").UndoManager;
var Renderer = require("ace/virtual_renderer").VirtualRenderer;
@ -53,7 +53,7 @@ define(function(require, exports, module) {
el = document.getElementById(el);
}
var doc = new EditSession(Dom.getInnerText(el));
var doc = new Buffer(Dom.getInnerText(el));
doc.setUndoManager(new UndoManager());
el.innerHTML = '';

6
lib/ace/editor.js
View file

@ -50,14 +50,14 @@ var TextInput = require("ace/keyboard/textinput").TextInput;
var MouseHandler = require("ace/mouse_handler").MouseHandler;
//var TouchHandler = require("ace/touch_handler").TouchHandler;
var KeyBinding = require("ace/keyboard/keybinding").KeyBinding;
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var Search = require("ace/search").Search;
var Range = require("ace/range").Range;
var EventEmitter = require("pilot/event_emitter").EventEmitter;
var CommandManager = require("ace/commands/command_manager").CommandManager;
var defaultCommands = require("ace/commands/default_commands").commands;
var Editor = function(renderer, session) {
var Editor = function(renderer, buffer) {
var container = renderer.getContainerElement();
this.container = container;
this.renderer = renderer;
@ -78,7 +78,7 @@ var Editor = function(renderer, session) {
});
this.commands = new CommandManager(defaultCommands);
this.setSession(session || new EditSession(""));
this.setSession(buffer || new Buffer(""));
};
(function(){

8
lib/ace/editor_change_document_test.js
View file

@ -42,7 +42,7 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) {
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var Editor = require("ace/editor").Editor;
var Text = require("ace/mode/text").Mode;
var JavaScriptMode = require("ace/mode/javascript").Mode;
@ -52,10 +52,8 @@ var assert = require("ace/test/assertions");
module.exports = {
setUp : function(next) {
this.session1 = new EditSession(["abc", "def"]);
this.session2 = new EditSession(["ghi", "jkl"]);
this.session1 = new Buffer(["abc", "def"]);
this.session2 = new Buffer(["ghi", "jkl"]);
this.editor = new Editor(new MockRenderer());
next();
},

4
lib/ace/editor_highlight_selected_word_test.js
View file

@ -43,7 +43,7 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) {
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var Editor = require("ace/editor").Editor;
var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
var TextMode = require("ace/mode/text").Mode;
@ -72,7 +72,7 @@ var lipsum = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. " +
module.exports = {
setUp: function(next) {
this.session = new EditSession(lipsum);
this.session = new Buffer(lipsum);
this.editor = new Editor(new MockRenderer(), this.session);
this.selection = this.session.getSelection();
this.search = this.editor.$search;

20
lib/ace/editor_navigation_test.js
View file

@ -42,20 +42,20 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) {
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var Editor = require("ace/editor").Editor;
var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
var assert = require("ace/test/assertions");
module.exports = {
createEditSession : function(rows, cols) {
createBuffer : function(rows, cols) {
var line = new Array(cols + 1).join("a");
var text = new Array(rows).join(line + "\n") + line;
return new EditSession(text);
return new Buffer(text);
},
"test: navigate to end of file should scroll the last line into view" : function() {
var doc = this.createEditSession(200, 10);
var doc = this.createBuffer(200, 10);
var editor = new Editor(new MockRenderer(), doc);
editor.navigateFileEnd();
@ -66,7 +66,7 @@ module.exports = {
},
"test: navigate to start of file should scroll the first row into view" : function() {
var doc = this.createEditSession(200, 10);
var doc = this.createBuffer(200, 10);
var editor = new Editor(new MockRenderer(), doc);
editor.moveCursorTo(editor.getLastVisibleRow() + 20);
@ -76,7 +76,7 @@ module.exports = {
},
"test: goto hidden line should scroll the line into the middle of the viewport" : function() {
var editor = new Editor(new MockRenderer(), this.createEditSession(200, 5));
var editor = new Editor(new MockRenderer(), this.createBuffer(200, 5));
editor.navigateTo(0, 0);
editor.gotoLine(101);
@ -110,7 +110,7 @@ module.exports = {
},
"test: goto visible line should only move the cursor and not scroll": function() {
var editor = new Editor(new MockRenderer(), this.createEditSession(200, 5));
var editor = new Editor(new MockRenderer(), this.createBuffer(200, 5));
editor.navigateTo(0, 0);
editor.gotoLine(12);
@ -124,7 +124,7 @@ module.exports = {
},
"test: navigate from the end of a long line down to a short line and back should maintain the curser column": function() {
var editor = new Editor(new MockRenderer(), new EditSession(["123456", "1"]));
var editor = new Editor(new MockRenderer(), new Buffer(["123456", "1"]));
editor.navigateTo(0, 6);
assert.position(editor.getCursorPosition(), 0, 6);
@ -137,7 +137,7 @@ module.exports = {
},
"test: reset desired column on navigate left or right": function() {
var editor = new Editor(new MockRenderer(), new EditSession(["123456", "12"]));
var editor = new Editor(new MockRenderer(), new Buffer(["123456", "12"]));
editor.navigateTo(0, 6);
assert.position(editor.getCursorPosition(), 0, 6);
@ -153,7 +153,7 @@ module.exports = {
},
"test: typing text should update the desired column": function() {
var editor = new Editor(new MockRenderer(), new EditSession(["1234", "1234567890"]));
var editor = new Editor(new MockRenderer(), new Buffer(["1234", "1234567890"]));
editor.navigateTo(0, 3);
editor.insert("juhu");

66
lib/ace/editor_text_edit_test.js
View file

@ -42,7 +42,7 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) {
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var Editor = require("ace/editor").Editor;
var JavaScriptMode = require("ace/mode/javascript").Mode;
var UndoManager = require("ace/undomanager").UndoManager;
@ -51,7 +51,7 @@ var assert = require("ace/test/assertions");
module.exports = {
"test: delete line from the middle" : function() {
var session = new EditSession(["a", "b", "c", "d"].join("\n"));
var session = new Buffer(["a", "b", "c", "d"].join("\n"));
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 1);
@ -77,7 +77,7 @@ module.exports = {
},
"test: delete multiple selected lines" : function() {
var session = new EditSession(["a", "b", "c", "d"].join("\n"));
var session = new Buffer(["a", "b", "c", "d"].join("\n"));
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 1);
@ -89,7 +89,7 @@ module.exports = {
},
"test: delete first line" : function() {
var session = new EditSession(["a", "b", "c"].join("\n"));
var session = new Buffer(["a", "b", "c"].join("\n"));
var editor = new Editor(new MockRenderer(), session);
editor.removeLines();
@ -99,7 +99,7 @@ module.exports = {
},
"test: delete last should also delete the new line of the previous line" : function() {
var session = new EditSession(["a", "b", "c", ""].join("\n"));
var session = new Buffer(["a", "b", "c", ""].join("\n"));
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(3, 0);
@ -114,7 +114,7 @@ module.exports = {
},
"test: indent block" : function() {
var session = new EditSession(["a12345", "b12345", "c12345"].join("\n"));
var session = new Buffer(["a12345", "b12345", "c12345"].join("\n"));
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 3);
@ -132,7 +132,7 @@ module.exports = {
},
"test: indent selected lines" : function() {
var session = new EditSession(["a12345", "b12345", "c12345"].join("\n"));
var session = new Buffer(["a12345", "b12345", "c12345"].join("\n"));
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 0);
@ -143,7 +143,7 @@ module.exports = {
},
"test: no auto indent if cursor is before the {" : function() {
var session = new EditSession("{", new JavaScriptMode());
var session = new Buffer("{", new JavaScriptMode());
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(0, 0);
@ -152,7 +152,7 @@ module.exports = {
},
"test: outdent block" : function() {
var session = new EditSession([" a12345", " b12345", " c12345"].join("\n"));
var session = new Buffer([" a12345", " b12345", " c12345"].join("\n"));
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(0, 5);
@ -177,7 +177,7 @@ module.exports = {
},
"test: outent without a selection should update cursor" : function() {
var session = new EditSession(" 12");
var session = new Buffer(" 12");
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(0, 3);
@ -188,7 +188,7 @@ module.exports = {
},
"test: comment lines should perserve selection" : function() {
var session = new EditSession([" abc", "cde"].join("\n"), new JavaScriptMode());
var session = new Buffer([" abc", "cde"].join("\n"), new JavaScriptMode());
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(0, 2);
@ -203,7 +203,7 @@ module.exports = {
},
"test: uncomment lines should perserve selection" : function() {
var session = new EditSession(["// abc", "//cde"].join("\n"), new JavaScriptMode());
var session = new Buffer(["// abc", "//cde"].join("\n"), new JavaScriptMode());
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(0, 1);
@ -218,7 +218,7 @@ module.exports = {
},
"test: toggle comment lines twice should return the original text" : function() {
var session = new EditSession([" abc", "cde", "fg"], new JavaScriptMode());
var session = new Buffer([" abc", "cde", "fg"], new JavaScriptMode());
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(0, 0);
@ -234,7 +234,7 @@ module.exports = {
"test: comment lines - if the selection end is at the line start it should stay there": function() {
//select down
var session = new EditSession(["abc", "cde"].join("\n"), new JavaScriptMode());
var session = new Buffer(["abc", "cde"].join("\n"), new JavaScriptMode());
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(0, 0);
@ -244,7 +244,7 @@ module.exports = {
assert.range(editor.getSelectionRange(), 0, 2, 1, 0);
// select up
var session = new EditSession(["abc", "cde"].join("\n"), new JavaScriptMode());
var session = new Buffer(["abc", "cde"].join("\n"), new JavaScriptMode());
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 0);
@ -255,7 +255,7 @@ module.exports = {
},
"test: move lines down should select moved lines" : function() {
var session = new EditSession(["11", "22", "33", "44"].join("\n"));
var session = new Buffer(["11", "22", "33", "44"].join("\n"));
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(0, 1);
@ -282,7 +282,7 @@ module.exports = {
},
"test: move lines up should select moved lines" : function() {
var session = new EditSession(["11", "22", "33", "44"].join("\n"));
var session = new Buffer(["11", "22", "33", "44"].join("\n"));
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(2, 1);
@ -303,7 +303,7 @@ module.exports = {
"test: move line without active selection should move cursor to start of the moved line" : function()
{
var session = new EditSession(["11", "22", "33", "44"].join("\n"));
var session = new Buffer(["11", "22", "33", "44"].join("\n"));
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 1);
@ -321,7 +321,7 @@ module.exports = {
},
"test: copy lines down should select lines and place cursor at the selection start" : function() {
var session = new EditSession(["11", "22", "33", "44"].join("\n"));
var session = new Buffer(["11", "22", "33", "44"].join("\n"));
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 1);
@ -336,7 +336,7 @@ module.exports = {
},
"test: copy lines up should select lines and place cursor at the selection start" : function() {
var session = new EditSession(["11", "22", "33", "44"].join("\n"));
var session = new Buffer(["11", "22", "33", "44"].join("\n"));
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 1);
@ -351,7 +351,7 @@ module.exports = {
},
"test: input a tab with soft tab should convert it to spaces" : function() {
var session = new EditSession("");
var session = new Buffer("");
var editor = new Editor(new MockRenderer(), session);
session.setTabSize(2);
@ -366,7 +366,7 @@ module.exports = {
},
"test: input tab without soft tabs should keep the tab character" : function() {
var session = new EditSession("");
var session = new Buffer("");
var editor = new Editor(new MockRenderer(), session);
session.setUseSoftTabs(false);
@ -376,7 +376,7 @@ module.exports = {
},
"test: undo/redo for delete line" : function() {
var session = new EditSession(["111", "222", "333"]);
var session = new Buffer(["111", "222", "333"]);
var undoManager = new UndoManager();
session.setUndoManager(undoManager);
@ -416,7 +416,7 @@ module.exports = {
},
"test: remove left should remove character left of the cursor" : function() {
var session = new EditSession(["123", "456"]);
var session = new Buffer(["123", "456"]);
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 1);
@ -425,7 +425,7 @@ module.exports = {
},
"test: remove left should remove line break if cursor is at line start" : function() {
var session = new EditSession(["123", "456"]);
var session = new Buffer(["123", "456"]);
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 0);
@ -434,7 +434,7 @@ module.exports = {
},
"test: remove left should remove tabsize spaces if cursor is on a tab stop and preceeded by spaces" : function() {
var session = new EditSession(["123", " 456"]);
var session = new Buffer(["123", " 456"]);
session.setUseSoftTabs(true);
session.setTabSize(4);
@ -445,7 +445,7 @@ module.exports = {
},
"test: transpose at line start should be a noop": function() {
var session = new EditSession(["123", "4567", "89"]);
var session = new Buffer(["123", "4567", "89"]);
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 0);
@ -455,7 +455,7 @@ module.exports = {
},
"test: transpose in line should swap the charaters before and after the cursor": function() {
var session = new EditSession(["123", "4567", "89"]);
var session = new Buffer(["123", "4567", "89"]);
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 2);
@ -465,7 +465,7 @@ module.exports = {
},
"test: transpose at line end should swap the last two characters": function() {
var session = new EditSession(["123", "4567", "89"]);
var session = new Buffer(["123", "4567", "89"]);
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 4);
@ -475,7 +475,7 @@ module.exports = {
},
"test: transpose with non empty selection should be a noop": function() {
var session = new EditSession(["123", "4567", "89"]);
var session = new Buffer(["123", "4567", "89"]);
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 1);
@ -486,7 +486,7 @@ module.exports = {
},
"test: transpose should move the cursor behind the last swapped character": function() {
var session = new EditSession(["123", "4567", "89"]);
var session = new Buffer(["123", "4567", "89"]);
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 2);
@ -495,7 +495,7 @@ module.exports = {
},
"test: remove to line end": function() {
var session = new EditSession(["123", "4567", "89"]);
var session = new Buffer(["123", "4567", "89"]);
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 2);
@ -504,7 +504,7 @@ module.exports = {
},
"test: remove to line end at line end should remove the new line": function() {
var session = new EditSession(["123", "4567", "89"]);
var session = new Buffer(["123", "4567", "89"]);
var editor = new Editor(new MockRenderer(), session);
editor.moveCursorTo(1, 4);

4
lib/ace/layer/text_test.js
View file

@ -43,14 +43,14 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) {
var assert = require("ace/test/assertions");
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var TextLayer = require("ace/layer/text").Text;
var JavaScriptMode = require("ace/mode/javascript").Mode;
module.exports = {
setUp: function(next) {
this.session = new EditSession("");
this.session = new Buffer("");
this.session.setMode(new JavaScriptMode());
this.textLayer = new TextLayer(document.createElement("div"));
this.textLayer.setSession(this.session);

4
lib/ace/mode/css_test.js
View file

@ -41,7 +41,7 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) {
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var CssMode = require("ace/mode/css").Mode;
var assert = require("ace/test/assertions");
@ -54,7 +54,7 @@ module.exports = {
},
"test: toggle comment lines should not do anything" : function() {
var session = new EditSession([" abc", "cde", "fg"].join("\n"));
var session = new Buffer([" abc", "cde", "fg"].join("\n"));
var comment = this.mode.toggleCommentLines("start", session, 0, 1);
assert.equal([" abc", "cde", "fg"].join("\n"), session.toString());

4
lib/ace/mode/html_test.js
View file

@ -41,7 +41,7 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) {
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var Range = require("ace/range").Range;
var HtmlMode = require("ace/mode/html").Mode;
var assert = require("ace/test/assertions");
@ -52,7 +52,7 @@ module.exports = {
},
"test: toggle comment lines should not do anything" : function() {
var session = new EditSession([" abc", "cde", "fg"]);
var session = new Buffer([" abc", "cde", "fg"]);
var range = new Range(0, 3, 1, 1);
var comment = this.mode.toggleCommentLines("start", session, 0, 1);

16
lib/ace/mode/javascript_test.js
View file

@ -41,7 +41,7 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) {
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var Tokenizer = require("ace/tokenizer").Tokenizer;
var JavaScriptMode = require("ace/mode/javascript").Mode;
var assert = require("ace/test/assertions");
@ -61,21 +61,21 @@ module.exports = {
},
"test: toggle comment lines should prepend '//' to each line" : function() {
var session = new EditSession([" abc", "cde", "fg"]);
var session = new Buffer([" abc", "cde", "fg"]);
var comment = this.mode.toggleCommentLines("start", session, 0, 1);
assert.equal(["// abc", "//cde", "fg"].join("\n"), session.toString());
},
"test: toggle comment on commented lines should remove leading '//' chars" : function() {
var session = new EditSession(["// abc", "//cde", "fg"]);
var session = new Buffer(["// abc", "//cde", "fg"]);
var comment = this.mode.toggleCommentLines("start", session, 0, 1);
assert.equal([" abc", "cde", "fg"].join("\n"), session.toString());
},
"test: toggle comment lines twice should return the original text" : function() {
var session = new EditSession([" abc", "cde", "fg"]);
var session = new Buffer([" abc", "cde", "fg"]);
this.mode.toggleCommentLines("start", session, 0, 2);
this.mode.toggleCommentLines("start", session, 0, 2);
@ -83,14 +83,14 @@ module.exports = {
},
"test: toggle comment on multiple lines with one commented line prepend '//' to each line" : function() {
var session = new EditSession(["// abc", "//cde", "fg"]);
var session = new Buffer(["// abc", "//cde", "fg"]);
var comment = this.mode.toggleCommentLines("start", session, 0, 2);
assert.equal(["//// abc", "////cde", "//fg"].join("\n"), session.toString());
},
"test: toggle comment on a comment line with leading white space": function() {
var session = new EditSession(["//cde", " //fg"]);
var session = new Buffer(["//cde", " //fg"]);
var comment = this.mode.toggleCommentLines("start", session, 0, 1);
assert.equal(["cde", " fg"].join("\n"), session.toString());
@ -140,13 +140,13 @@ module.exports = {
},
"test: auto outdent should indent the line with the same indent as the line with the matching opening brace" : function() {
var session = new EditSession([" function foo() {", " bla", " }"]);
var session = new Buffer([" function foo() {", " bla", " }"]);
this.mode.autoOutdent("start", session, 2);
assert.equal(" }", session.getLine(2));
},
"test: no auto outdent if no matching brace is found" : function() {
var session = new EditSession([" function foo()", " bla", " }"]);
var session = new Buffer([" function foo()", " bla", " }"]);
this.mode.autoOutdent("start", session, 2);
assert.equal(" }", session.getLine(2));
}

4
lib/ace/mode/text_test.js
View file

@ -41,7 +41,7 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) {
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var TextMode = require("ace/mode/text").Mode;
var assert = require("ace/test/assertions");
@ -51,7 +51,7 @@ module.exports = {
},
"test: toggle comment lines should not do anything" : function() {
var session = new EditSession([" abc", "cde", "fg"]);
var session = new Buffer([" abc", "cde", "fg"]);
var comment = this.mode.toggleCommentLines("start", session, 0, 1);
assert.equal([" abc", "cde", "fg"].join("\n"), session.toString());

4
lib/ace/mode/xml_test.js
View file

@ -41,7 +41,7 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) {
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var Tokenizer = require("ace/tokenizer").Tokenizer;
var XmlMode = require("ace/mode/xml").Mode;
var assert = require("ace/test/assertions");
@ -61,7 +61,7 @@ module.exports = {
},
"test: toggle comment lines should not do anything" : function() {
var session = new EditSession([" abc", "cde", "fg"]);
var session = new Buffer([" abc", "cde", "fg"]);
var comment = this.mode.toggleCommentLines("start", session, 0, 1);
assert.equal([" abc", "cde", "fg"].join("\n"), session.toString());

8
lib/ace/edit_session.js → lib/ace/model/buffer.js
View file

@ -49,7 +49,7 @@ var Range = require("ace/range").Range;
var Document = require("ace/document").Document;
var BackgroundTokenizer = require("ace/background_tokenizer").BackgroundTokenizer;
var EditSession = function(text, mode) {
var Buffer = function(text, mode) {
this.$modified = true;
this.$breakpoints = [];
this.$frontMarkers = {};
@ -1704,9 +1704,9 @@ var EditSession = function(text, mode) {
c >= 0xFFE0 && c <= 0xFFE6;
};
}).call(EditSession.prototype);
}).call(Buffer.prototype);
require("ace/edit_session/folding").Folding.call(EditSession.prototype);
require("ace/edit_session/folding").Folding.call(Buffer.prototype);
exports.EditSession = EditSession;
exports.Buffer = Buffer;
});

60
lib/ace/edit_session_test.js → lib/ace/model/buffer_test.js
View file

@ -37,14 +37,14 @@
* ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") {
require("../../support/paths");
require("../../../support/paths");
require("ace/test/mockdom");
}
define(function(require, exports, module) {
var lang = require("pilot/lang");
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var Editor = require("ace/editor").Editor;
var UndoManager = require("ace/undomanager").UndoManager;
var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
@ -59,7 +59,7 @@ function createFoldTestSession() {
" } // Real Tab.",
"}"
];
var session = new EditSession(lines.join("\n"));
var session = new Buffer(lines.join("\n"));
session.setUndoManager(new UndoManager());
session.addFold("args...", new Range(0, 13, 0, 18));
session.addFold("foo...", new Range(1, 10, 2, 10));
@ -70,7 +70,7 @@ function createFoldTestSession() {
module.exports = {
"test: find matching opening bracket" : function() {
var session = new EditSession(["(()(", "())))"]);
var session = new Buffer(["(()(", "())))"]);
assert.position(session.findMatchingBracket({row: 0, column: 3}), 0, 1);
assert.position(session.findMatchingBracket({row: 1, column: 2}), 1, 0);
@ -80,7 +80,7 @@ module.exports = {
},
"test: find matching closing bracket" : function() {
var session = new EditSession(["(()(", "())))"]);
var session = new Buffer(["(()(", "())))"]);
assert.position(session.findMatchingBracket({row: 1, column: 1}), 1, 1);
assert.position(session.findMatchingBracket({row: 1, column: 1}), 1, 1);
@ -91,7 +91,7 @@ module.exports = {
},
"test: match different bracket types" : function() {
var session = new EditSession(["({[", ")]}"]);
var session = new Buffer(["({[", ")]}"]);
assert.position(session.findMatchingBracket({row: 0, column: 1}), 1, 0);
assert.position(session.findMatchingBracket({row: 0, column: 2}), 1, 2);
@ -103,7 +103,7 @@ module.exports = {
},
"test: move lines down" : function() {
var session = new EditSession(["a1", "a2", "a3", "a4"]);
var session = new Buffer(["a1", "a2", "a3", "a4"]);
session.moveLinesDown(0, 1);
assert.equal(session.getValue(), ["a3", "a1", "a2", "a4"].join("\n"));
@ -119,7 +119,7 @@ module.exports = {
},
"test: move lines up" : function() {
var session = new EditSession(["a1", "a2", "a3", "a4"]);
var session = new Buffer(["a1", "a2", "a3", "a4"]);
session.moveLinesUp(2, 3);
assert.equal(session.getValue(), ["a1", "a3", "a4", "a2"].join("\n"));
@ -135,28 +135,28 @@ module.exports = {
},
"test: duplicate lines" : function() {
var session = new EditSession(["1", "2", "3", "4"]);
var session = new Buffer(["1", "2", "3", "4"]);
session.duplicateLines(1, 2);
assert.equal(session.getValue(), ["1", "2", "3", "2", "3", "4"].join("\n"));
},
"test: duplicate last line" : function() {
var session = new EditSession(["1", "2", "3"]);
var session = new Buffer(["1", "2", "3"]);
session.duplicateLines(2, 2);
assert.equal(session.getValue(), ["1", "2", "3", "3"].join("\n"));
},
"test: duplicate first line" : function() {
var session = new EditSession(["1", "2", "3"]);
var session = new Buffer(["1", "2", "3"]);
session.duplicateLines(0, 0);
assert.equal(session.getValue(), ["1", "1", "2", "3"].join("\n"));
},
"test: getScreenLastRowColumn": function() {
var session = new EditSession([
var session = new Buffer([
"juhu",
"12\t\t34",
"ぁぁa"
@ -168,7 +168,7 @@ module.exports = {
},
"test: convert document to screen coordinates" : function() {
var session = new EditSession("01234\t567890\t1234");
var session = new Buffer("01234\t567890\t1234");
session.setTabSize(4);
assert.equal(session.documentToScreenColumn(0, 0), 0);
@ -190,7 +190,7 @@ module.exports = {
},
"test: convert document to screen coordinates with leading tabs": function() {
var session = new EditSession("\t\t123");
var session = new Buffer("\t\t123");
session.setTabSize(4);
assert.equal(session.documentToScreenColumn(0, 0), 0);
@ -200,7 +200,7 @@ module.exports = {
},
"test: documentToScreen without soft wrap": function() {
var session = new EditSession([
var session = new Buffer([
"juhu",
"12\t\t34",
"ぁぁa"
@ -213,7 +213,7 @@ module.exports = {
},
"test: documentToScreen with soft wrap": function() {
var session = new EditSession(["foo bar foo bar"]);
var session = new Buffer(["foo bar foo bar"]);
session.setUseWrapMode(true);
session.setWrapLimitRange(12, 12);
session.adjustWrapLimit(80);
@ -224,7 +224,7 @@ module.exports = {
"test: documentToScreen with soft wrap and multibyte characters": function() {
session = new EditSession(["ぁぁa"]);
session = new Buffer(["ぁぁa"]);
session.setUseWrapMode(true);
session.setWrapLimitRange(2, 2);
session.adjustWrapLimit(80);
@ -242,7 +242,7 @@ module.exports = {
},
"test: convert screen to document coordinates" : function() {
var session = new EditSession("01234\t567890\t1234");
var session = new Buffer("01234\t567890\t1234");
session.setTabSize(4);
assert.equal(session.screenToDocumentColumn(0, 0), 0);
@ -267,7 +267,7 @@ module.exports = {
},
"test: screenToDocument with soft wrap": function() {
var session = new EditSession(["foo bar foo bar"]);
var session = new Buffer(["foo bar foo bar"]);
session.setUseWrapMode(true);
session.setWrapLimitRange(12, 12);
session.adjustWrapLimit(80);
@ -280,7 +280,7 @@ module.exports = {
},
"test: screenToDocument with soft wrap and multi byte characters": function() {
session = new EditSession(["ぁ a"]);
session = new Buffer(["ぁ a"]);
session.setUseWrapMode(true);
session.adjustWrapLimit(80);
@ -292,7 +292,7 @@ module.exports = {
},
"test: screenToDocument should clip position to the document boundaries": function() {
var session = new EditSession("foo bar\njuhu kinners");
var session = new Buffer("foo bar\njuhu kinners");
assert.position(session.screenToDocumentPosition(-1, 4), 0, 0);
assert.position(session.screenToDocumentPosition(0, -1), 0, 0);
@ -311,8 +311,8 @@ module.exports = {
wrapLimit = wrapLimit || 12;
tabSize = tabSize || 4;
line = lang.stringTrimRight(line);
var tokens = EditSession.prototype.$getDisplayTokens(line);
var splits = EditSession.prototype.$computeWrapSplits(tokens, wrapLimit, tabSize);
var tokens = Buffer.prototype.$getDisplayTokens(line);
var splits = Buffer.prototype.$computeWrapSplits(tokens, wrapLimit, tabSize);
// console.log("String:", line, "Result:", splits, "Expected:", assertEqual);
assert.ok(splits.length == assertEqual.length);
for (var i = 0; i < splits.length; i++) {
@ -349,7 +349,7 @@ module.exports = {
},
"test get longest line" : function() {
var session = new EditSession(["12"]);
var session = new Buffer(["12"]);
session.setTabSize(4);
assert.equal(session.getWidth(), 2);
assert.equal(session.getScreenWidth(), 2);
@ -371,7 +371,7 @@ module.exports = {
},
"test getDisplayString": function() {
var session = new EditSession(["12"]);
var session = new Buffer(["12"]);
session.setTabSize(4);
assert.equal(session.$getDisplayTokens("\t").length, 4);
@ -380,7 +380,7 @@ module.exports = {
},
"test issue 83": function() {
var session = new EditSession("");
var session = new Buffer("");
var editor = new Editor(new MockRenderer(), session);
var document = session.getDocument();
@ -392,7 +392,7 @@ module.exports = {
},
"test wrapMode init has to create wrapData array": function() {
var session = new EditSession("foo bar\nfoo bar");
var session = new Buffer("foo bar\nfoo bar");
var editor = new Editor(new MockRenderer(), session);
var document = session.getDocument();
@ -407,13 +407,13 @@ module.exports = {
},
"test first line blank with wrap": function() {
var session = new EditSession("\nfoo");
var session = new Buffer("\nfoo");
session.setUseWrapMode(true);
assert.equal(session.doc.getValue(), ["", "foo"].join("\n"));
},
"test first line blank with wrap 2" : function() {
var session = new EditSession("");
var session = new Buffer("");
session.setUseWrapMode(true);
session.setValue("\nfoo");
@ -764,7 +764,7 @@ module.exports = {
"foo bar foo bar"
];
var session = new EditSession(lines.join("\n"));
var session = new Buffer(lines.join("\n"));
session.setUseWrapMode(true);
session.$wrapLimit = 7;
session.$updateWrapData(0, 2);

4
lib/ace/range_test.js
View file

@ -42,7 +42,7 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) {
var Range = require("ace/range").Range;
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var assert = require("ace/test/assertions");
module.exports = {
@ -169,7 +169,7 @@ module.exports = {
},
"test: to screen range" : function() {
var session = new EditSession([
var session = new Buffer([
"juhu",
"12\t\t34",
"ぁぁa",

42
lib/ace/search_test.js
View file

@ -42,7 +42,7 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) {
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var Search = require("ace/search").Search;
var assert = require("ace/test/assertions");
@ -56,7 +56,7 @@ module.exports = {
},
"test: find simple text in document" : function() {
var session = new EditSession(["juhu kinners 123", "456"]);
var session = new Buffer(["juhu kinners 123", "456"]);
var search = new Search().set({
needle: "kinners"
});
@ -67,7 +67,7 @@ module.exports = {
},
"test: find simple text in next line" : function() {
var session = new EditSession(["abc", "juhu kinners 123", "456"]);
var session = new Buffer(["abc", "juhu kinners 123", "456"]);
var search = new Search().set({
needle: "kinners"
});
@ -78,7 +78,7 @@ module.exports = {
},
"test: find text starting at cursor position" : function() {
var session = new EditSession(["juhu kinners", "juhu kinners 123"]);
var session = new Buffer(["juhu kinners", "juhu kinners 123"]);
session.getSelection().moveCursorTo(0, 6);
var search = new Search().set({
needle: "kinners"
@ -90,7 +90,7 @@ module.exports = {
},
"test: wrap search is off by default" : function() {
var session = new EditSession(["abc", "juhu kinners 123", "456"]);
var session = new Buffer(["abc", "juhu kinners 123", "456"]);
session.getSelection().moveCursorTo(2, 1);
var search = new Search().set({
@ -101,7 +101,7 @@ module.exports = {
},
"test: wrap search should wrap at file end" : function() {
var session = new EditSession(["abc", "juhu kinners 123", "456"]);
var session = new Buffer(["abc", "juhu kinners 123", "456"]);
session.getSelection().moveCursorTo(2, 1);
var search = new Search().set({
@ -115,7 +115,7 @@ module.exports = {
},
"test: wrap search with no match should return 'null'": function() {
var session = new EditSession(["abc", "juhu kinners 123", "456"]);
var session = new Buffer(["abc", "juhu kinners 123", "456"]);
session.getSelection().moveCursorTo(2, 1);
var search = new Search().set({
@ -127,7 +127,7 @@ module.exports = {
},
"test: case sensitive is by default off": function() {
var session = new EditSession(["abc", "juhu kinners 123", "456"]);
var session = new Buffer(["abc", "juhu kinners 123", "456"]);
var search = new Search().set({
needle: "JUHU"
@ -137,7 +137,7 @@ module.exports = {
},
"test: case sensitive search": function() {
var session = new EditSession(["abc", "juhu kinners 123", "456"]);
var session = new Buffer(["abc", "juhu kinners 123", "456"]);
var search = new Search().set({
needle: "KINNERS",
@ -149,7 +149,7 @@ module.exports = {
},
"test: whole word search should not match inside of words": function() {
var session = new EditSession(["juhukinners", "juhu kinners 123", "456"]);
var session = new Buffer(["juhukinners", "juhu kinners 123", "456"]);
var search = new Search().set({
needle: "kinners",
@ -162,7 +162,7 @@ module.exports = {
},
"test: find backwards": function() {
var session = new EditSession(["juhu juhu juhu juhu"]);
var session = new Buffer(["juhu juhu juhu juhu"]);
session.getSelection().moveCursorTo(0, 10);
var search = new Search().set({
needle: "juhu",
@ -175,7 +175,7 @@ module.exports = {
},
"test: find in selection": function() {
var session = new EditSession(["juhu", "juhu", "juhu", "juhu"]);
var session = new Buffer(["juhu", "juhu", "juhu", "juhu"]);
session.getSelection().setSelectionAnchor(1, 0);
session.getSelection().selectTo(3, 5);
@ -198,7 +198,7 @@ module.exports = {
},
"test: find backwards in selection": function() {
var session = new EditSession(["juhu", "juhu", "juhu", "juhu"]);
var session = new Buffer(["juhu", "juhu", "juhu", "juhu"]);
var search = new Search().set({
needle: "juhu",
@ -221,7 +221,7 @@ module.exports = {
},
"test: edge case - match directly before the cursor" : function() {
var session = new EditSession(["123", "123", "juhu"]);
var session = new Buffer(["123", "123", "juhu"]);
var search = new Search().set({
needle: "juhu",
@ -236,7 +236,7 @@ module.exports = {
},
"test: edge case - match backwards directly after the cursor" : function() {
var session = new EditSession(["123", "123", "juhu"]);
var session = new Buffer(["123", "123", "juhu"]);
var search = new Search().set({
needle: "juhu",
@ -252,7 +252,7 @@ module.exports = {
},
"test: find using a regular expression" : function() {
var session = new EditSession(["abc123 123 cd", "abc"]);
var session = new Buffer(["abc123 123 cd", "abc"]);
var search = new Search().set({
needle: "\\d+",
@ -265,7 +265,7 @@ module.exports = {
},
"test: find using a regular expression and whole word" : function() {
var session = new EditSession(["abc123 123 cd", "abc"]);
var session = new Buffer(["abc123 123 cd", "abc"]);
var search = new Search().set({
needle: "\\d+\\b",
@ -279,7 +279,7 @@ module.exports = {
},
"test: use regular expressions with capture groups": function() {
var session = new EditSession([" ab: 12px", " <h1 abc"]);
var session = new Buffer([" ab: 12px", " <h1 abc"]);
var search = new Search().set({
needle: "(\\d+)",
@ -292,7 +292,7 @@ module.exports = {
},
"test: find all matches in selection" : function() {
var session = new EditSession(["juhu", "juhu", "juhu", "juhu"]);
var session = new Buffer(["juhu", "juhu", "juhu", "juhu"]);
var search = new Search().set({
needle: "uh",
@ -349,7 +349,7 @@ module.exports = {
},
"test: find all matches in a line" : function() {
var session = new EditSession("foo bar foo baz foobar foo");
var session = new Buffer("foo bar foo baz foobar foo");
var search = new Search().set({
needle: "foo",
@ -371,7 +371,7 @@ module.exports = {
},
"test: find all matches in a line backwards" : function() {
var session = new EditSession("foo bar foo baz foobar foo");
var session = new Buffer("foo bar foo baz foobar foo");
var search = new Search().set({
needle: "foo",

50
lib/ace/selection_test.js
View file

@ -41,14 +41,14 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) {
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var assert = require("ace/test/assertions");
module.exports = {
createSession : function(rows, cols) {
var line = new Array(cols + 1).join("a");
var text = new Array(rows).join(line + "\n") + line;
return new EditSession(text);
return new Buffer(text);
},
"test: move cursor to end of file should place the cursor on last row and column" : function() {
@ -94,7 +94,7 @@ module.exports = {
},
"test: move cursor word right" : function() {
var session = new EditSession( ["ab",
var session = new Buffer( ["ab",
" Juhu Kinners (abc, 12)", " cde"].join("\n"));
var selection = session.getSelection();
@ -134,7 +134,7 @@ module.exports = {
},
"test: select word right if cursor in word" : function() {
var session = new EditSession("Juhu Kinners");
var session = new Buffer("Juhu Kinners");
var selection = session.getSelection();
selection.moveCursorTo(0, 2);
@ -144,7 +144,7 @@ module.exports = {
},
"test: moveCursor word left" : function() {
var session = new EditSession([
var session = new Buffer([
"ab",
" Juhu Kinners (abc, 12)",
" cde"
@ -189,7 +189,7 @@ module.exports = {
},
"test: moveCursor word left" : function() {
var session = new EditSession(" Fuß Füße");
var session = new Buffer(" Fuß Füße");
var selection = session.getSelection();
selection.moveCursorTo(0, 9)
@ -201,7 +201,7 @@ module.exports = {
},
"test: select word left if cursor in word" : function() {
var session = new EditSession("Juhu Kinners");
var session = new Buffer("Juhu Kinners");
var selection = session.getSelection();
selection.moveCursorTo(0, 8);
@ -211,7 +211,7 @@ module.exports = {
},
"test: select word right and select" : function() {
var session = new EditSession("Juhu Kinners");
var session = new Buffer("Juhu Kinners");
var selection = session.getSelection();
selection.moveCursorTo(0, 0);
@ -224,7 +224,7 @@ module.exports = {
},
"test: select word left and select" : function() {
var session = new EditSession("Juhu Kinners");
var session = new Buffer("Juhu Kinners");
var selection = session.getSelection();
selection.moveCursorTo(0, 3);
@ -237,7 +237,7 @@ module.exports = {
},
"test: select word with cursor in word should select the word" : function() {
var session = new EditSession("Juhu Kinners 123");
var session = new Buffer("Juhu Kinners 123");
var selection = session.getSelection();
selection.moveCursorTo(0, 8);
@ -249,7 +249,7 @@ module.exports = {
},
"test: select word with cursor betwen white space and word should select the word" : function() {
var session = new EditSession("Juhu Kinners");
var session = new Buffer("Juhu Kinners");
var selection = session.getSelection();
selection.moveCursorTo(0, 4);
@ -268,7 +268,7 @@ module.exports = {
},
"test: select word with cursor in white space should select white space" : function() {
var session = new EditSession("Juhu Kinners");
var session = new Buffer("Juhu Kinners");
var selection = session.getSelection();
selection.moveCursorTo(0, 5);
@ -280,7 +280,7 @@ module.exports = {
},
"test: moving cursor should fire a 'changeCursor' event" : function() {
var session = new EditSession("Juhu Kinners");
var session = new Buffer("Juhu Kinners");
var selection = session.getSelection();
selection.moveCursorTo(0, 5);
@ -295,7 +295,7 @@ module.exports = {
},
"test: calling setCursor with the same position should not fire an event": function() {
var session = new EditSession("Juhu Kinners");
var session = new Buffer("Juhu Kinners");
var selection = session.getSelection();
selection.moveCursorTo(0, 5);
@ -310,7 +310,7 @@ module.exports = {
},
"test: moveWordLeft should move past || and [": function() {
var session = new EditSession("||foo[");
var session = new Buffer("||foo[");
var selection = session.getSelection();
// Move behind ||
@ -327,7 +327,7 @@ module.exports = {
},
"test: moveWordRight should move past || and [": function() {
var session = new EditSession("||foo[");
var session = new Buffer("||foo[");
var selection = session.getSelection();
selection.moveCursorTo(0, 6);
@ -346,7 +346,7 @@ module.exports = {
},
"test: move cursor to line start should move cursor to end of the indentation first": function() {
var session = new EditSession("12\n Juhu\n12");
var session = new Buffer("12\n Juhu\n12");
var selection = session.getSelection();
selection.moveCursorTo(1, 6);
@ -356,7 +356,7 @@ module.exports = {
},
"test: move cursor to line start when the cursor is at the end of the indentation should move cursor to column 0": function() {
var session = new EditSession("12\n Juhu\n12");
var session = new Buffer("12\n Juhu\n12");
var selection = session.getSelection();
selection.moveCursorTo(1, 4);
@ -366,7 +366,7 @@ module.exports = {
},
"test: move cursor to line start when the cursor is at column 0 should move cursor to the end of the indentation": function() {
var session = new EditSession("12\n Juhu\n12");
var session = new Buffer("12\n Juhu\n12");
var selection = session.getSelection();
selection.moveCursorTo(1, 0);
@ -377,7 +377,7 @@ module.exports = {
// Eclipse style
"test: move cursor to line start when the cursor is before the initial indentation should move cursor to the end of the indentation": function() {
var session = new EditSession("12\n Juhu\n12");
var session = new Buffer("12\n Juhu\n12");
var selection = session.getSelection();
selection.moveCursorTo(1, 2);
@ -387,7 +387,7 @@ module.exports = {
},
"test go line up when in the middle of the first line should go to document start": function() {
var session = new EditSession("juhu kinners");
var session = new Buffer("juhu kinners");
var selection = session.getSelection();
selection.moveCursorTo(0, 4);
@ -397,7 +397,7 @@ module.exports = {
},
"test: (wrap) go line up when in the middle of the first line should go to document start": function() {
var session = new EditSession("juhu kinners");
var session = new Buffer("juhu kinners");
session.setWrapLimitRange(5, 5);
session.adjustWrapLimit(80);
@ -411,7 +411,7 @@ module.exports = {
"test go line down when in the middle of the last line should go to document end": function() {
var session = new EditSession("juhu kinners");
var session = new Buffer("juhu kinners");
var selection = session.getSelection();
selection.moveCursorTo(0, 4);
@ -421,7 +421,7 @@ module.exports = {
},
"test (wrap) go line down when in the middle of the last line should go to document end": function() {
var session = new EditSession("juhu kinners");
var session = new Buffer("juhu kinners");
session.setWrapLimitRange(8, 8);
session.adjustWrapLimit(80);
@ -434,7 +434,7 @@ module.exports = {
},
"test go line up twice and then once down when in the second should go back to the previous column": function() {
var session = new EditSession("juhu\nkinners");
var session = new Buffer("juhu\nkinners");
var selection = session.getSelection();
selection.moveCursorTo(1, 4);

6
lib/ace/split.js
View file

@ -45,7 +45,7 @@ var EventEmitter = require("pilot/event_emitter").EventEmitter;
var Editor = require("ace/editor").Editor;
var Renderer = require("ace/virtual_renderer").VirtualRenderer;
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var Split = function(container, theme, splits) {
this.BELOW = 1;
@ -76,7 +76,7 @@ var Split = function(container, theme, splits) {
el.className = this.$editorCSS;
el.style.cssText = "position: absolute; top:0px; bottom:0px";
this.$container.appendChild(el);
var session = new EditSession("");
var session = new Buffer("");
var editor = new Editor(new Renderer(el, this.$theme));
editor.on("focus", function() {
@ -162,7 +162,7 @@ var Split = function(container, theme, splits) {
};
this.$cloneSession = function(session) {
var s = new EditSession(session.getDocument(), session.getMode());
var s = new Buffer(session.getDocument(), session.getMode());
var undoManager = session.getUndoManager();
if (undoManager) {

11
lib/ace/test/assertions.js
View file

@ -53,10 +53,19 @@ assert.notOk = function(value) {
assert.equal(value, false);
}
exports.jsonEquals = function(foundJson, expectedJson) {
assert.jsonEquals = function(foundJson, expectedJson) {
assert.equal(JSON.stringify(foundJson), JSON.stringify(expectedJson));
};
assert.eventFired = function(obj, eventName, trigger, self) {
var called;
obj.on(eventName, function() {
called = true;
});
trigger.call(self);
assert.ok(called);
}
module.exports = assert;
});

6
lib/ace/test/benchmark.js
View file

@ -42,7 +42,7 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) {
var assert = require("ace/test/assertions");
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
module.exports = {
setUp : function() {
@ -54,7 +54,7 @@ module.exports = {
},
"test: document to screen position": function() {
var s = new EditSession(Array(6000).join('someText\n'));
var s = new Buffer(Array(6000).join('someText\n'));
for (var i=0; i<6000; i++)
s.documentToScreenPosition(i, 0);
@ -66,7 +66,7 @@ module.exports = {
},
"test: screen to document position": function() {
var s = new EditSession(Array(6000).join('someText\n'));
var s = new Buffer(Array(6000).join('someText\n'));
for (var i=0; i<6000; i++)
s.screenToDocumentPosition(i, 0);

4
lib/ace/virtual_renderer_test.js
View file

@ -42,7 +42,7 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) {
var EditSession = require("ace/edit_session").EditSession;
var Buffer = require("ace/model/buffer").Buffer;
var VirtualRenderer = require("ace/virtual_renderer").VirtualRenderer;
var assert = require("ace/test/assertions");
@ -65,7 +65,7 @@ module.exports = {
var renderer = new VirtualRenderer(el);
renderer.setPadding(0);
renderer.setSession(new EditSession("1234"));
renderer.setSession(new Buffer("1234"));
renderer.characterWidth = 10;
renderer.lineHeight = 15;