commit 893b5b13b713d6d2e06d4bf4de5f1ef8d875956f
author David Ostrovsky <david@ostrovsky.org> Wed Jan 15 22:05:40 2014 +0100
committer David Ostrovsky <david@ostrovsky.org> Thu Jan 16 21:34:34 2014 +0100
tree 6b8a327f086b47a14209da87cf85c47ff52944e6
parent d225f608a82d644e28b0aa0f3766e32fbdffc84a

Codemirror: Add support for Clojure mode

Change-Id: Ie814a7f7b5a97554617889b439f02aec065b8189

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 bd3612f..3b491e7 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/lib/ModeInjector.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/lib/ModeInjector.java
@@ -41,6 +41,7 @@
   static {
     DataResource[] all = {
       Modes.I.clike(),
+      Modes.I.clojure(),
       Modes.I.commonlisp(),
       Modes.I.css(),
       Modes.I.go(),

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 7697839..4f93331 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java
@@ -25,6 +25,7 @@
 
   @Source("mode_map") TextResource mode_map();
   @Source("clike/clike.js") @DoNotEmbed DataResource clike();
+  @Source("clojure/clojure.js") @DoNotEmbed DataResource clojure();
   @Source("commonlisp/commonlisp.js") @DoNotEmbed DataResource commonlisp();
   @Source("css/css.js") @DoNotEmbed DataResource css();
   @Source("go/go.js") @DoNotEmbed DataResource go();

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 49e943b..141fffc 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/mode/mode_map
+++ b/gerrit-gwtui/src/main/java/net/codemirror/mode/mode_map
@@ -8,6 +8,9 @@
 text/x-csharp
 text/x-scala
 
+clojure:
+text/x-clojure
+
 commonlisp:
 text/x-common-lisp
 

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 c5692ed..c8c27af 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
@@ -50,6 +50,7 @@
       .put("el", LISP)
       .put("lisp", LISP)
       .put("lsp", LISP)
+      .put("clj", newMimeType("text/x-clojure", 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 7992c1e..83db230 100644
--- a/lib/codemirror/cm3.defs
+++ b/lib/codemirror/cm3.defs
@@ -15,6 +15,7 @@
 
 CM3_MODES = [
   'clike/clike.js',
+  'clojure/clojure.js',
   'commonlisp/commonlisp.js',
   'css/css.js',
   'go/go.js',