From 64ec68e0c9d73c4dc6edd4c5a81eba91efc3a113 Mon Sep 17 00:00:00 2001
From: Dave Borowitz <dborowitz@google.com>
Date: Mon, 6 Oct 2014 14:22:35 -0400
Subject: [PATCH] Revert "CM3: Add reStructuredText mode"

Causing rendering failures in some cases. Filed a bug upstream:

https://github.com/codemirror/CodeMirror/issues/2850

Change-Id: I0b4032d41b1fe5b9756ff59f752f5fce86634c41
---
 .../src/main/java/net/codemirror/lib/ModeInjector.java      | 2 --
 gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java   | 2 --
 gerrit-gwtui/src/main/java/net/codemirror/mode/mode_map     | 6 ------
 .../com/google/gerrit/server/mime-types.properties          | 2 --
 lib/codemirror/cm3.defs                                     | 3 ---
 5 files changed, 15 deletions(-)

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 81f62743e9..3098c438d9 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/lib/ModeInjector.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/lib/ModeInjector.java
@@ -66,13 +66,11 @@ public class ModeInjector {
       Modes.I.properties(),
       Modes.I.python(),
       Modes.I.r(),
-      Modes.I.rst(),
       Modes.I.ruby(),
       Modes.I.scheme(),
       Modes.I.shell(),
       Modes.I.smalltalk(),
       Modes.I.sql(),
-      Modes.I.stex(),
       Modes.I.velocity(),
       Modes.I.verilog(),
       Modes.I.xml(),
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 b7948881ce..d51479f51e 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java
@@ -49,13 +49,11 @@ public interface Modes extends ClientBundle {
   @Source("properties/properties.js") @DoNotEmbed DataResource properties();
   @Source("python/python.js") @DoNotEmbed DataResource python();
   @Source("r/r.js") @DoNotEmbed DataResource r();
-  @Source("rst/rst.js") @DoNotEmbed DataResource rst();
   @Source("ruby/ruby.js") @DoNotEmbed DataResource ruby();
   @Source("scheme/scheme.js") @DoNotEmbed DataResource scheme();
   @Source("shell/shell.js") @DoNotEmbed DataResource shell();
   @Source("smalltalk/smalltalk.js") @DoNotEmbed DataResource smalltalk();
   @Source("sql/sql.js") @DoNotEmbed DataResource sql();
-  @Source("stex/stex.js") @DoNotEmbed DataResource stex();
   @Source("tcl/tcl.js") @DoNotEmbed DataResource tcl();
   @Source("velocity/velocity.js") @DoNotEmbed DataResource velocity();
   @Source("verilog/verilog.js") @DoNotEmbed DataResource verilog();
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 2a43b385b5..2bff364ed9 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/mode/mode_map
+++ b/gerrit-gwtui/src/main/java/net/codemirror/mode/mode_map
@@ -94,9 +94,6 @@ text/x-python
 r:
 text/r-src
 
-rst:
-text/x-rst
-
 ruby:
 text/x-ruby
 
@@ -119,9 +116,6 @@ text/x-plsql
 tcl:
 text/x-tcl
 
-stex:
-text/x-stex
-
 velocity:
 text/velocity
 
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mime-types.properties b/gerrit-server/src/main/resources/com/google/gerrit/server/mime-types.properties
index 8960ff982e..817790f1da 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mime-types.properties
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mime-types.properties
@@ -30,11 +30,9 @@ project.config = text/x-ini
 properties = text/x-ini
 py = text/x-python
 r = text/r-src
-rst = text/x-rst
 rb = text/x-ruby
 scala = text/x-scala
 st = text/x-stsrc
-stex = text/x-stex
 v = text/x-verilog
 vh = text/x-verilog
 vm = text/velocity
diff --git a/lib/codemirror/cm3.defs b/lib/codemirror/cm3.defs
index 93cf81ea64..84f09c3e58 100644
--- a/lib/codemirror/cm3.defs
+++ b/lib/codemirror/cm3.defs
@@ -20,7 +20,6 @@ CM3_JS = [
   'addon/search/search.js',
   'addon/selection/mark-selection.js',
   'addon/edit/trailingspace.js',
-  'addon/mode/overlay.js',
 ]
 
 CM3_MODES = [
@@ -48,13 +47,11 @@ CM3_MODES = [
   'properties/properties.js',
   'python/python.js',
   'r/r.js',
-  'rst/rst.js',
   'ruby/ruby.js',
   'scheme/scheme.js',
   'shell/shell.js',
   'smalltalk/smalltalk.js',
   'sql/sql.js',
-  'stex/stex.js',
   'tcl/tcl.js',
   'velocity/velocity.js',
   'verilog/verilog.js',