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

Merge pull request #2198 from adamjimenez/patch-2

Browse source 
Autoindent doesn't always occur
This commit is contained in:
Harutyun Amirjanyan 2014-10-29 16:37:17 +04:00
commit 20cd631f0a
1 changed files with 44 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

51
lib/ace/mode/behaviour/xml.js
View file

@ -34,6 +34,7 @@ define(function(require, exports, module) {
var oop = require("../../lib/oop"); var oop = require("../../lib/oop");
var Behaviour = require("../behaviour").Behaviour; var Behaviour = require("../behaviour").Behaviour;
var TokenIterator = require("../../token_iterator").TokenIterator; var TokenIterator = require("../../token_iterator").TokenIterator;
var lang = require("../../lib/lang");
function is(token, type) { function is(token, type) {
return token.type.lastIndexOf(type + ".xml") > -1; return token.type.lastIndexOf(type + ".xml") > -1;
@ -140,25 +141,55 @@ var XmlBehaviour = function () {
return; return;
return { return {
text: '>' + '</' + element + '>', text: ">" + "</" + element + ">",
selection: [1, 1] selection: [1, 1]
}; };
} }
}); });
this.add('autoindent', 'insertion', function (state, action, editor, session, text) { this.add("autoindent", "insertion", function (state, action, editor, session, text) {
if (text == "\n") { if (text == "\n") {
var cursor = editor.getCursorPosition(); var cursor = editor.getCursorPosition();
var line = session.getLine(cursor.row); var line = session.getLine(cursor.row);
var rightChars = line.substring(cursor.column, cursor.column + 2); var iterator = new TokenIterator(session, cursor.row, cursor.column);
if (rightChars == '</') { var token = iterator.getCurrentToken();
var next_indent = this.$getIndent(line);
var indent = next_indent + session.getTabString();
return { if (token && token.type.indexOf("tag-close") !== -1) {
text: '\n' + indent + '\n' + next_indent, //get tag name
selection: [1, indent.length, 1, indent.length] while (token && token.type.indexOf("tag-name") === -1) {
}; token = iterator.stepBackward();
}
if (!token) {
return;
}
var tag = token.value;
var row = iterator.getCurrentTokenRow();
//don't indent after closing tag
token = iterator.stepBackward();
if (!token || token.type.indexOf("end-tag") !== -1) {
return;
}
if (this.voidElements && !this.voidElements[tag]) {
var nextToken = session.getTokenAt(cursor.row, cursor.column+1);
var line = session.getLine(row);
var nextIndent = this.$getIndent(line);
var indent = nextIndent + session.getTabString();
if (nextToken && nextToken.value === "</") {
return {
text: "\n" + indent + "\n" + nextIndent,
selection: [1, indent.length, 1, indent.length]
};
} else {
return {
text: "\n" + indent
};
}
}
} }
} }
}); });