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

Fixed demo config issues for groovy/scala highlighting

Browse source
This commit is contained in:
btilford 2011-06-24 21:34:57 -06:00
commit 47b8fdef17
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
demo/demo.js
View file

@ -170,13 +170,13 @@ exports.launch = function(env) {
docs.textile.setMode(new TextileMode());
docs.textile.setUndoManager(new UndoManager());
docs.textile = new EditSession(document.getElementById("groovy").innerHTML);
docs.textile.setMode(new GroovyMode());
docs.textile.setUndoManager(new UndoManager());
docs.groovy = new EditSession(document.getElementById("groovy").innerHTML);
docs.groovy.setMode(new GroovyMode());
docs.groovy.setUndoManager(new UndoManager());
docs.textile = new EditSession(document.getElementById("scala").innerHTML);
docs.textile.setMode(new ScalaMode());
docs.textile.setUndoManager(new UndoManager());
docs.scala = new EditSession(document.getElementById("scala").innerHTML);
docs.scala.setMode(new ScalaMode());
docs.scala.setUndoManager(new UndoManager());

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

@ -3,7 +3,7 @@ define(function(require, exports, module) {
var oop = require("pilot/oop");
var JavaScriptMode = require("ace/mode/javascript").Mode;
var Tokenizer = require("ace/tokenizer").Tokenizer;
var GroovyHighlightRules = require("ace/mode/groovy_highlight_rules").JavaHighlightRules;
var GroovyHighlightRules = require("ace/mode/groovy_highlight_rules").GroovyHighlightRules;
var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent;
var CstyleBehaviour = require("ace/mode/behaviour/cstyle").CstyleBehaviour;

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

@ -3,7 +3,7 @@ define(function(require, exports, module) {
var oop = require("pilot/oop");
var JavaScriptMode = require("ace/mode/javascript").Mode;
var Tokenizer = require("ace/tokenizer").Tokenizer;
var JavaHighlightRules = require("ace/mode/scala_highlight_rules").ScalaHighlightRules;
var ScalaHighlightRules = require("ace/mode/scala_highlight_rules").ScalaHighlightRules;
var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent;
var CstyleBehaviour = require("ace/mode/behaviour/cstyle").CstyleBehaviour;

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

@ -11,7 +11,7 @@ var ScalaHighlightRules = function() {
var keywords = lang.arrayToMap(
(
"case|default|do|else|for|if|match|while|throw|return|try|catch|finally|yield|" +
"abstract|class|def|extends|final|forSome|implicit|import|lazy|new|object|" +
"abstract|class|def|extends|final|forSome|implicit|implicits|import|lazy|new|object|" +
"override|package|private|protected|sealed|super|this|trait|type|val|var|with"
).split("|")
);