autoindent tweaks

use camelcase and start line indent
This commit is contained in:
Adam Jimenez 2014-10-29 12:08:30 +00:00
commit 8e3da36bc7

View file

@ -165,7 +165,7 @@ var XmlBehaviour = function () {
} }
var tag = token.value; var tag = token.value;
var column = iterator.getCurrentTokenColumn()-1; var row = iterator.getCurrentTokenRow();
//don't indent after closing tag //don't indent after closing tag
token = iterator.stepBackward(); token = iterator.stepBackward();
@ -175,12 +175,13 @@ var XmlBehaviour = function () {
if (this.voidElements && !this.voidElements[tag]) { if (this.voidElements && !this.voidElements[tag]) {
var nextToken = session.getTokenAt(cursor.row, cursor.column+1); var nextToken = session.getTokenAt(cursor.row, cursor.column+1);
var next_indent = lang.stringRepeat(" ", column); var line = session.getLine(row);
var indent = next_indent + session.getTabString(); var nextIndent = this.$getIndent(line);
var indent = nextIndent + session.getTabString();
if (nextToken && nextToken.value === "</") { if (nextToken && nextToken.value === "</") {
return { return {
text: "\n" + indent + "\n" + next_indent, text: "\n" + indent + "\n" + nextIndent,
selection: [1, indent.length, 1, indent.length] selection: [1, indent.length, 1, indent.length]
}; };
} else { } else {