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

change toggleCommentLines behavior to match sublime text

Browse source
This commit is contained in:
nightwing 2013-02-18 10:56:02 +04:00
commit 528a103149
1 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

52
lib/ace/mode/javascript.js
View file

@ -32,6 +32,7 @@ define(function(require, exports, module) {
"use strict"; "use strict";
var oop = require("../lib/oop"); var oop = require("../lib/oop");
var lang = require("ace/lib/lang");
var TextMode = require("./text").Mode; var TextMode = require("./text").Mode;
var Tokenizer = require("../tokenizer").Tokenizer; var Tokenizer = require("../tokenizer").Tokenizer;
var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules; var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
@ -51,32 +52,41 @@ oop.inherits(Mode, TextMode);
(function() { (function() {
this.lineCommentStart = "//";
this.toggleCommentLines = function(state, session, startRow, endRow) {
var doc = session.doc;
var str = this.lineCommentStart;
var regexpStart = new RegExp("^\\s*"+lang.escapeRegExp(str) + " ?");
this.toggleCommentLines = function(state, doc, startRow, endRow) { function isCommented(str) {
var outdent = true; return regexpStart.test(str);
var re = /^(\s*)\/\//;
for (var i=startRow; i<= endRow; i++) {
if (!re.test(doc.getLine(i))) {
outdent = false;
break;
}
} }
if (outdent) { var removeComment = true;
var deleteRange = new Range(0, 0, 0, 0); var minSpace = Infinity;
for (var i=startRow; i<= endRow; i++) var indentations = [];
{
for (var i = startRow; i <= endRow; i++) {
var line = doc.getLine(i);
var indent = line.search(/\S|$/);
indentations[i] = indent;
if (indent < minSpace)
minSpace = indent;
if (removeComment && !isCommented(line))
removeComment = false;
}
if (removeComment) {
for (var i = startRow; i <= endRow; i++) {
var line = doc.getLine(i); var line = doc.getLine(i);
var m = line.match(re); var m = line.match(regexpStart);
deleteRange.start.row = i; doc.removeInLine(i, indentations[i], m[0].length);
deleteRange.end.row = i; }
deleteRange.end.column = m[0].length; } else {
doc.replace(deleteRange, m[1]); str += " ";
for (var i = startRow; i <= endRow; i++) {
doc.insertInLine({row: i, column: minSpace}, str);
} }
}
else {
doc.indentRows(startRow, endRow, "//");
} }
}; };