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

remove remnants of regex_allowed

Browse source
This commit is contained in:
nightwing 2013-02-13 00:52:10 +04:00
commit 118c80ce89
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/ace/background_tokenizer_test.js
View file

@ -62,19 +62,19 @@ module.exports = {
doc.setMode("./mode/javascript") doc.setMode("./mode/javascript")
forceTokenize(doc) forceTokenize(doc)
testStates(doc, ["comment", "start", "start"]) testStates(doc, ["comment_regex_allowed", "start", "no_regex"])
doc.remove(new Range(0,2,1,2)) doc.remove(new Range(0,2,1,2))
testStates(doc, [null, "start"]) testStates(doc, [null, "no_regex"])
forceTokenize(doc) forceTokenize(doc)
testStates(doc, ["comment", "comment"]) testStates(doc, ["comment_regex_allowed", "comment_regex_allowed"])
doc.insert({row:0, column:2}, "\n*/") doc.insert({row:0, column:2}, "\n*/")
testStates(doc, [undefined, undefined, "comment"]) testStates(doc, [undefined, undefined, "comment_regex_allowed"])
forceTokenize(doc) forceTokenize(doc)
testStates(doc, ["comment", "start", "start"]) testStates(doc, ["comment_regex_allowed", "start", "no_regex"])
} }
}; };

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

@ -91,13 +91,13 @@ oop.inherits(Mode, TextMode);
return indent; return indent;
} }
if (state == "start" || state == "regex_allowed") { if (state == "start" || state == "no_regex") {
var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/); var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
if (match) { if (match) {
indent += tab; indent += tab;
} }
} else if (state == "doc-start") { } else if (state == "doc-start") {
if (endState == "start" || state == "regex_allowed") { if (endState == "start" || endState == "no_regex") {
return ""; return "";
} }
var match = line.match(/^\s*(\/?)\*/); var match = line.match(/^\s*(\/?)\*/);

2
lib/ace/mode/javascript_test.js
View file

@ -115,7 +115,7 @@ module.exports = {
"test: no auto indent should add to existing indent" : function() { "test: no auto indent should add to existing indent" : function() {
assert.equal(" ", this.mode.getNextLineIndent("start", " if () {", " ")); assert.equal(" ", this.mode.getNextLineIndent("start", " if () {", " "));
assert.equal(" ", this.mode.getNextLineIndent("start", " cde", " ")); assert.equal(" ", this.mode.getNextLineIndent("start", " cde", " "));
assert.equal(" ", this.mode.getNextLineIndent("regex_allowed", "function foo(items) {", " ")); assert.equal(" ", this.mode.getNextLineIndent("start", "function foo(items) {", " "));
}, },
"test: special indent in doc comments" : function() { "test: special indent in doc comments" : function() {