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

Style improvements

Browse source
This commit is contained in:
c-spencer 2011-05-22 02:53:30 +01:00
commit 138ec94f53
1 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
lib/ace/mode/behaviour/cstyle.js
View file

@ -60,7 +60,8 @@ var CstyleBehaviour = function () {
} }
} else if (text == '}') { // This should do some matching checks } else if (text == '}') { // This should do some matching checks
var cursor = editor.getCursorPosition(); var cursor = editor.getCursorPosition();
var rightChar = session.doc.getLine(cursor.row).substring(cursor.column, cursor.column+1); var line = session.doc.getLine(cursor.row);
var rightChar = line.substring(cursor.column, cursor.column + 1);
if (rightChar == '}') { if (rightChar == '}') {
return { return {
text: '', text: '',
@ -69,11 +70,12 @@ var CstyleBehaviour = function () {
} }
} else if (text == "\n") { } else if (text == "\n") {
var cursor = editor.getCursorPosition(); var cursor = editor.getCursorPosition();
var rightChar = session.doc.getLine(cursor.row).substring(cursor.column, cursor.column+1); var line = session.doc.getLine(cursor.row);
var rightChar = line.substring(cursor.column, cursor.column + 1);
if (rightChar == '}') { if (rightChar == '}') {
var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column}); var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column});
var indent = this.getNextLineIndent(state, session.doc.getLine(cursor.row).substring(0, session.doc.getLine(cursor.row).length-1), " "); var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row)); var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
return { return {
@ -86,9 +88,11 @@ var CstyleBehaviour = function () {
}, function (state, editor, session, range) { }, function (state, editor, session, range) {
var selected = session.doc.getTextRange(range); var selected = session.doc.getTextRange(range);
if (!range.isMultiLine() && selected == '{') { if (!range.isMultiLine() && selected == '{') {
var rightChar = session.doc.getLine(range.start.row).substring(range.start.column+1, range.start.column+2); var line = session.doc.getLine(range.start.row);
var rightChar = line.substring(range.end.column, range.end.column + 1);
if (rightChar == '}') { if (rightChar == '}') {
return new Range(range.start.row, range.start.column, range.start.row, range.end.column+1); return new Range(range.start.row, range.start.column,
range.start.row, range.end.column + 1);
} }
} }
return false; return false;
@ -111,7 +115,8 @@ var CstyleBehaviour = function () {
} }
} else if (text == ')') { // This should do some matching checks } else if (text == ')') { // This should do some matching checks
var cursor = editor.getCursorPosition(); var cursor = editor.getCursorPosition();
var rightChar = session.doc.getLine(cursor.row).substring(cursor.column, cursor.column+1); var line = session.doc.getLine(cursor.row);
var rightChar = line.substring(cursor.column, cursor.column + 1);
if (rightChar == ')') { if (rightChar == ')') {
return { return {
text: '', text: '',
@ -123,9 +128,11 @@ var CstyleBehaviour = function () {
}, function (state, editor, session, range) { }, function (state, editor, session, range) {
var selected = session.doc.getTextRange(range); var selected = session.doc.getTextRange(range);
if (!range.isMultiLine() && selected == '(') { if (!range.isMultiLine() && selected == '(') {
var rightChar = session.doc.getLine(range.start.row).substring(range.start.column+1, range.start.column+2); var line = session.doc.getLine(range.start.row);
var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
if (rightChar == ')') { if (rightChar == ')') {
return new Range(range.start.row, range.start.column, range.start.row, range.end.column+1); return new Range(range.start.row, range.start.column,
range.start.row, range.end.column + 1);
} }
} }
return false; return false;
@ -151,9 +158,11 @@ var CstyleBehaviour = function () {
}, function (state, editor, session, range) { }, function (state, editor, session, range) {
var selected = session.doc.getTextRange(range); var selected = session.doc.getTextRange(range);
if (!range.isMultiLine() && selected == '"') { if (!range.isMultiLine() && selected == '"') {
var rightChar = session.doc.getLine(range.start.row).substring(range.start.column+1, range.start.column+2); var line = session.doc.getLine(range.start.row);
var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
if (rightChar == '"') { if (rightChar == '"') {
return new Range(range.start.row, range.start.column, range.start.row, range.end.column+1); return new Range(range.start.row, range.start.column,
range.start.row, range.end.column + 1);
} }
} }
return false; return false;