commit 59da23e4ca38d105fdc379aca165f2f6a8cf37b5
author David Ostrovsky <david@ostrovsky.org> Wed Jan 15 22:16:17 2014 +0100
committer David Ostrovsky <david@ostrovsky.org> Thu Jan 16 21:34:34 2014 +0100
tree 9a23dbc8d087805cade340dad05406205cedcea3
parent 893b5b13b713d6d2e06d4bf4de5f1ef8d875956f

Codemirror: Add support for Groovy mode

Change-Id: I7654e4c9911a3c6da9023155440445a4e777516b

gerrit-gwtui/src/main/java/net/codemirror/lib/ModeInjector.java

diff --git a/gerrit-gwtui/src/main/java/net/codemirror/lib/ModeInjector.java b/gerrit-gwtui/src/main/java/net/codemirror/lib/ModeInjector.java
index 3b491e7..cc13fcd 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/lib/ModeInjector.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/lib/ModeInjector.java
@@ -45,6 +45,7 @@
       Modes.I.commonlisp(),
       Modes.I.css(),
       Modes.I.go(),
+      Modes.I.groovy(),
       Modes.I.htmlmixed(),
       Modes.I.javascript(),
       Modes.I.perl(),

gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java

diff --git a/gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java b/gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java
index 4f93331..307403a 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java
@@ -29,6 +29,7 @@
   @Source("commonlisp/commonlisp.js") @DoNotEmbed DataResource commonlisp();
   @Source("css/css.js") @DoNotEmbed DataResource css();
   @Source("go/go.js") @DoNotEmbed DataResource go();
+  @Source("groovy/groovy.js") @DoNotEmbed DataResource groovy();
   @Source("htmlmixed/htmlmixed.js") @DoNotEmbed DataResource htmlmixed();
   @Source("javascript/javascript.js") @DoNotEmbed DataResource javascript();
   @Source("perl/perl.js") @DoNotEmbed DataResource perl();

gerrit-gwtui/src/main/java/net/codemirror/mode/mode_map

diff --git a/gerrit-gwtui/src/main/java/net/codemirror/mode/mode_map b/gerrit-gwtui/src/main/java/net/codemirror/mode/mode_map
index 141fffc..2d076cd 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/mode/mode_map
+++ b/gerrit-gwtui/src/main/java/net/codemirror/mode/mode_map
@@ -21,6 +21,9 @@
 go:
 text/x-go
 
+groovy:
+text/x-groovy
+
 htmlmixed:
 text/html
 

gerrit-server/src/main/java/com/google/gerrit/server/DefaultFileExtensionRegistry.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/DefaultFileExtensionRegistry.java b/gerrit-server/src/main/java/com/google/gerrit/server/DefaultFileExtensionRegistry.java
index c8c27af..bda15d0 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/DefaultFileExtensionRegistry.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/DefaultFileExtensionRegistry.java
@@ -51,6 +51,7 @@
       .put("lisp", LISP)
       .put("lsp", LISP)
       .put("clj", newMimeType("text/x-clojure", 2))
+      .put("groovy", newMimeType("text/x-groovy", 2))
       .build();
 
   private static MimeType newMimeType(String type, final int specificity) {

lib/codemirror/cm3.defs

diff --git a/lib/codemirror/cm3.defs b/lib/codemirror/cm3.defs
index 83db230..8de280a 100644
--- a/lib/codemirror/cm3.defs
+++ b/lib/codemirror/cm3.defs
@@ -19,6 +19,7 @@
   'commonlisp/commonlisp.js',
   'css/css.js',
   'go/go.js',
+  'groovy/groovy.js',
   'htmlmixed/htmlmixed.js',
   'javascript/javascript.js',
   'perl/perl.js',