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

fix: pasting code, which starts with a doc comment

Browse source 
indents the whole code block
This commit is contained in:
Fabian Jakobs 2010-10-06 14:56:59 +02:00
commit 3ef6e5f003
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/ace/Editor.js
View file

@ -271,7 +271,7 @@ var Editor = function(renderer, doc) {
if (event.getButton(e) != 0) if (event.getButton(e) != 0)
return; return;
var pos = this.renderer.screenToTextCoordinates(pageX, pageY); var pos = this.renderer.screenToTextCoordinates(pageX, pageY);
pos.row = Math.max(0, Math.min(pos.row, this.doc.getLength()-1)); pos.row = Math.max(0, Math.min(pos.row, this.doc.getLength()-1));
@ -383,14 +383,20 @@ var Editor = function(renderer, doc) {
this.clearSelection(); this.clearSelection();
var _self = this; var _self = this;
var row = cursor.row;
this.bgTokenizer.getState(cursor.row-1, function(lineState) { this.bgTokenizer.getState(cursor.row-1, function(lineState) {
var shouldOutdent = _self.mode.checkOutdent(lineState, _self.doc.getLine(cursor.row), text); var shouldOutdent = _self.mode.checkOutdent(lineState, _self.doc.getLine(row), text);
var line = _self.doc.getLine(row);
var end = _self.doc.insert(cursor, text); var end = _self.doc.insert(cursor, text);
var row = cursor.row; if (line != _self.doc.getLine(row)) {
_self.moveCursorToPosition(end);
_self.renderer.scrollCursorIntoView();
return;
}
var line = _self.doc.getLine(row); var line = _self.doc.getLine(row);
_self.bgTokenizer.getState(row, function(lineState ) { _self.bgTokenizer.getState(row, function(lineState) {
// multi line insert // multi line insert
if (row !== end.row) { if (row !== end.row) {
var indent = _self.mode.getNextLineIndent(lineState, line, _self.doc.getTabString()); var indent = _self.mode.getNextLineIndent(lineState, line, _self.doc.getTabString());
@ -902,7 +908,7 @@ var Editor = function(renderer, doc) {
this.$search.set({backwards: backwards}); this.$search.set({backwards: backwards});
var range = this.$search.find(this.doc); var range = this.$search.find(this.doc);
if (range) { if (range) {
this.selection.setSelectionRange(range); this.selection.setSelectionRange(range);
this.$updateDesiredColumn(); this.$updateDesiredColumn();
this.gotoLine(range.end.row+1, range.end.column); this.gotoLine(range.end.row+1, range.end.column);