From 92ca4212221e4be9ff1f21a725367afe9d8dfdee Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 15 Oct 2015 08:36:20 +0200 Subject: [PATCH] Codemirror: Add vhdl mode Verilog mode was always supported by Codemirror, but support for VHDL was only added in recent Codemirror version, so that we can only include it now. Bug: Issue 3447 Change-Id: I91028acf3f41f51981f710db00bee9a8c9398aee --- gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInfo.java | 1 + gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java | 1 + .../com/google/gerrit/server/mime/mime-types.properties | 1 + lib/codemirror/cm.defs | 1 + 4 files changed, 4 insertions(+) diff --git a/gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInfo.java b/gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInfo.java index 782500daf7..85b350dc9d 100644 --- a/gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInfo.java +++ b/gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInfo.java @@ -75,6 +75,7 @@ public class ModeInfo extends JavaScriptObject { Modes.I.stex(), Modes.I.velocity(), Modes.I.verilog(), + Modes.I.vhdl(), Modes.I.xml(), Modes.I.yaml(), }); 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 8170c2b4f3..42990b8407 100644 --- a/gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java +++ b/gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java @@ -61,6 +61,7 @@ public interface Modes extends ClientBundle { @Source("tcl.js") @DoNotEmbed DataResource tcl(); @Source("velocity.js") @DoNotEmbed DataResource velocity(); @Source("verilog.js") @DoNotEmbed DataResource verilog(); + @Source("vhdl.js") @DoNotEmbed DataResource vhdl(); @Source("xml.js") @DoNotEmbed DataResource xml(); @Source("yaml.js") @DoNotEmbed DataResource yaml(); diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mime/mime-types.properties b/gerrit-server/src/main/resources/com/google/gerrit/server/mime/mime-types.properties index 2646fd0c57..d93aa347e5 100644 --- a/gerrit-server/src/main/resources/com/google/gerrit/server/mime/mime-types.properties +++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mime/mime-types.properties @@ -48,5 +48,6 @@ stex = text/x-stex v = text/x-verilog vert = x-shader/x-vertex vh = text/x-verilog +vhdl = text/x-vhdl vm = text/velocity yaml = text/x-yaml diff --git a/lib/codemirror/cm.defs b/lib/codemirror/cm.defs index ca1c9ae6fc..abb6d92081 100644 --- a/lib/codemirror/cm.defs +++ b/lib/codemirror/cm.defs @@ -81,6 +81,7 @@ CM_MODES = [ 'tcl', 'velocity', 'verilog', + 'vhdl', 'xml', 'yaml', ]