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

Merge pull request #1089 from ajaxorg/auoindent

Browse source 
Auoindent
This commit is contained in:
Mostafa Eweda 2012-11-10 11:13:09 -08:00
commit 0f25bfb0e5
3 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/ace/editor.js
View file

@ -666,7 +666,6 @@ var Editor = function(renderer, session) {
this.insert = function(text) {
var session = this.session;
var mode = session.getMode();
var cursor = this.getCursorPosition();
if (this.getBehavioursEnabled()) {
@ -693,9 +692,8 @@ var Editor = function(renderer, session) {
var start = cursor.column;
var lineState = session.getState(cursor.row);
var shouldOutdent = mode.checkOutdent(lineState, session.getLine(cursor.row), text);
var line = session.getLine(cursor.row);
var lineIndent = mode.getNextLineIndent(lineState, line.slice(0, cursor.column), session.getTabString());
var shouldOutdent = mode.checkOutdent(lineState, line, text);
var end = session.insert(cursor, text);
if (transform && transform.selection) {
@ -712,12 +710,12 @@ var Editor = function(renderer, session) {
}
}
var lineState = session.getState(cursor.row);
// TODO disabled multiline auto indent
// possibly doing the indent before inserting the text
// if (cursor.row !== end.row) {
if (session.getDocument().isNewLine(text)) {
var lineIndent = mode.getNextLineIndent(lineState, line.slice(0, cursor.column), session.getTabString());
this.moveCursorTo(cursor.row+1, 0);
var size = session.getTabSize();

11
lib/ace/mode/markdown.js
View file

@ -58,12 +58,13 @@ oop.inherits(Mode, TextMode);
(function() {
this.getNextLineIndent = function(state, line, tab) {
if (state == "listblock") {
var match = /^((?:.+)?)(([-+*]|\d+\.)\s+)/.exec(line);
if (match) {
return new Array(match[1].length + 1).join(" ") + match[2];
} else {
var match = /^(\s*)(?:([-+*])|(\d+)\.)(\s+)/.exec(line);
if (!match)
return "";
}
var marker = match[2];
if (!marker)
marker = parseInt(match[3], 10) + 1 + ".";
return match[1] + marker + match[4];
} else {
return this.$getIndent(line);
}

15
lib/ace/mode/php.js
View file

@ -98,16 +98,29 @@ oop.inherits(Mode, TextMode);
var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
var tokens = tokenizedLine.tokens;
var endState = tokenizedLine.state;
if (tokens.length && tokens[tokens.length-1].type == "comment") {
return indent;
}
if (state == "start") {
if (state == "php-start") {
var match = line.match(/^.*[\{\(\[\:]\s*$/);
if (match) {
indent += tab;
}
} else if (state == "php-doc-start") {
if (endState != "php-doc-start") {
return "";
}
var match = line.match(/^\s*(\/?)\*/);
if (match) {
if (match[1]) {
indent += " ";
}
indent += "* ";
}
}
return indent;