From 59da23e4ca38d105fdc379aca165f2f6a8cf37b5 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Wed, 15 Jan 2014 22:16:17 +0100
Subject: [PATCH] Codemirror: Add support for Groovy mode

Change-Id: I7654e4c9911a3c6da9023155440445a4e777516b
---
 .../src/main/java/net/codemirror/lib/ModeInjector.java         | 1 +
 gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java      | 1 +
 gerrit-gwtui/src/main/java/net/codemirror/mode/mode_map        | 3 +++
 .../com/google/gerrit/server/DefaultFileExtensionRegistry.java | 1 +
 lib/codemirror/cm3.defs                                        | 1 +
 5 files changed, 7 insertions(+)

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 3b491e7dd9..cc13fcd2b6 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 @@ public class ModeInjector {
       Modes.I.commonlisp(),
       Modes.I.css(),
       Modes.I.go(),
+      Modes.I.groovy(),
       Modes.I.htmlmixed(),
       Modes.I.javascript(),
       Modes.I.perl(),
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 4f93331b53..307403a5bc 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 @@ public interface Modes extends ClientBundle {
   @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();
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 141fffcd0a..2d076cd0d7 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 @@ text/x-scss
 go:
 text/x-go
 
+groovy:
+text/x-groovy
+
 htmlmixed:
 text/html
 
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 c8c27af7ec..bda15d0089 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 @@ public class DefaultFileExtensionRegistry extends MimeDetector {
       .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) {
diff --git a/lib/codemirror/cm3.defs b/lib/codemirror/cm3.defs
index 83db2308f5..8de280a711 100644
--- a/lib/codemirror/cm3.defs
+++ b/lib/codemirror/cm3.defs
@@ -19,6 +19,7 @@ CM3_MODES = [
   'commonlisp/commonlisp.js',
   'css/css.js',
   'go/go.js',
+  'groovy/groovy.js',
   'htmlmixed/htmlmixed.js',
   'javascript/javascript.js',
   'perl/perl.js',