From 4cc5bf9a7b52425ba947f526fe664272ad2bd40e Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Fri, 11 Feb 2011 11:51:01 +0100 Subject: [PATCH] no need to track the cursor manually anymore --- lib/ace/edit_session.js | 6 ------ lib/ace/editor.js | 25 +++++-------------------- lib/ace/mode/c_cpp.js | 2 +- lib/ace/mode/coffee.js | 2 +- lib/ace/mode/css.js | 2 +- lib/ace/mode/html.js | 2 +- lib/ace/mode/javascript.js | 2 +- lib/ace/mode/matching_brace_outdent.js | 2 -- lib/ace/mode/php.js | 2 +- lib/ace/mode/python.js | 2 +- lib/ace/mode/ruby.js | 2 +- 11 files changed, 13 insertions(+), 36 deletions(-) diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js index 422722ba..39b30c6c 100644 --- a/lib/ace/edit_session.js +++ b/lib/ace/edit_session.js @@ -576,7 +576,6 @@ var EditSession = function(text, mode) { for (var row=startRow; row<=endRow; row++) { this.insert({row: row, column:0}, indentString); } - return indentString.length; }; this.outdentRows = function (range) { @@ -599,13 +598,8 @@ var EditSession = function(text, mode) { deleteRange.start.column = 0; deleteRange.end.column = j; } - if (i == range.start.row) - range.start.column -= deleteRange.end.column - deleteRange.start.column; - if (i == range.end.row) - range.end.column -= deleteRange.end.column - deleteRange.start.column; this.remove(deleteRange); } - return range; }; this.moveLinesUp = function(firstRow, lastRow) { diff --git a/lib/ace/editor.js b/lib/ace/editor.js index 1e72ac8b..afef33ee 100644 --- a/lib/ace/editor.js +++ b/lib/ace/editor.js @@ -397,14 +397,6 @@ var Editor =function(renderer, session) { var lineIndent = this.mode.getNextLineIndent(lineState, line.slice(0, cursor.column), this.session.getTabString()); var end = this.session.insert(cursor, text); - /* TODO: This shortcut is somehow broken - if (!shouldOutdent && line != this.session.getLine(row) && text != "\n") { - this.moveCursorToPosition(end); - this.renderer.scrollCursorIntoView(); - return; - } - */ - var lineState = this.bgTokenizer.getState(cursor.row); // multi line insert if (cursor.row !== end.row) { @@ -437,15 +429,12 @@ var Editor =function(renderer, session) { outdent -= 1; this.session.replace(new Range(row, 0, row, line.length), line.substr(i)); } - end.column += this.session.indentRows(cursor.row + 1, end.row, lineIndent); + this.session.indentRows(cursor.row + 1, end.row, lineIndent); } else { if (shouldOutdent) { - end.column += this.mode.autoOutdent(lineState, this.session, cursor.row); + this.mode.autoOutdent(lineState, this.session, cursor.row); } } - - this.moveCursorToPosition(end); - this.renderer.scrollCursorIntoView(); } this.onTextInput = function(text) { @@ -577,8 +566,7 @@ var Editor =function(renderer, session) { if (range.start.row < range.end.row || range.start.column < range.end.column) { var rows = this.$getSelectedRows(); - var count = session.indentRows(rows.first, rows.last, "\t"); - // TODO remove count from indent + session.indentRows(rows.first, rows.last, "\t"); } else { var indentString; @@ -600,9 +588,7 @@ var Editor =function(renderer, session) { return; var selection = this.session.getSelection(); - var range = this.session.outdentRows(selection.getRange()); - // TODO remove range from outdent - //selection.setSelectionRange(range, selection.isBackwards()); + this.session.outdentRows(selection.getRange()); }; this.toggleCommentLines = function() { @@ -611,8 +597,7 @@ var Editor =function(renderer, session) { var state = this.bgTokenizer.getState(this.getCursorPosition().row); var rows = this.$getSelectedRows() - var addedColumns = this.mode.toggleCommentLines(state, this.session, rows.first, rows.last); - // TODO remove addedColumns + this.mode.toggleCommentLines(state, this.session, rows.first, rows.last); }; this.removeLines = function() { diff --git a/lib/ace/mode/c_cpp.js b/lib/ace/mode/c_cpp.js index 7b8f44fa..08bd249e 100644 --- a/lib/ace/mode/c_cpp.js +++ b/lib/ace/mode/c_cpp.js @@ -119,7 +119,7 @@ oop.inherits(Mode, TextMode); }; this.autoOutdent = function(state, doc, row) { - return this.$outdent.autoOutdent(doc, row); + this.$outdent.autoOutdent(doc, row); }; }).call(Mode.prototype); diff --git a/lib/ace/mode/coffee.js b/lib/ace/mode/coffee.js index d3bf0ac5..27a9360a 100644 --- a/lib/ace/mode/coffee.js +++ b/lib/ace/mode/coffee.js @@ -91,7 +91,7 @@ proto.checkOutdent = function(state, line, input) { }; proto.autoOutdent = function(state, doc, row) { - return this.$outdent.autoOutdent(doc, row); + this.$outdent.autoOutdent(doc, row); }; exports.Mode = CoffeeMode; diff --git a/lib/ace/mode/css.js b/lib/ace/mode/css.js index bb12cbca..d8878bda 100644 --- a/lib/ace/mode/css.js +++ b/lib/ace/mode/css.js @@ -73,7 +73,7 @@ oop.inherits(Mode, TextMode); }; this.autoOutdent = function(state, doc, row) { - return this.$outdent.autoOutdent(doc, row); + this.$outdent.autoOutdent(doc, row); }; }).call(Mode.prototype); diff --git a/lib/ace/mode/html.js b/lib/ace/mode/html.js index ca3121ac..2dced037 100644 --- a/lib/ace/mode/html.js +++ b/lib/ace/mode/html.js @@ -74,7 +74,7 @@ oop.inherits(Mode, TextMode); }; this.autoOutdent = function(state, doc, row) { - return this.$delegate("autoOutdent", arguments); + this.$delegate("autoOutdent", arguments); }; this.$delegate = function(method, args, defaultHandler) { diff --git a/lib/ace/mode/javascript.js b/lib/ace/mode/javascript.js index 8df9d802..a7634bf6 100644 --- a/lib/ace/mode/javascript.js +++ b/lib/ace/mode/javascript.js @@ -119,7 +119,7 @@ oop.inherits(Mode, TextMode); }; this.autoOutdent = function(state, doc, row) { - return this.$outdent.autoOutdent(doc, row); + this.$outdent.autoOutdent(doc, row); }; this.createWorker = function(session) { diff --git a/lib/ace/mode/matching_brace_outdent.js b/lib/ace/mode/matching_brace_outdent.js index 05d20e5a..3ca68c04 100644 --- a/lib/ace/mode/matching_brace_outdent.js +++ b/lib/ace/mode/matching_brace_outdent.js @@ -63,8 +63,6 @@ var MatchingBraceOutdent = function() {}; var indent = this.$getIndent(doc.getLine(openBracePos.row)); doc.replace(new Range(row, 0, row, column-1), indent); - - return indent.length - (column-1); }; this.$getIndent = function(line) { diff --git a/lib/ace/mode/php.js b/lib/ace/mode/php.js index 58440d3f..13fdf30b 100644 --- a/lib/ace/mode/php.js +++ b/lib/ace/mode/php.js @@ -107,7 +107,7 @@ oop.inherits(Mode, TextMode); }; this.autoOutdent = function(state, doc, row) { - return this.$outdent.autoOutdent(doc, row); + this.$outdent.autoOutdent(doc, row); }; }).call(Mode.prototype); diff --git a/lib/ace/mode/python.js b/lib/ace/mode/python.js index a0d2a9de..2d8569e6 100644 --- a/lib/ace/mode/python.js +++ b/lib/ace/mode/python.js @@ -108,7 +108,7 @@ oop.inherits(Mode, TextMode); }; this.autoOutdent = function(state, doc, row) { - return this.$outdent.autoOutdent(doc, row); + this.$outdent.autoOutdent(doc, row); }; }).call(Mode.prototype); diff --git a/lib/ace/mode/ruby.js b/lib/ace/mode/ruby.js index 7e400c7e..532c8cec 100644 --- a/lib/ace/mode/ruby.js +++ b/lib/ace/mode/ruby.js @@ -108,7 +108,7 @@ oop.inherits(Mode, TextMode); }; this.autoOutdent = function(state, doc, row) { - return this.$outdent.autoOutdent(doc, row); + this.$outdent.autoOutdent(doc, row); }; }).call(Mode.prototype);