From 47b8fdef17a603e3a7097133db7deb690817b2eb Mon Sep 17 00:00:00 2001
From: btilford <ben@tilford.info>
Date: Fri, 24 Jun 2011 21:34:57 -0600
Subject: [PATCH] Fixed demo config issues for groovy/scala highlighting

---
 demo/demo.js                          | 12 ++++++------
 lib/ace/mode/groovy.js                |  2 +-
 lib/ace/mode/scala.js                 |  2 +-
 lib/ace/mode/scala_highlight_rules.js |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/demo/demo.js b/demo/demo.js
index 0b06a779..e338bb10 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -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());
 
     
     
diff --git a/lib/ace/mode/groovy.js b/lib/ace/mode/groovy.js
index 12930aa5..b0d51d87 100644
--- a/lib/ace/mode/groovy.js
+++ b/lib/ace/mode/groovy.js
@@ -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;
 
diff --git a/lib/ace/mode/scala.js b/lib/ace/mode/scala.js
index 5342eca3..f1690fb6 100644
--- a/lib/ace/mode/scala.js
+++ b/lib/ace/mode/scala.js
@@ -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;
 
diff --git a/lib/ace/mode/scala_highlight_rules.js b/lib/ace/mode/scala_highlight_rules.js
index 641a6a9a..d3987929 100644
--- a/lib/ace/mode/scala_highlight_rules.js
+++ b/lib/ace/mode/scala_highlight_rules.js
@@ -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("|")
     );