From 88c74fa9c2016c3af79333be301196458ffd8714 Mon Sep 17 00:00:00 2001
From: Todd Berman <tberman@github.com>
Date: Fri, 23 Sep 2016 13:40:19 -0700
Subject: [PATCH 1/8] Convert from mode names to mimetypes for better usage.

---
 lib/linguist/language.rb   |   6 +-
 lib/linguist/languages.yml | 386 ++++++++++++++++++-------------------
 test/test_language.rb      |   2 +-
 3 files changed, 196 insertions(+), 198 deletions(-)

diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb
index 85eade29..49adbbd8 100644
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -398,13 +398,13 @@ module Linguist
     # Returns a String name or nil
     attr_reader :ace_mode
 
-    # Public: Get Codemirror mode
+    # Public: Get Codemirror mode (as expressed by a mimetype)
     #
     # Examples
     #
     #  # => "nil"
-    #  # => "javascript"
-    #  # => "clike"
+    #  # => "text/x-javascript"
+    #  # => "text/x-csrc"
     #
     # Returns a String name or nil
     attr_reader :codemirror_mode
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 4bb5fbef..5762f715 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -59,7 +59,7 @@ AGS Script:
   - ".ash"
   tm_scope: source.c++
   ace_mode: c_cpp
-  codemirror_mode: clike
+  codemirror_mode: text/x-c++src
   language_id: 2
 AMPL:
   type: programming
@@ -97,7 +97,7 @@ APL:
   - dyalog
   tm_scope: source.apl
   ace_mode: text
-  codemirror_mode: apl
+  codemirror_mode: text/apl
   language_id: 6
 ASN.1:
   type: data
@@ -107,7 +107,7 @@ ASN.1:
   - ".asn1"
   tm_scope: source.asn
   ace_mode: text
-  codemirror_mode: asn.1
+  codemirror_mode: text/x-ttcn-asn
   language_id: 7
 ASP:
   type: programming
@@ -126,7 +126,7 @@ ASP:
   - ".aspx"
   - ".axd"
   ace_mode: text
-  codemirror_mode: htmlembedded
+  codemirror_mode: application/x-aspx
   language_id: 8
 ATS:
   type: programming
@@ -189,7 +189,7 @@ Alpine Abuild:
   - APKBUILD
   tm_scope: source.shell
   ace_mode: sh
-  codemirror_mode: shell
+  codemirror_mode: text/x-sh
   language_id: 14
 Ant Build System:
   type: data
@@ -198,7 +198,7 @@ Ant Build System:
   - ant.xml
   - build.xml
   ace_mode: xml
-  codemirror_mode: xml
+  codemirror_mode: application/xml
   language_id: 15
 ApacheConf:
   type: markup
@@ -217,7 +217,7 @@ Apex:
   - ".cls"
   tm_scope: source.java
   ace_mode: java
-  codemirror_mode: clike
+  codemirror_mode: text/x-java
   language_id: 17
 Apollo Guidance Computer:
   type: programming
@@ -227,7 +227,7 @@ Apollo Guidance Computer:
   - ".agc"
   tm_scope: source.agc
   ace_mode: assembly_x86
-  codemirror_mode:  gas
+  codemirror_mode:  text/x-gas
   language_id: 18
 AppleScript:
   type: programming
@@ -256,7 +256,7 @@ Arduino:
   - ".ino"
   tm_scope: source.c++
   ace_mode: c_cpp
-  codemirror_mode: clike
+  codemirror_mode: text/x-c++src
   language_id: 21
 AsciiDoc:
   type: prose
@@ -289,7 +289,7 @@ Assembly:
   - ".nasm"
   tm_scope: source.assembly
   ace_mode: assembly_x86
-  codemirror_mode: gas
+  codemirror_mode: text/x-gas
   language_id: 24
 Augeas:
   type: programming
@@ -427,7 +427,7 @@ Brainfuck:
   - ".bf"
   tm_scope: source.bf
   ace_mode: text
-  codemirror_mode: brainfuck
+  codemirror_mode: text/x-brainfuck
   language_id: 38
 Brightscript:
   type: programming
@@ -454,12 +454,12 @@ C:
   interpreters:
   - tcc
   ace_mode: c_cpp
-  codemirror_mode: clike
+  codemirror_mode: text/x-csrc
   language_id: 41
 C#:
   type: programming
   ace_mode: csharp
-  codemirror_mode: clike
+  codemirror_mode: text/x-csharp
   tm_scope: source.cs
   search_term: csharp
   color: "#178600"
@@ -474,7 +474,7 @@ C#:
 C++:
   type: programming
   ace_mode: c_cpp
-  codemirror_mode: clike
+  codemirror_mode: text/x-c++src
   search_term: cpp
   color: "#f34b7d"
   aliases:
@@ -502,7 +502,7 @@ C-ObjDump:
   - ".c-objdump"
   tm_scope: objdump.x86asm
   ace_mode: assembly_x86
-  codemirror_mode: gas
+  codemirror_mode: text/x-gas
   language_id: 44
 C2hs Haskell:
   type: programming
@@ -513,7 +513,7 @@ C2hs Haskell:
   - ".chs"
   tm_scope: source.haskell
   ace_mode: haskell
-  codemirror_mode: haskell
+  codemirror_mode: text/x-haskell
   language_id: 45
 CLIPS:
   type: programming
@@ -530,7 +530,7 @@ CMake:
   filenames:
   - CMakeLists.txt
   ace_mode: text
-  codemirror_mode: cmake
+  codemirror_mode: text/x-cmake
   language_id: 47
 COBOL:
   type: programming
@@ -541,7 +541,7 @@ COBOL:
   - ".cobol"
   - ".cpy"
   ace_mode: cobol
-  codemirror_mode: cobol
+  codemirror_mode: text/x-cobol
   language_id: 48
 COLLADA:
   type: data
@@ -549,13 +549,13 @@ COLLADA:
   - ".dae"
   tm_scope: text.xml
   ace_mode: xml
-  codemirror_mode: xml
+  codemirror_mode: text/x-xml
   language_id: 49
 CSS:
   type: markup
   tm_scope: source.css
   ace_mode: css
-  codemirror_mode: css
+  codemirror_mode: text/css
   color: "#563d7c"
   extensions:
   - ".css"
@@ -611,7 +611,7 @@ ChucK:
   - ".ck"
   tm_scope: source.java
   ace_mode: java
-  codemirror_mode: clike
+  codemirror_mode: text/x-java
   language_id: 57
 Cirru:
   type: programming
@@ -648,7 +648,7 @@ Click:
 Clojure:
   type: programming
   ace_mode: clojure
-  codemirror_mode: clojure
+  codemirror_mode: text/x-clojure
   color: "#db5855"
   extensions:
   - ".clj"
@@ -667,7 +667,7 @@ CoffeeScript:
   type: programming
   tm_scope: source.coffee
   ace_mode: coffee
-  codemirror_mode: coffeescript
+  codemirror_mode: text/x-coffeescript
   color: "#244776"
   aliases:
   - coffee
@@ -733,7 +733,7 @@ Common Lisp:
   - clisp
   - ecl
   ace_mode: lisp
-  codemirror_mode: commonlisp
+  codemirror_mode: text/x-common-lisp
   language_id: 66
 Component Pascal:
   type: programming
@@ -746,7 +746,7 @@ Component Pascal:
   - delphi
   - objectpascal
   ace_mode: pascal
-  codemirror_mode: pascal
+  codemirror_mode: text/x-pascal
   language_id: 67
 Cool:
   type: programming
@@ -774,7 +774,7 @@ Cpp-ObjDump:
   aliases:
   - c++-objdump
   ace_mode: assembly_x86
-  codemirror_mode: gas
+  codemirror_mode: text/x-gas
   language_id: 70
 Creole:
   type: prose
@@ -790,7 +790,7 @@ Crystal:
   extensions:
   - ".cr"
   ace_mode: ruby
-  codemirror_mode: crystal
+  codemirror_mode: text/x-crystal
   tm_scope: source.crystal
   interpreters:
   - crystal
@@ -840,7 +840,7 @@ Cuda:
   - ".cuh"
   tm_scope: source.cuda-c++
   ace_mode: c_cpp
-  codemirror_mode: clike
+  codemirror_mode: text/x-c++src
   color: "#3A4E3A"
   language_id: 77
 Cycript:
@@ -849,7 +849,7 @@ Cycript:
   - ".cy"
   tm_scope: source.js
   ace_mode: javascript
-  codemirror_mode: javascript
+  codemirror_mode: text/javascript
   language_id: 78
 Cython:
   type: programming
@@ -861,7 +861,7 @@ Cython:
   aliases:
   - pyrex
   ace_mode: text
-  codemirror_mode: python
+  codemirror_mode: text/x-cython
   language_id: 79
 D:
   type: programming
@@ -870,7 +870,7 @@ D:
   - ".d"
   - ".di"
   ace_mode: d
-  codemirror_mode: d
+  codemirror_mode: text/x-d
   language_id: 80
 D-ObjDump:
   type: data
@@ -878,7 +878,7 @@ D-ObjDump:
   - ".d-objdump"
   tm_scope: objdump.x86asm
   ace_mode: assembly_x86
-  codemirror_mode: gas
+  codemirror_mode: text/x-gas
   language_id: 81
 DIGITAL Command Language:
   type: programming
@@ -917,7 +917,7 @@ DTrace:
   - dtrace
   tm_scope: source.c
   ace_mode: c_cpp
-  codemirror_mode: clike
+  codemirror_mode: text/x-csrc
   language_id: 85
 Darcs Patch:
   type: data
@@ -938,7 +938,7 @@ Dart:
   interpreters:
   - dart
   ace_mode: dart
-  codemirror_mode: dart
+  codemirror_mode: text/x-dart
   language_id: 87
 Diff:
   type: data
@@ -949,7 +949,7 @@ Diff:
   - udiff
   tm_scope: source.diff
   ace_mode: diff
-  codemirror_mode: diff
+  codemirror_mode: text/x-diff
   language_id: 88
 Dockerfile:
   type: data
@@ -959,7 +959,7 @@ Dockerfile:
   filenames:
   - Dockerfile
   ace_mode: dockerfile
-  codemirror_mode: dockerfile
+  codemirror_mode: text/x-dockerfile
   language_id: 89
 Dogescript:
   type: programming
@@ -978,7 +978,7 @@ Dylan:
   - ".intr"
   - ".lid"
   ace_mode: text
-  codemirror_mode: dylan
+  codemirror_mode: text/x-dylan
   language_id: 91
 E:
   type: programming
@@ -998,7 +998,7 @@ ECL:
   - ".eclxml"
   tm_scope: none
   ace_mode: text
-  codemirror_mode: ecl
+  codemirror_mode: text/x-ecl
   language_id: 93
 ECLiPSe:
   type: programming
@@ -1024,7 +1024,7 @@ EQ:
   - ".eq"
   tm_scope: source.cs
   ace_mode: csharp
-  codemirror_mode: clike
+  codemirror_mode: text/x-csharp
   language_id: 96
 Eagle:
   type: markup
@@ -1034,7 +1034,7 @@ Eagle:
   - ".brd"
   tm_scope: text.xml
   ace_mode: xml
-  codemirror_mode: xml
+  codemirror_mode: text/xml
   language_id: 97
 Ecere Projects:
   type: data
@@ -1043,7 +1043,7 @@ Ecere Projects:
   - ".epj"
   tm_scope: source.json
   ace_mode: json
-  codemirror_mode: json
+  codemirror_mode: application/json
   language_id: 98
 Eiffel:
   type: programming
@@ -1051,7 +1051,7 @@ Eiffel:
   extensions:
   - ".e"
   ace_mode: eiffel
-  codemirror_mode: eiffel
+  codemirror_mode: text/x-eiffel
   language_id: 99
 Elixir:
   type: programming
@@ -1072,7 +1072,7 @@ Elm:
   - ".elm"
   tm_scope: source.elm
   ace_mode: elm
-  codemirror_mode: elm
+  codemirror_mode: text/x-elm
   language_id: 101
 Emacs Lisp:
   type: programming
@@ -1096,7 +1096,7 @@ Emacs Lisp:
   - ".emacs"
   - ".emacs.desktop"
   ace_mode: lisp
-  codemirror_mode: commonlisp
+  codemirror_mode: text/x-common-lisp
   language_id: 102
 EmberScript:
   type: programming
@@ -1106,7 +1106,7 @@ EmberScript:
   - ".emberscript"
   tm_scope: source.coffee
   ace_mode: coffee
-  codemirror_mode: coffeescript
+  codemirror_mode: text/x-coffeescript
   language_id: 103
 Erlang:
   type: programming
@@ -1124,7 +1124,7 @@ Erlang:
   - rebar.config.lock
   - rebar.lock
   ace_mode: erlang
-  codemirror_mode: erlang
+  codemirror_mode: text/x-erlang
   interpreters:
   - escript
   language_id: 104
@@ -1140,7 +1140,7 @@ F#:
   - ".fsx"
   tm_scope: source.fsharp
   ace_mode: text
-  codemirror_mode: mllike
+  codemirror_mode: text/x-fsharp
   language_id: 105
 FLUX:
   type: programming
@@ -1165,7 +1165,7 @@ FORTRAN:
   - ".fpp"
   tm_scope: source.fortran.modern
   ace_mode: text
-  codemirror_mode: fortran
+  codemirror_mode: text/x-fortran
   language_id: 107
 Factor:
   type: programming
@@ -1176,7 +1176,7 @@ Factor:
   - ".factor-boot-rc"
   - ".factor-rc"
   ace_mode: text
-  codemirror_mode: factor
+  codemirror_mode: text/x-factor
   language_id: 108
 Fancy:
   type: programming
@@ -1232,7 +1232,7 @@ Forth:
   - ".frt"
   - ".fs"
   ace_mode: forth
-  codemirror_mode: forth
+  codemirror_mode: text/x-forth
   language_id: 114
 FreeMarker:
   type: programming
@@ -1287,7 +1287,7 @@ GAS:
   - ".ms"
   tm_scope: source.assembly
   ace_mode: assembly_x86
-  codemirror_mode: gas
+  codemirror_mode: text/x-gas
   language_id: 120
 GCC Machine Description:
   type: programming
@@ -1295,7 +1295,7 @@ GCC Machine Description:
   - ".md"
   tm_scope: source.lisp
   ace_mode: lisp
-  codemirror_mode: commonlisp
+  codemirror_mode: text/x-common-lisp
   language_id: 121
 GDB:
   type: programming
@@ -1340,7 +1340,7 @@ Game Maker Language:
   - ".gml"
   tm_scope: source.c++
   ace_mode: c_cpp
-  codemirror_mode: clike
+  codemirror_mode: text/x-c++src
   language_id: 125
 Genshi:
   type: programming
@@ -1351,7 +1351,7 @@ Genshi:
   - xml+genshi
   - xml+kid
   ace_mode: xml
-  codemirror_mode: xml
+  codemirror_mode: text/xml
   language_id: 126
 Gentoo Ebuild:
   type: programming
@@ -1360,7 +1360,7 @@ Gentoo Ebuild:
   - ".ebuild"
   tm_scope: source.shell
   ace_mode: sh
-  codemirror_mode: shell
+  codemirror_mode: text/x-sh
   language_id: 127
 Gentoo Eclass:
   type: programming
@@ -1369,7 +1369,7 @@ Gentoo Eclass:
   - ".eclass"
   tm_scope: source.shell
   ace_mode: sh
-  codemirror_mode: shell
+  codemirror_mode: text/x-sh
   language_id: 128
 Gettext Catalog:
   type: prose
@@ -1390,7 +1390,7 @@ Glyph:
   - ".glf"
   tm_scope: source.tcl
   ace_mode: tcl
-  codemirror_mode: tcl
+  codemirror_mode: text/x-tcl
   language_id: 130
 Gnuplot:
   type: programming
@@ -1411,7 +1411,7 @@ Go:
   extensions:
   - ".go"
   ace_mode: golang
-  codemirror_mode: go
+  codemirror_mode: text/x-go
   language_id: 132
 Golo:
   type: programming
@@ -1457,7 +1457,7 @@ Grammatical Framework:
   color: "#79aa7a"
   tm_scope: source.haskell
   ace_mode: haskell
-  codemirror_mode: haskell
+  codemirror_mode: text/x-haskell
   language_id: 137
 Graph Modeling Language:
   type: data
@@ -1517,12 +1517,12 @@ Groff:
   - nroff
   - troff
   ace_mode: text
-  codemirror_mode: troff
+  codemirror_mode: text/troff
   language_id: 141
 Groovy:
   type: programming
   ace_mode: groovy
-  codemirror_mode: groovy
+  codemirror_mode: text/x-groovy
   color: "#e69f56"
   extensions:
   - ".groovy"
@@ -1544,7 +1544,7 @@ Groovy Server Pages:
   - ".gsp"
   tm_scope: text.html.jsp
   ace_mode: jsp
-  codemirror_mode: htmlembedded
+  codemirror_mode: application/x-jsp
   language_id: 143
 HCL:
   type: programming
@@ -1552,7 +1552,7 @@ HCL:
   - ".hcl"
   - ".tf"
   ace_mode: ruby
-  codemirror_mode: ruby
+  codemirror_mode: text/x-ruby
   tm_scope: source.ruby
   language_id: 144
 HLSL:
@@ -1569,7 +1569,7 @@ HTML:
   type: markup
   tm_scope: text.html.basic
   ace_mode: html
-  codemirror_mode: html
+  codemirror_mode: text/html
   color: "#e44b23"
   aliases:
   - xhtml
@@ -1595,7 +1595,7 @@ HTML+Django:
   - html+jinja
   - htmldjango
   ace_mode: django
-  codemirror_mode: django
+  codemirror_mode: text/x-django
   language_id: 147
 HTML+ECR:
   type: markup
@@ -1606,7 +1606,7 @@ HTML+ECR:
   extensions:
   - ".ecr"
   ace_mode: text
-  codemirror_mode: htmlembedded
+  codemirror_mode: text/html
   language_id: 148
 HTML+EEX:
   type: markup
@@ -1617,7 +1617,7 @@ HTML+EEX:
   extensions:
   - ".eex"
   ace_mode: text
-  codemirror_mode: htmlembedded
+  codemirror_mode: text/html
   language_id: 149
 HTML+ERB:
   type: markup
@@ -1629,7 +1629,7 @@ HTML+ERB:
   - ".erb"
   - ".erb.deface"
   ace_mode: text
-  codemirror_mode: htmlembedded
+  codemirror_mode: application/x-erb
   language_id: 150
 HTML+PHP:
   type: markup
@@ -1638,7 +1638,7 @@ HTML+PHP:
   extensions:
   - ".phtml"
   ace_mode: php
-  codemirror_mode: php
+  codemirror_mode: application/x-httpd-php
   language_id: 151
 HTTP:
   type: data
@@ -1646,12 +1646,12 @@ HTTP:
   - ".http"
   tm_scope: source.httpspec
   ace_mode: text
-  codemirror_mode: http
+  codemirror_mode: message/http
   language_id: 152
 Hack:
   type: programming
   ace_mode: php
-  codemirror_mode: php
+  codemirror_mode: application/x-httpd-php
   extensions:
   - ".hh"
   - ".php"
@@ -1665,7 +1665,7 @@ Haml:
   - ".haml"
   - ".haml.deface"
   ace_mode: haml
-  codemirror_mode: haml
+  codemirror_mode: text/x-haml
   color: "#ECE2A9"
   language_id: 154
 Handlebars:
@@ -1680,7 +1680,6 @@ Handlebars:
   - ".hbs"
   tm_scope: text.html.handlebars
   ace_mode: handlebars
-  codemirror_mode: handlebars
   language_id: 155
 Harbour:
   type: programming
@@ -1699,12 +1698,12 @@ Haskell:
   interpreters:
   - runhaskell
   ace_mode: haskell
-  codemirror_mode: haskell
+  codemirror_mode: text/x-haskell
   language_id: 157
 Haxe:
   type: programming
   ace_mode: haxe
-  codemirror_mode: haxe
+  codemirror_mode: text/x-haxe
   color: "#df7900"
   extensions:
   - ".hx"
@@ -1735,7 +1734,7 @@ IDL:
   - ".pro"
   - ".dlm"
   ace_mode: text
-  codemirror_mode: idl
+  codemirror_mode: text/x-idl
   language_id: 161
 IGOR Pro:
   type: programming
@@ -1759,7 +1758,7 @@ INI:
   aliases:
   - dosini
   ace_mode: ini
-  codemirror_mode: properties
+  codemirror_mode: text/x-properties
   language_id: 163
 IRC log:
   type: data
@@ -1859,7 +1858,7 @@ JSON:
   tm_scope: source.json
   group: JavaScript
   ace_mode: json
-  codemirror_mode: javascript
+  codemirror_mode: application/json
   searchable: false
   extensions:
   - ".json"
@@ -1878,13 +1877,13 @@ JSON5:
   - ".json5"
   tm_scope: source.js
   ace_mode: javascript
-  codemirror_mode: javascript
+  codemirror_mode: application/json
   language_id: 175
 JSONLD:
   type: data
   group: JavaScript
   ace_mode: javascript
-  codemirror_mode: javascript
+  codemirror_mode: application/ld+json
   extensions:
   - ".jsonld"
   tm_scope: source.js
@@ -1893,7 +1892,7 @@ JSONiq:
   color: "#40d47e"
   type: programming
   ace_mode: jsoniq
-  codemirror_mode: javascript
+  codemirror_mode: application/json
   extensions:
   - ".jq"
   tm_scope: source.jq
@@ -1904,7 +1903,7 @@ JSX:
   extensions:
   - ".jsx"
   tm_scope: source.js.jsx
-  ace_mode: javascript
+  ace_mode: text/jsx
   language_id: 178
 Jade:
   group: HTML
@@ -1914,7 +1913,7 @@ Jade:
   - ".pug"
   tm_scope: text.jade
   ace_mode: jade
-  codemirror_mode: pug
+  codemirror_mode: text/x-pug
   language_id: 179
 Jasmin:
   type: programming
@@ -1926,7 +1925,7 @@ Jasmin:
 Java:
   type: programming
   ace_mode: java
-  codemirror_mode: clike
+  codemirror_mode: text/x-java
   color: "#b07219"
   extensions:
   - ".java"
@@ -1941,13 +1940,13 @@ Java Server Pages:
   - ".jsp"
   tm_scope: text.html.jsp
   ace_mode: jsp
-  codemirror_mode: htmlembedded
+  codemirror_mode: application/x-jsp
   language_id: 182
 JavaScript:
   type: programming
   tm_scope: source.js
   ace_mode: javascript
-  codemirror_mode: javascript
+  codemirror_mode: text/javascript
   color: "#f1e05a"
   aliases:
   - js
@@ -1996,12 +1995,12 @@ Julia:
   - ".jl"
   color: "#a270ba"
   ace_mode: julia
-  codemirror_mode: julia
+  codemirror_mode: text/x-julia
   language_id: 184
 Jupyter Notebook:
   type: markup
   ace_mode: json
-  codemirror_mode: javascript
+  codemirror_mode: application/json
   tm_scope: source.json
   color: "#DA5B0B"
   extensions:
@@ -2031,7 +2030,7 @@ KiCad:
 Kit:
   type: markup
   ace_mode: html
-  codemirror_mode: html
+  codemirror_mode: text/html
   extensions:
   - ".kit"
   tm_scope: text.html.basic
@@ -2045,7 +2044,7 @@ Kotlin:
   - ".kts"
   tm_scope: source.Kotlin
   ace_mode: text
-  codemirror_mode: kotlin
+  codemirror_mode: text/x-kotlin
   language_id: 189
 LFE:
   type: programming
@@ -2055,7 +2054,7 @@ LFE:
   group: Erlang
   tm_scope: source.lisp
   ace_mode: lisp
-  codemirror_mode: commonlisp
+  codemirror_mode: text/x-common-lisp
   language_id: 190
 LLVM:
   type: programming
@@ -2088,7 +2087,7 @@ LabVIEW:
   - ".lvproj"
   tm_scope: text.xml
   ace_mode: xml
-  codemirror_mode: xml
+  codemirror_mode: text/xml
   language_id: 194
 Lasso:
   type: programming
@@ -2112,7 +2111,7 @@ Latte:
   - ".latte"
   tm_scope: text.html.smarty
   ace_mode: smarty
-  codemirror_mode: smarty
+  codemirror_mode: text/x-smarty
   language_id: 196
 Lean:
   type: programming
@@ -2128,7 +2127,7 @@ Less:
   - ".less"
   tm_scope: source.css.less
   ace_mode: less
-  codemirror_mode: css
+  codemirror_mode: text/css
   color: "#A1D9A1"
   language_id: 198
 Lex:
@@ -2212,7 +2211,7 @@ Literate Haskell:
   - ".lhs"
   tm_scope: text.tex.latex.haskell
   ace_mode: text
-  codemirror_mode: haskell-literate
+  codemirror_mode: text/x-literate-haskell
   language_id: 207
 LiveScript:
   type: programming
@@ -2226,7 +2225,7 @@ LiveScript:
   filenames:
   - Slakefile
   ace_mode: livescript
-  codemirror_mode: livescript
+  codemirror_mode: text/x-livescript
   language_id: 208
 Logos:
   type: programming
@@ -2247,7 +2246,7 @@ Logtalk:
 LookML:
   type: programming
   ace_mode: yaml
-  codemirror_mode: yaml
+  codemirror_mode: text/x-yaml
   color: "#652B81"
   extensions:
   - ".lookml"
@@ -2263,7 +2262,7 @@ LoomScript:
 Lua:
   type: programming
   ace_mode: lua
-  codemirror_mode: lua
+  codemirror_mode: text/x-lua
   color: "#000080"
   extensions:
   - ".lua"
@@ -2283,7 +2282,7 @@ M:
   - ".mumps"
   - ".m"
   ace_mode: text
-  codemirror_mode: mumps
+  codemirror_mode: text/x-mumps
   language_id: 214
   tm_scope: none
 M4:
@@ -2321,7 +2320,7 @@ MTML:
   - ".mtml"
   tm_scope: text.html.basic
   ace_mode: html
-  codemirror_mode: html
+  codemirror_mode: text/html
   language_id: 218
 MUF:
   type: programming
@@ -2331,7 +2330,7 @@ MUF:
   - ".m"
   tm_scope: none
   ace_mode: forth
-  codemirror_mode: forth
+  codemirror_mode: text/x-forth
   language_id: 219
 Makefile:
   type: programming
@@ -2360,7 +2359,7 @@ Makefile:
   interpreters:
   - make
   ace_mode: makefile
-  codemirror_mode: cmake
+  codemirror_mode: text/x-cmake
   language_id: 220
 Mako:
   type: programming
@@ -2373,7 +2372,7 @@ Mako:
 Markdown:
   type: prose
   ace_mode: markdown
-  codemirror_mode: markdown
+  codemirror_mode: text/x-gfm
   wrap: true
   extensions:
   - ".md"
@@ -2407,7 +2406,7 @@ Mathematica:
   aliases:
   - mma
   ace_mode: text
-  codemirror_mode: mathematica
+  codemirror_mode: text/x-mathematica
   language_id: 224
 Matlab:
   type: programming
@@ -2418,7 +2417,7 @@ Matlab:
   - ".matlab"
   - ".m"
   ace_mode: matlab
-  codemirror_mode: octave
+  codemirror_mode: text/x-octave
   language_id: 225
 Maven POM:
   type: data
@@ -2426,7 +2425,7 @@ Maven POM:
   filenames:
   - pom.xml
   ace_mode: xml
-  codemirror_mode: xml
+  codemirror_mode: text/xml
   language_id: 226
 Max:
   type: programming
@@ -2443,7 +2442,7 @@ Max:
   - ".pat"
   tm_scope: source.json
   ace_mode: json
-  codemirror_mode: javascript
+  codemirror_mode: application/json
   language_id: 227
 MediaWiki:
   type: prose
@@ -2472,7 +2471,7 @@ Metal:
   - ".metal"
   tm_scope: source.c++
   ace_mode: c_cpp
-  codemirror_mode: clike
+  codemirror_mode: text/x-c++src
   language_id: 230
 MiniD:
   type: programming
@@ -2493,7 +2492,7 @@ Mirah:
   - ".mirah"
   tm_scope: source.ruby
   ace_mode: ruby
-  codemirror_mode: ruby
+  codemirror_mode: text/x-ruby
   language_id: 232
 Modelica:
   type: programming
@@ -2501,7 +2500,7 @@ Modelica:
   - ".mo"
   tm_scope: source.modelica
   ace_mode: text
-  codemirror_mode: modelica
+  codemirror_mode: text/x-modelica
   language_id: 233
 Modula-2:
   type: programming
@@ -2571,7 +2570,7 @@ NSIS:
   - ".nsi"
   - ".nsh"
   ace_mode: text
-  codemirror_mode: nsis
+  codemirror_mode: text/x-nsis
   language_id: 242
 Nemerle:
   type: programming
@@ -2605,7 +2604,7 @@ NetLogo:
   - ".nlogo"
   tm_scope: source.lisp
   ace_mode: lisp
-  codemirror_mode: commonlisp
+  codemirror_mode: text/x-common-lisp
   language_id: 246
 NewLisp:
   type: programming
@@ -2619,7 +2618,7 @@ NewLisp:
   - newlisp
   tm_scope: source.lisp
   ace_mode: lisp
-  codemirror_mode: commonlisp
+  codemirror_mode: text/x-common-lisp
   language_id: 247
 Nginx:
   type: markup
@@ -2632,7 +2631,7 @@ Nginx:
   aliases:
   - nginx configuration file
   ace_mode: text
-  codemirror_mode: nginx
+  codemirror_mode: text/x-nginx-conf
   color: "#9469E9"
   language_id: 248
 Nimrod:
@@ -2680,7 +2679,7 @@ Nu:
   - Nukefile
   tm_scope: source.nu
   ace_mode: scheme
-  codemirror_mode: scheme
+  codemirror_mode: text/x-scheme
   interpreters:
   - nush
   language_id: 253
@@ -2693,13 +2692,13 @@ NumPy:
   - ".numsc"
   tm_scope: none
   ace_mode: text
-  codemirror_mode: python
+  codemirror_mode: text/x-python
   color: "#9C8AF9"
   language_id: 254
 OCaml:
   type: programming
   ace_mode: ocaml
-  codemirror_mode: mllike
+  codemirror_mode: text/x-ocaml
   color: "#3be133"
   extensions:
   - ".ml"
@@ -2721,7 +2720,7 @@ ObjDump:
   - ".objdump"
   tm_scope: objdump.x86asm
   ace_mode: assembly_x86
-  codemirror_mode: gas
+  codemirror_mode: text/x-gas
   language_id: 256
 Objective-C:
   type: programming
@@ -2735,7 +2734,7 @@ Objective-C:
   - ".m"
   - ".h"
   ace_mode: objectivec
-  codemirror_mode: clike
+  codemirror_mode: text/x-objectivec
   language_id: 257
 Objective-C++:
   type: programming
@@ -2748,7 +2747,7 @@ Objective-C++:
   extensions:
   - ".mm"
   ace_mode: objectivec
-  codemirror_mode: clike
+  codemirror_mode: text/x-objectivec
   language_id: 258
 Objective-J:
   type: programming
@@ -2793,7 +2792,7 @@ OpenCL:
   - ".opencl"
   tm_scope: source.c
   ace_mode: c_cpp
-  codemirror_mode: clike
+  codemirror_mode: text/x-csrc
   language_id: 263
 OpenEdge ABL:
   type: programming
@@ -2816,7 +2815,7 @@ OpenRC runscript:
   - openrc-run
   tm_scope: source.shell
   ace_mode: sh
-  codemirror_mode: shell
+  codemirror_mode: text/x-sh
   language_id: 265
 OpenSCAD:
   type: programming
@@ -2857,7 +2856,7 @@ Oz:
   - ".oz"
   tm_scope: source.oz
   ace_mode: text
-  codemirror_mode: oz
+  codemirror_mode: text/x-oz
   language_id: 270
 PAWN:
   type: programming
@@ -2872,7 +2871,7 @@ PHP:
   type: programming
   tm_scope: text.html.php
   ace_mode: php
-  codemirror_mode: php
+  codemirror_mode: application/x-httpd-php
   color: "#4F5D95"
   extensions:
   - ".php"
@@ -2895,7 +2894,7 @@ PHP:
 PLSQL:
   type: programming
   ace_mode: sql
-  codemirror_mode: sql
+  codemirror_mode: text/x-plsql
   tm_scope: none
   color: "#dad8d8"
   extensions:
@@ -2910,7 +2909,7 @@ PLSQL:
 PLpgSQL:
   type: programming
   ace_mode: pgsql
-  codemirror_mode: sql
+  codemirror_mode: text/x-sql
   tm_scope: source.sql
   extensions:
   - ".sql"
@@ -2987,13 +2986,13 @@ Pascal:
   interpreters:
   - instantfpc
   ace_mode: pascal
-  codemirror_mode: pascal
+  codemirror_mode: text/x-pascal
   language_id: 281
 Perl:
   type: programming
   tm_scope: source.perl
   ace_mode: perl
-  codemirror_mode: perl
+  codemirror_mode: text/x-perl
   color: "#0298c3"
   extensions:
   - ".pl"
@@ -3031,7 +3030,7 @@ Perl6:
   - perl6
   tm_scope: source.perl6fe
   ace_mode: perl
-  codemirror_mode: perl
+  codemirror_mode: text/x-perl
   language_id: 283
 Pickle:
   type: data
@@ -3071,7 +3070,7 @@ Pike:
 Pod:
   type: prose
   ace_mode: perl
-  codemirror_mode: perl
+  codemirror_mode: text/x-perl
   wrap: true
   extensions:
   - ".pod"
@@ -3117,7 +3116,7 @@ PowerBuilder:
 PowerShell:
   type: programming
   ace_mode: powershell
-  codemirror_mode: powershell
+  codemirror_mode: text/x-powershell
   aliases:
   - posh
   extensions:
@@ -3163,7 +3162,7 @@ Protocol Buffer:
   - ".proto"
   tm_scope: source.protobuf
   ace_mode: protobuf
-  codemirror_mode: protobuf
+  codemirror_mode: text/x-protobuf
   language_id: 297
 Public Key:
   type: data
@@ -3181,7 +3180,7 @@ Puppet:
   filenames:
   - Modulefile
   ace_mode: text
-  codemirror_mode: puppet
+  codemirror_mode: text/x-puppet
   tm_scope: source.puppet
   language_id: 299
 Pure Data:
@@ -3208,12 +3207,12 @@ PureScript:
   - ".purs"
   tm_scope: source.purescript
   ace_mode: haskell
-  codemirror_mode: haskell
+  codemirror_mode: text/x-haskell
   language_id: 302
 Python:
   type: programming
   ace_mode: python
-  codemirror_mode: python
+  codemirror_mode: text/x-python
   color: "#3572A5"
   extensions:
   - ".py"
@@ -3288,12 +3287,12 @@ R:
   interpreters:
   - Rscript
   ace_mode: r
-  codemirror_mode: r
+  codemirror_mode: text/x-rsrc
   language_id: 307
 RAML:
   type: markup
   ace_mode: yaml
-  codemirror_mode: yaml
+  codemirror_mode: text/x-yaml
   tm_scope: source.yaml
   color: "#77d9fb"
   extensions:
@@ -3339,13 +3338,13 @@ RHTML:
   aliases:
   - html+ruby
   ace_mode: rhtml
-  codemirror_mode: htmlembedded
+  codemirror_mode: application/x-erb
   language_id: 312
 RMarkdown:
   type: prose
   wrap: true
   ace_mode: markdown
-  codemirror_mode: markdown
+  codemirror_mode: text/x-gfm
   extensions:
   - ".rmd"
   tm_scope: source.gfm
@@ -3358,7 +3357,7 @@ RPM Spec:
   aliases:
   - specfile
   ace_mode: text
-  codemirror_mode: rpm
+  codemirror_mode: text/x-rpm-spec
   language_id: 314
 RUNOFF:
   type: markup
@@ -3461,7 +3460,7 @@ RobotFramework:
 Rouge:
   type: programming
   ace_mode: clojure
-  codemirror_mode: clojure
+  codemirror_mode: text/x-clojure
   color: "#cc0088"
   extensions:
   - ".rg"
@@ -3470,7 +3469,7 @@ Rouge:
 Ruby:
   type: programming
   ace_mode: ruby
-  codemirror_mode: ruby
+  codemirror_mode: text/x-ruby
   color: "#701516"
   aliases:
   - jruby
@@ -3532,7 +3531,7 @@ Rust:
   - ".rs"
   - ".rs.in"
   ace_mode: rust
-  codemirror_mode: rust
+  codemirror_mode: text/x-rustsrc
   language_id: 327
 SAS:
   type: programming
@@ -3541,14 +3540,14 @@ SAS:
   - ".sas"
   tm_scope: source.sas
   ace_mode: text
-  codemirror_mode: sas
+  codemirror_mode: text/x-sas
   language_id: 328
 SCSS:
   type: markup
   tm_scope: source.scss
   group: CSS
   ace_mode: scss
-  codemirror_mode: css
+  codemirror_mode: text/x-scss
   extensions:
   - ".scss"
   color: "#CF649A"
@@ -3576,7 +3575,7 @@ SPARQL:
   type: data
   tm_scope: source.sparql
   ace_mode: text
-  codemirror_mode: sparql
+  codemirror_mode: application/sparql-query
   extensions:
   - ".sparql"
   - ".rq"
@@ -3594,7 +3593,7 @@ SQL:
   type: data
   tm_scope: source.sql
   ace_mode: sql
-  codemirror_mode: sql
+  codemirror_mode: text/x-sql
   extensions:
   - ".sql"
   - ".cql"
@@ -3608,7 +3607,7 @@ SQL:
 SQLPL:
   type: programming
   ace_mode: sql
-  codemirror_mode: sql
+  codemirror_mode: text/x-sql
   tm_scope: source.sql
   extensions:
   - ".sql"
@@ -3619,7 +3618,7 @@ SRecode Template:
   color: "#348a34"
   tm_scope: source.lisp
   ace_mode: lisp
-  codemirror_mode: commonlisp
+  codemirror_mode: text/x-common-lisp
   extensions:
   - ".srt"
   language_id: 335
@@ -3637,7 +3636,7 @@ SVG:
   - ".svg"
   tm_scope: text.xml
   ace_mode: xml
-  codemirror_mode: xml
+  codemirror_mode: text/xml
   language_id: 337
 Sage:
   type: programming
@@ -3647,7 +3646,7 @@ Sage:
   - ".sagews"
   tm_scope: source.python
   ace_mode: python
-  codemirror_mode: python
+  codemirror_mode: text/x-python
   language_id: 338
 SaltStack:
   type: programming
@@ -3659,7 +3658,7 @@ SaltStack:
   - ".sls"
   tm_scope: source.yaml.salt
   ace_mode: yaml
-  codemirror_mode: yaml
+  codemirror_mode: text/x-yaml
   language_id: 339
 Sass:
   type: markup
@@ -3668,13 +3667,13 @@ Sass:
   extensions:
   - ".sass"
   ace_mode: sass
-  codemirror_mode: sass
+  codemirror_mode: text/x-sass
   color: "#CF649A"
   language_id: 340
 Scala:
   type: programming
   ace_mode: scala
-  codemirror_mode: clike
+  codemirror_mode: text/x-scala
   color: "#c22d40"
   extensions:
   - ".scala"
@@ -3708,7 +3707,7 @@ Scheme:
   - gosh
   - r6rs
   ace_mode: scheme
-  codemirror_mode: scheme
+  codemirror_mode: text/x-scheme
   language_id: 343
 Scilab:
   type: programming
@@ -3760,7 +3759,7 @@ Shell:
   - sh
   - zsh
   ace_mode: sh
-  codemirror_mode: shell
+  codemirror_mode: text/x-sh
   language_id: 346
 ShellSession:
   type: programming
@@ -3771,7 +3770,7 @@ ShellSession:
   - console
   tm_scope: text.shell-session
   ace_mode: sh
-  codemirror_mode: shell
+  codemirror_mode: text/x-sh
   language_id: 347
 Shen:
   type: programming
@@ -3797,7 +3796,7 @@ Slim:
   - ".slim"
   tm_scope: text.slim
   ace_mode: text
-  codemirror_mode: slim
+  codemirror_mode: text/x-slim
   language_id: 350
 Smali:
   type: programming
@@ -3815,14 +3814,14 @@ Smalltalk:
   aliases:
   - squeak
   ace_mode: text
-  codemirror_mode: smalltalk
+  codemirror_mode: text/x-stsrc
   language_id: 352
 Smarty:
   type: programming
   extensions:
   - ".tpl"
   ace_mode: smarty
-  codemirror_mode: smarty
+  codemirror_mode: text/x-smarty
   tm_scope: text.html.smarty
   language_id: 353
 SourcePawn:
@@ -3844,7 +3843,7 @@ Squirrel:
   - ".nut"
   tm_scope: source.c++
   ace_mode: c_cpp
-  codemirror_mode: clike
+  codemirror_mode: text/x-c++src
   language_id: 355
 Stan:
   type: programming
@@ -3866,7 +3865,7 @@ Standard ML:
   - ".sml"
   tm_scope: source.ml
   ace_mode: text
-  codemirror_mode: mllike
+  codemirror_mode: text/x-ocaml
   language_id: 357
 Stata:
   type: programming
@@ -3887,7 +3886,6 @@ Stylus:
   - ".styl"
   tm_scope: source.stylus
   ace_mode: stylus
-  codemirror_mode: stylus
   language_id: 359
 SubRip Text:
   type: data
@@ -3914,7 +3912,7 @@ Swift:
   extensions:
   - ".swift"
   ace_mode: text
-  codemirror_mode: swift
+  codemirror_mode: text/x-swift
   language_id: 362
 SystemVerilog:
   type: programming
@@ -3924,7 +3922,7 @@ SystemVerilog:
   - ".svh"
   - ".vh"
   ace_mode: verilog
-  codemirror_mode: verilog
+  codemirror_mode: text/x-systemverilog
   language_id: 363
 TLA:
   type: programming
@@ -3939,7 +3937,7 @@ TOML:
   - ".toml"
   tm_scope: source.toml
   ace_mode: toml
-  codemirror_mode: toml
+  codemirror_mode: text/x-toml
   language_id: 365
 TXL:
   type: programming
@@ -3959,7 +3957,7 @@ Tcl:
   - tclsh
   - wish
   ace_mode: tcl
-  codemirror_mode: tcl
+  codemirror_mode: text/x-tcl
   language_id: 367
 Tcsh:
   type: programming
@@ -3969,13 +3967,13 @@ Tcsh:
   - ".csh"
   tm_scope: source.shell
   ace_mode: sh
-  codemirror_mode: shell
+  codemirror_mode: text/x-sh
   language_id: 368
 TeX:
   type: markup
   color: "#3D6117"
   ace_mode: tex
-  codemirror_mode: stex
+  codemirror_mode: text/x-stex
   wrap: true
   aliases:
   - latex
@@ -4009,7 +4007,7 @@ Terra:
   - ".t"
   color: "#00004c"
   ace_mode: lua
-  codemirror_mode: lua
+  codemirror_mode: text/x-lua
   interpreters:
   - lua
   language_id: 371
@@ -4042,7 +4040,7 @@ Text:
 Textile:
   type: prose
   ace_mode: textile
-  codemirror_mode: textile
+  codemirror_mode: text/x-textile
   wrap: true
   extensions:
   - ".textile"
@@ -4070,7 +4068,7 @@ Turtle:
   - ".ttl"
   tm_scope: source.turtle
   ace_mode: text
-  codemirror_mode: turtle
+  codemirror_mode: text/turtle
   language_id: 376
 Twig:
   type: markup
@@ -4079,7 +4077,7 @@ Twig:
   - ".twig"
   tm_scope: text.html.twig
   ace_mode: twig
-  codemirror_mode: twig
+  codemirror_mode: text/x-twig
   language_id: 377
 TypeScript:
   type: programming
@@ -4091,13 +4089,13 @@ TypeScript:
   - ".tsx"
   tm_scope: source.ts
   ace_mode: typescript
-  codemirror_mode: javascript
+  codemirror_mode: text/x-typescript
   language_id: 378
 Unified Parallel C:
   type: programming
   group: C
   ace_mode: c_cpp
-  codemirror_mode: clike
+  codemirror_mode: text/x-csrc
   color: "#4e3617"
   extensions:
   - ".upc"
@@ -4106,7 +4104,7 @@ Unified Parallel C:
 Unity3D Asset:
   type: data
   ace_mode: yaml
-  codemirror_mode: yaml
+  codemirror_mode: text/x-yaml
   extensions:
   - ".anim"
   - ".asset"
@@ -4121,7 +4119,7 @@ Uno:
   extensions:
   - ".uno"
   ace_mode: csharp
-  codemirror_mode: clike
+  codemirror_mode: text/x-csharp
   tm_scope: source.cs
   language_id: 381
 UnrealScript:
@@ -4131,7 +4129,7 @@ UnrealScript:
   - ".uc"
   tm_scope: source.java
   ace_mode: java
-  codemirror_mode: clike
+  codemirror_mode: text/x-java
   language_id: 382
 UrWeb:
   type: programming
@@ -4165,7 +4163,7 @@ VHDL:
   - ".vht"
   - ".vhw"
   ace_mode: vhdl
-  codemirror_mode: vhdl
+  codemirror_mode: text/x-vhdl
   language_id: 385
 Vala:
   type: programming
@@ -4182,7 +4180,7 @@ Verilog:
   - ".v"
   - ".veo"
   ace_mode: verilog
-  codemirror_mode: verilog
+  codemirror_mode: text/x-verilog
   language_id: 387
 VimL:
   type: programming
@@ -4220,7 +4218,7 @@ Visual Basic:
   - vb.net
   - vbnet
   ace_mode: text
-  codemirror_mode: vb
+  codemirror_mode: text/x-vb
   language_id: 389
 Volt:
   type: programming
@@ -4229,7 +4227,7 @@ Volt:
   - ".volt"
   tm_scope: source.d
   ace_mode: d
-  codemirror_mode: d
+  codemirror_mode: text/x-d
   language_id: 390
 Vue:
   type: markup
@@ -4238,7 +4236,6 @@ Vue:
   - ".vue"
   tm_scope: text.html.vue
   ace_mode: html
-  codemirror_mode: vue
   language_id: 391
 Wavefront Material:
   type: data
@@ -4268,7 +4265,7 @@ WebIDL:
   - ".webidl"
   tm_scope: source.webidl
   ace_mode: text
-  codemirror_mode: webidl
+  codemirror_mode: text/x-webidl
   language_id: 395
 World of Warcraft Addon Data:
   type: data
@@ -4294,12 +4291,12 @@ XC:
   - ".xc"
   tm_scope: source.xc
   ace_mode: c_cpp
-  codemirror_mode: clike
+  codemirror_mode: text/x-csrc
   language_id: 398
 XML:
   type: data
   ace_mode: xml
-  codemirror_mode: xml
+  codemirror_mode: text/xml
   aliases:
   - rss
   - xsd
@@ -4408,7 +4405,7 @@ XPages:
   - ".xsp.metadata"
   tm_scope: none
   ace_mode: xml
-  codemirror_mode: xml
+  codemirror_mode: text/xml
   language_id: 400
 XProc:
   type: programming
@@ -4417,7 +4414,7 @@ XProc:
   - ".xproc"
   tm_scope: text.xml
   ace_mode: xml
-  codemirror_mode: xml
+  codemirror_mode: text/xml
   language_id: 401
 XQuery:
   type: programming
@@ -4429,7 +4426,7 @@ XQuery:
   - ".xqm"
   - ".xqy"
   ace_mode: xquery
-  codemirror_mode: xquery
+  codemirror_mode: application/xquery
   tm_scope: source.xq
   language_id: 402
 XS:
@@ -4438,7 +4435,7 @@ XS:
   - ".xs"
   tm_scope: source.c
   ace_mode: c_cpp
-  codemirror_mode: clike
+  codemirror_mode: text/x-csrc
   language_id: 403
 XSLT:
   type: programming
@@ -4449,7 +4446,7 @@ XSLT:
   - ".xsl"
   tm_scope: text.xml.xsl
   ace_mode: xml
-  codemirror_mode: xml
+  codemirror_mode: text/xml
   color: "#EB8CEB"
   language_id: 404
 Xojo:
@@ -4486,7 +4483,7 @@ YAML:
   filenames:
   - ".clang-format"
   ace_mode: yaml
-  codemirror_mode: yaml
+  codemirror_mode: text/x-yaml
   language_id: 407
 YANG:
   type: data
@@ -4543,7 +4540,7 @@ eC:
 edn:
   type: data
   ace_mode: clojure
-  codemirror_mode: clojure
+  codemirror_mode: text/x-clojure
   extensions:
   - ".edn"
   tm_scope: source.clojure
@@ -4591,11 +4588,12 @@ reStructuredText:
   - ".rest.txt"
   - ".rst.txt"
   ace_mode: text
-  codemirror_mode: rst
+  codemirror_mode: text/x-rst
   language_id: 419
 wisp:
   type: programming
   ace_mode: clojure
+  codemirror_mode: text/x-clojure
   color: "#7582D1"
   extensions:
   - ".wisp"
diff --git a/test/test_language.rb b/test/test_language.rb
index fec4e29b..4409ae4e 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -350,7 +350,7 @@ class TestLanguage < Minitest::Test
   end
 
   def test_codemirror_mode
-    assert_equal 'clike', Language['C++'].codemirror_mode
+    assert_equal 'text/x-c++src', Language['C++'].codemirror_mode
   end
 
   def test_wrap

From fdb962518f9a3ecfce32377e1e59c07523eb5253 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Fri, 23 Sep 2016 13:54:55 -0700
Subject: [PATCH 2/8] Consistent CodeMirror casing

---
 lib/linguist/language.rb   | 2 +-
 lib/linguist/languages.yml | 2 +-
 lib/linguist/vendor.yml    | 2 +-
 test/test_file_blob.rb     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb
index c84ad08f..310fd798 100644
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -399,7 +399,7 @@ module Linguist
     # Returns a String name or nil
     attr_reader :ace_mode
 
-    # Public: Get Codemirror mode (as expressed by a mimetype)
+    # Public: Get CodeMirror mode (as expressed by a mimetype)
     #
     # Examples
     #
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 5762f715..735ba2f0 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -6,7 +6,7 @@
 # ace_mode          - A String name of the Ace Mode used for highlighting whenever
 #                     a file is edited. This must match one of the filenames in http://git.io/3XO_Cg.
 #                     Use "text" if a mode does not exist.
-# codemirror_mode   - A String name of the Codemirror Mode used for highlighting whenever a file is edited.
+# codemirror_mode   - A String name of the CodeMirror Mode used for highlighting whenever a file is edited.
 #                     This must match a mode from https://git.io/vi9Fx
 # wrap              - Boolean wrap to enable line wrapping (default: false)
 # extensions        - An Array of associated extensions (the first one is
diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml
index 6b8c7364..e500f85d 100644
--- a/lib/linguist/vendor.yml
+++ b/lib/linguist/vendor.yml
@@ -165,7 +165,7 @@
 # Chart.js
 - (^|/)Chart\.js$
 
-# Codemirror
+# CodeMirror
 - (^|/)[Cc]ode[Mm]irror/(\d+\.\d+/)?(lib|mode|theme|addon|keymap|demo)
 
 # SyntaxHighlighter - http://alexgorbatchev.com/
diff --git a/test/test_file_blob.rb b/test/test_file_blob.rb
index 383b170e..84cee723 100644
--- a/test/test_file_blob.rb
+++ b/test/test_file_blob.rb
@@ -317,7 +317,7 @@ class TestFileBlob < Minitest::Test
     assert sample_blob("some/vendored/path/Chart.js").vendored?
     assert !sample_blob("some/vendored/path/chart.js").vendored?
 
-    # Codemirror deps
+    # CodeMirror deps
     assert sample_blob("codemirror/mode/blah.js").vendored?
     assert sample_blob("codemirror/5.0/mode/blah.js").vendored?
 

From daefff86ff188cf3ae87e17051558d8f79535367 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Fri, 23 Sep 2016 13:57:50 -0700
Subject: [PATCH 3/8] Fix JSX mode

---
 lib/linguist/languages.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 735ba2f0..e9ff1c5f 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1903,7 +1903,8 @@ JSX:
   extensions:
   - ".jsx"
   tm_scope: source.js.jsx
-  ace_mode: text/jsx
+  ace_mode: jsx
+  codemirror_mode: text/jsx
   language_id: 178
 Jade:
   group: HTML

From 0108ef438661994c929cc378a6d113d1ccb3d369 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Fri, 23 Sep 2016 14:35:02 -0700
Subject: [PATCH 4/8] Restore old mode

---
 lib/linguist/language.rb   |  17 +-
 lib/linguist/languages.yml | 581 +++++++++++++++++++++++++------------
 test/test_language.rb      |  12 +-
 3 files changed, 414 insertions(+), 196 deletions(-)

diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb
index 310fd798..ea88b87f 100644
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -302,6 +302,7 @@ module Linguist
 
       @ace_mode = attributes[:ace_mode]
       @codemirror_mode = attributes[:codemirror_mode]
+      @codemirror_mime_mode = attributes[:codemirror_mime_mode]
       @wrap = attributes[:wrap] || false
 
       # Set legacy search term
@@ -399,7 +400,18 @@ module Linguist
     # Returns a String name or nil
     attr_reader :ace_mode
 
-    # Public: Get CodeMirror mode (as expressed by a mimetype)
+    # Public: Get CodeMirror mode
+    #
+    # Examples
+    #
+    #  # => "nil"
+    #  # => "javascript"
+    #  # => "clike"
+    #
+    # Returns a String name or nil
+    attr_reader :codemirror_mode
+
+    # Public: Get CodeMirror MIME type mode
     #
     # Examples
     #
@@ -408,7 +420,7 @@ module Linguist
     #  # => "text/x-csrc"
     #
     # Returns a String name or nil
-    attr_reader :codemirror_mode
+    attr_reader :codemirror_mime_mode
 
     # Public: Should language lines be wrapped
     #
@@ -587,6 +599,7 @@ module Linguist
       :tm_scope          => options['tm_scope'],
       :ace_mode          => options['ace_mode'],
       :codemirror_mode   => options['codemirror_mode'],
+      :codemirror_mime_mode => options['codemirror_mime_mode'],
       :wrap              => options['wrap'],
       :group_name        => options['group'],
       :searchable        => options.fetch('searchable', true),
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index e9ff1c5f..36b61047 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -59,7 +59,8 @@ AGS Script:
   - ".ash"
   tm_scope: source.c++
   ace_mode: c_cpp
-  codemirror_mode: text/x-c++src
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-c++src
   language_id: 2
 AMPL:
   type: programming
@@ -97,7 +98,8 @@ APL:
   - dyalog
   tm_scope: source.apl
   ace_mode: text
-  codemirror_mode: text/apl
+  codemirror_mode: apl
+  codemirror_mime_mode: text/apl
   language_id: 6
 ASN.1:
   type: data
@@ -107,7 +109,8 @@ ASN.1:
   - ".asn1"
   tm_scope: source.asn
   ace_mode: text
-  codemirror_mode: text/x-ttcn-asn
+  codemirror_mode: asn.1
+  codemirror_mime_mode: text/x-ttcn-asn
   language_id: 7
 ASP:
   type: programming
@@ -126,7 +129,8 @@ ASP:
   - ".aspx"
   - ".axd"
   ace_mode: text
-  codemirror_mode: application/x-aspx
+  codemirror_mode: htmlembedded
+  codemirror_mime_mode: application/x-aspx
   language_id: 8
 ATS:
   type: programming
@@ -189,7 +193,8 @@ Alpine Abuild:
   - APKBUILD
   tm_scope: source.shell
   ace_mode: sh
-  codemirror_mode: text/x-sh
+  codemirror_mode: shell
+  codemirror_mime_mode: text/x-sh
   language_id: 14
 Ant Build System:
   type: data
@@ -198,7 +203,8 @@ Ant Build System:
   - ant.xml
   - build.xml
   ace_mode: xml
-  codemirror_mode: application/xml
+  codemirror_mode: xml
+  codemirror_mime_mode: application/xml
   language_id: 15
 ApacheConf:
   type: markup
@@ -217,7 +223,8 @@ Apex:
   - ".cls"
   tm_scope: source.java
   ace_mode: java
-  codemirror_mode: text/x-java
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-java
   language_id: 17
 Apollo Guidance Computer:
   type: programming
@@ -227,7 +234,8 @@ Apollo Guidance Computer:
   - ".agc"
   tm_scope: source.agc
   ace_mode: assembly_x86
-  codemirror_mode:  text/x-gas
+  codemirror_mode: gas
+  codemirror_mime_mode: text/x-gas
   language_id: 18
 AppleScript:
   type: programming
@@ -256,7 +264,8 @@ Arduino:
   - ".ino"
   tm_scope: source.c++
   ace_mode: c_cpp
-  codemirror_mode: text/x-c++src
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-c++src
   language_id: 21
 AsciiDoc:
   type: prose
@@ -289,7 +298,8 @@ Assembly:
   - ".nasm"
   tm_scope: source.assembly
   ace_mode: assembly_x86
-  codemirror_mode: text/x-gas
+  codemirror_mode: gas
+  codemirror_mime_mode: text/x-gas
   language_id: 24
 Augeas:
   type: programming
@@ -427,7 +437,8 @@ Brainfuck:
   - ".bf"
   tm_scope: source.bf
   ace_mode: text
-  codemirror_mode: text/x-brainfuck
+  codemirror_mode: brainfuck
+  codemirror_mime_mode: text/x-brainfuck
   language_id: 38
 Brightscript:
   type: programming
@@ -454,12 +465,14 @@ C:
   interpreters:
   - tcc
   ace_mode: c_cpp
-  codemirror_mode: text/x-csrc
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-csrc
   language_id: 41
 C#:
   type: programming
   ace_mode: csharp
-  codemirror_mode: text/x-csharp
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-csharp
   tm_scope: source.cs
   search_term: csharp
   color: "#178600"
@@ -474,7 +487,8 @@ C#:
 C++:
   type: programming
   ace_mode: c_cpp
-  codemirror_mode: text/x-c++src
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-c++src
   search_term: cpp
   color: "#f34b7d"
   aliases:
@@ -502,7 +516,8 @@ C-ObjDump:
   - ".c-objdump"
   tm_scope: objdump.x86asm
   ace_mode: assembly_x86
-  codemirror_mode: text/x-gas
+  codemirror_mode: gas
+  codemirror_mime_mode: text/x-gas
   language_id: 44
 C2hs Haskell:
   type: programming
@@ -513,7 +528,8 @@ C2hs Haskell:
   - ".chs"
   tm_scope: source.haskell
   ace_mode: haskell
-  codemirror_mode: text/x-haskell
+  codemirror_mode: haskell
+  codemirror_mime_mode: text/x-haskell
   language_id: 45
 CLIPS:
   type: programming
@@ -530,7 +546,8 @@ CMake:
   filenames:
   - CMakeLists.txt
   ace_mode: text
-  codemirror_mode: text/x-cmake
+  codemirror_mode: cmake
+  codemirror_mime_mode: text/x-cmake
   language_id: 47
 COBOL:
   type: programming
@@ -541,7 +558,8 @@ COBOL:
   - ".cobol"
   - ".cpy"
   ace_mode: cobol
-  codemirror_mode: text/x-cobol
+  codemirror_mode: cobol
+  codemirror_mime_mode: text/x-cobol
   language_id: 48
 COLLADA:
   type: data
@@ -549,13 +567,15 @@ COLLADA:
   - ".dae"
   tm_scope: text.xml
   ace_mode: xml
-  codemirror_mode: text/x-xml
+  codemirror_mode: xml
+  codemirror_mime_mode: text/x-xml
   language_id: 49
 CSS:
   type: markup
   tm_scope: source.css
   ace_mode: css
-  codemirror_mode: text/css
+  codemirror_mode: css
+  codemirror_mime_mode: text/css
   color: "#563d7c"
   extensions:
   - ".css"
@@ -611,7 +631,8 @@ ChucK:
   - ".ck"
   tm_scope: source.java
   ace_mode: java
-  codemirror_mode: text/x-java
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-java
   language_id: 57
 Cirru:
   type: programming
@@ -648,7 +669,8 @@ Click:
 Clojure:
   type: programming
   ace_mode: clojure
-  codemirror_mode: text/x-clojure
+  codemirror_mode: clojure
+  codemirror_mime_mode: text/x-clojure
   color: "#db5855"
   extensions:
   - ".clj"
@@ -667,7 +689,8 @@ CoffeeScript:
   type: programming
   tm_scope: source.coffee
   ace_mode: coffee
-  codemirror_mode: text/x-coffeescript
+  codemirror_mode: coffeescript
+  codemirror_mime_mode: text/x-coffeescript
   color: "#244776"
   aliases:
   - coffee
@@ -733,7 +756,8 @@ Common Lisp:
   - clisp
   - ecl
   ace_mode: lisp
-  codemirror_mode: text/x-common-lisp
+  codemirror_mode: commonlisp
+  codemirror_mime_mode: text/x-common-lisp
   language_id: 66
 Component Pascal:
   type: programming
@@ -746,7 +770,8 @@ Component Pascal:
   - delphi
   - objectpascal
   ace_mode: pascal
-  codemirror_mode: text/x-pascal
+  codemirror_mode: pascal
+  codemirror_mime_mode: text/x-pascal
   language_id: 67
 Cool:
   type: programming
@@ -774,7 +799,8 @@ Cpp-ObjDump:
   aliases:
   - c++-objdump
   ace_mode: assembly_x86
-  codemirror_mode: text/x-gas
+  codemirror_mode: gas
+  codemirror_mime_mode: text/x-gas
   language_id: 70
 Creole:
   type: prose
@@ -790,7 +816,8 @@ Crystal:
   extensions:
   - ".cr"
   ace_mode: ruby
-  codemirror_mode: text/x-crystal
+  codemirror_mode: crystal
+  codemirror_mime_mode: text/x-crystal
   tm_scope: source.crystal
   interpreters:
   - crystal
@@ -840,7 +867,8 @@ Cuda:
   - ".cuh"
   tm_scope: source.cuda-c++
   ace_mode: c_cpp
-  codemirror_mode: text/x-c++src
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-c++src
   color: "#3A4E3A"
   language_id: 77
 Cycript:
@@ -849,7 +877,8 @@ Cycript:
   - ".cy"
   tm_scope: source.js
   ace_mode: javascript
-  codemirror_mode: text/javascript
+  codemirror_mode: javascript
+  codemirror_mime_mode: text/javascript
   language_id: 78
 Cython:
   type: programming
@@ -861,7 +890,8 @@ Cython:
   aliases:
   - pyrex
   ace_mode: text
-  codemirror_mode: text/x-cython
+  codemirror_mode: python
+  codemirror_mime_mode: text/x-cython
   language_id: 79
 D:
   type: programming
@@ -870,7 +900,8 @@ D:
   - ".d"
   - ".di"
   ace_mode: d
-  codemirror_mode: text/x-d
+  codemirror_mode: d
+  codemirror_mime_mode: text/x-d
   language_id: 80
 D-ObjDump:
   type: data
@@ -878,7 +909,8 @@ D-ObjDump:
   - ".d-objdump"
   tm_scope: objdump.x86asm
   ace_mode: assembly_x86
-  codemirror_mode: text/x-gas
+  codemirror_mode: gas
+  codemirror_mime_mode: text/x-gas
   language_id: 81
 DIGITAL Command Language:
   type: programming
@@ -917,7 +949,8 @@ DTrace:
   - dtrace
   tm_scope: source.c
   ace_mode: c_cpp
-  codemirror_mode: text/x-csrc
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-csrc
   language_id: 85
 Darcs Patch:
   type: data
@@ -938,7 +971,8 @@ Dart:
   interpreters:
   - dart
   ace_mode: dart
-  codemirror_mode: text/x-dart
+  codemirror_mode: dart
+  codemirror_mime_mode: text/x-dart
   language_id: 87
 Diff:
   type: data
@@ -949,7 +983,8 @@ Diff:
   - udiff
   tm_scope: source.diff
   ace_mode: diff
-  codemirror_mode: text/x-diff
+  codemirror_mode: diff
+  codemirror_mime_mode: text/x-diff
   language_id: 88
 Dockerfile:
   type: data
@@ -959,7 +994,8 @@ Dockerfile:
   filenames:
   - Dockerfile
   ace_mode: dockerfile
-  codemirror_mode: text/x-dockerfile
+  codemirror_mode: dockerfile
+  codemirror_mime_mode: text/x-dockerfile
   language_id: 89
 Dogescript:
   type: programming
@@ -978,7 +1014,8 @@ Dylan:
   - ".intr"
   - ".lid"
   ace_mode: text
-  codemirror_mode: text/x-dylan
+  codemirror_mode: dylan
+  codemirror_mime_mode: text/x-dylan
   language_id: 91
 E:
   type: programming
@@ -998,7 +1035,8 @@ ECL:
   - ".eclxml"
   tm_scope: none
   ace_mode: text
-  codemirror_mode: text/x-ecl
+  codemirror_mode: ecl
+  codemirror_mime_mode: text/x-ecl
   language_id: 93
 ECLiPSe:
   type: programming
@@ -1024,7 +1062,8 @@ EQ:
   - ".eq"
   tm_scope: source.cs
   ace_mode: csharp
-  codemirror_mode: text/x-csharp
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-csharp
   language_id: 96
 Eagle:
   type: markup
@@ -1034,7 +1073,8 @@ Eagle:
   - ".brd"
   tm_scope: text.xml
   ace_mode: xml
-  codemirror_mode: text/xml
+  codemirror_mode: xml
+  codemirror_mime_mode: text/xml
   language_id: 97
 Ecere Projects:
   type: data
@@ -1043,7 +1083,8 @@ Ecere Projects:
   - ".epj"
   tm_scope: source.json
   ace_mode: json
-  codemirror_mode: application/json
+  codemirror_mode: json
+  codemirror_mime_mode: application/json
   language_id: 98
 Eiffel:
   type: programming
@@ -1051,7 +1092,8 @@ Eiffel:
   extensions:
   - ".e"
   ace_mode: eiffel
-  codemirror_mode: text/x-eiffel
+  codemirror_mode: eiffel
+  codemirror_mime_mode: text/x-eiffel
   language_id: 99
 Elixir:
   type: programming
@@ -1072,7 +1114,8 @@ Elm:
   - ".elm"
   tm_scope: source.elm
   ace_mode: elm
-  codemirror_mode: text/x-elm
+  codemirror_mode: elm
+  codemirror_mime_mode: text/x-elm
   language_id: 101
 Emacs Lisp:
   type: programming
@@ -1096,7 +1139,8 @@ Emacs Lisp:
   - ".emacs"
   - ".emacs.desktop"
   ace_mode: lisp
-  codemirror_mode: text/x-common-lisp
+  codemirror_mode: commonlisp
+  codemirror_mime_mode: text/x-common-lisp
   language_id: 102
 EmberScript:
   type: programming
@@ -1106,7 +1150,8 @@ EmberScript:
   - ".emberscript"
   tm_scope: source.coffee
   ace_mode: coffee
-  codemirror_mode: text/x-coffeescript
+  codemirror_mode: coffeescript
+  codemirror_mime_mode: text/x-coffeescript
   language_id: 103
 Erlang:
   type: programming
@@ -1124,7 +1169,8 @@ Erlang:
   - rebar.config.lock
   - rebar.lock
   ace_mode: erlang
-  codemirror_mode: text/x-erlang
+  codemirror_mode: erlang
+  codemirror_mime_mode: text/x-erlang
   interpreters:
   - escript
   language_id: 104
@@ -1140,7 +1186,8 @@ F#:
   - ".fsx"
   tm_scope: source.fsharp
   ace_mode: text
-  codemirror_mode: text/x-fsharp
+  codemirror_mode: mllike
+  codemirror_mime_mode: text/x-fsharp
   language_id: 105
 FLUX:
   type: programming
@@ -1165,7 +1212,8 @@ FORTRAN:
   - ".fpp"
   tm_scope: source.fortran.modern
   ace_mode: text
-  codemirror_mode: text/x-fortran
+  codemirror_mode: fortran
+  codemirror_mime_mode: text/x-fortran
   language_id: 107
 Factor:
   type: programming
@@ -1176,7 +1224,8 @@ Factor:
   - ".factor-boot-rc"
   - ".factor-rc"
   ace_mode: text
-  codemirror_mode: text/x-factor
+  codemirror_mode: factor
+  codemirror_mime_mode: text/x-factor
   language_id: 108
 Fancy:
   type: programming
@@ -1232,7 +1281,8 @@ Forth:
   - ".frt"
   - ".fs"
   ace_mode: forth
-  codemirror_mode: text/x-forth
+  codemirror_mode: forth
+  codemirror_mime_mode: text/x-forth
   language_id: 114
 FreeMarker:
   type: programming
@@ -1287,7 +1337,8 @@ GAS:
   - ".ms"
   tm_scope: source.assembly
   ace_mode: assembly_x86
-  codemirror_mode: text/x-gas
+  codemirror_mode: gas
+  codemirror_mime_mode: text/x-gas
   language_id: 120
 GCC Machine Description:
   type: programming
@@ -1295,7 +1346,8 @@ GCC Machine Description:
   - ".md"
   tm_scope: source.lisp
   ace_mode: lisp
-  codemirror_mode: text/x-common-lisp
+  codemirror_mode: commonlisp
+  codemirror_mime_mode: text/x-common-lisp
   language_id: 121
 GDB:
   type: programming
@@ -1340,7 +1392,8 @@ Game Maker Language:
   - ".gml"
   tm_scope: source.c++
   ace_mode: c_cpp
-  codemirror_mode: text/x-c++src
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-c++src
   language_id: 125
 Genshi:
   type: programming
@@ -1351,7 +1404,8 @@ Genshi:
   - xml+genshi
   - xml+kid
   ace_mode: xml
-  codemirror_mode: text/xml
+  codemirror_mode: xml
+  codemirror_mime_mode: text/xml
   language_id: 126
 Gentoo Ebuild:
   type: programming
@@ -1360,7 +1414,8 @@ Gentoo Ebuild:
   - ".ebuild"
   tm_scope: source.shell
   ace_mode: sh
-  codemirror_mode: text/x-sh
+  codemirror_mode: shell
+  codemirror_mime_mode: text/x-sh
   language_id: 127
 Gentoo Eclass:
   type: programming
@@ -1369,7 +1424,8 @@ Gentoo Eclass:
   - ".eclass"
   tm_scope: source.shell
   ace_mode: sh
-  codemirror_mode: text/x-sh
+  codemirror_mode: shell
+  codemirror_mime_mode: text/x-sh
   language_id: 128
 Gettext Catalog:
   type: prose
@@ -1390,7 +1446,8 @@ Glyph:
   - ".glf"
   tm_scope: source.tcl
   ace_mode: tcl
-  codemirror_mode: text/x-tcl
+  codemirror_mode: tcl
+  codemirror_mime_mode: text/x-tcl
   language_id: 130
 Gnuplot:
   type: programming
@@ -1411,7 +1468,8 @@ Go:
   extensions:
   - ".go"
   ace_mode: golang
-  codemirror_mode: text/x-go
+  codemirror_mode: go
+  codemirror_mime_mode: text/x-go
   language_id: 132
 Golo:
   type: programming
@@ -1457,7 +1515,8 @@ Grammatical Framework:
   color: "#79aa7a"
   tm_scope: source.haskell
   ace_mode: haskell
-  codemirror_mode: text/x-haskell
+  codemirror_mode: haskell
+  codemirror_mime_mode: text/x-haskell
   language_id: 137
 Graph Modeling Language:
   type: data
@@ -1517,12 +1576,14 @@ Groff:
   - nroff
   - troff
   ace_mode: text
-  codemirror_mode: text/troff
+  codemirror_mode: troff
+  codemirror_mime_mode: text/troff
   language_id: 141
 Groovy:
   type: programming
   ace_mode: groovy
-  codemirror_mode: text/x-groovy
+  codemirror_mode: groovy
+  codemirror_mime_mode: text/x-groovy
   color: "#e69f56"
   extensions:
   - ".groovy"
@@ -1544,7 +1605,8 @@ Groovy Server Pages:
   - ".gsp"
   tm_scope: text.html.jsp
   ace_mode: jsp
-  codemirror_mode: application/x-jsp
+  codemirror_mode: htmlembedded
+  codemirror_mime_mode: application/x-jsp
   language_id: 143
 HCL:
   type: programming
@@ -1552,7 +1614,8 @@ HCL:
   - ".hcl"
   - ".tf"
   ace_mode: ruby
-  codemirror_mode: text/x-ruby
+  codemirror_mode: ruby
+  codemirror_mime_mode: text/x-ruby
   tm_scope: source.ruby
   language_id: 144
 HLSL:
@@ -1569,7 +1632,8 @@ HTML:
   type: markup
   tm_scope: text.html.basic
   ace_mode: html
-  codemirror_mode: text/html
+  codemirror_mode: html
+  codemirror_mime_mode: text/html
   color: "#e44b23"
   aliases:
   - xhtml
@@ -1595,7 +1659,8 @@ HTML+Django:
   - html+jinja
   - htmldjango
   ace_mode: django
-  codemirror_mode: text/x-django
+  codemirror_mode: django
+  codemirror_mime_mode: text/x-django
   language_id: 147
 HTML+ECR:
   type: markup
@@ -1606,7 +1671,8 @@ HTML+ECR:
   extensions:
   - ".ecr"
   ace_mode: text
-  codemirror_mode: text/html
+  codemirror_mode: htmlembedded
+  codemirror_mime_mode: text/html
   language_id: 148
 HTML+EEX:
   type: markup
@@ -1617,7 +1683,8 @@ HTML+EEX:
   extensions:
   - ".eex"
   ace_mode: text
-  codemirror_mode: text/html
+  codemirror_mode: htmlembedded
+  codemirror_mime_mode: text/html
   language_id: 149
 HTML+ERB:
   type: markup
@@ -1629,7 +1696,8 @@ HTML+ERB:
   - ".erb"
   - ".erb.deface"
   ace_mode: text
-  codemirror_mode: application/x-erb
+  codemirror_mode: htmlembedded
+  codemirror_mime_mode: application/x-erb
   language_id: 150
 HTML+PHP:
   type: markup
@@ -1638,7 +1706,8 @@ HTML+PHP:
   extensions:
   - ".phtml"
   ace_mode: php
-  codemirror_mode: application/x-httpd-php
+  codemirror_mode: php
+  codemirror_mime_mode: application/x-httpd-php
   language_id: 151
 HTTP:
   type: data
@@ -1646,12 +1715,14 @@ HTTP:
   - ".http"
   tm_scope: source.httpspec
   ace_mode: text
-  codemirror_mode: message/http
+  codemirror_mode: http
+  codemirror_mime_mode: message/http
   language_id: 152
 Hack:
   type: programming
   ace_mode: php
-  codemirror_mode: application/x-httpd-php
+  codemirror_mode: php
+  codemirror_mime_mode: application/x-httpd-php
   extensions:
   - ".hh"
   - ".php"
@@ -1665,7 +1736,8 @@ Haml:
   - ".haml"
   - ".haml.deface"
   ace_mode: haml
-  codemirror_mode: text/x-haml
+  codemirror_mode: haml
+  codemirror_mime_mode: text/x-haml
   color: "#ECE2A9"
   language_id: 154
 Handlebars:
@@ -1680,6 +1752,7 @@ Handlebars:
   - ".hbs"
   tm_scope: text.html.handlebars
   ace_mode: handlebars
+  codemirror_mode: handlebars
   language_id: 155
 Harbour:
   type: programming
@@ -1698,12 +1771,14 @@ Haskell:
   interpreters:
   - runhaskell
   ace_mode: haskell
-  codemirror_mode: text/x-haskell
+  codemirror_mode: haskell
+  codemirror_mime_mode: text/x-haskell
   language_id: 157
 Haxe:
   type: programming
   ace_mode: haxe
-  codemirror_mode: text/x-haxe
+  codemirror_mode: haxe
+  codemirror_mime_mode: text/x-haxe
   color: "#df7900"
   extensions:
   - ".hx"
@@ -1734,7 +1809,8 @@ IDL:
   - ".pro"
   - ".dlm"
   ace_mode: text
-  codemirror_mode: text/x-idl
+  codemirror_mode: idl
+  codemirror_mime_mode: text/x-idl
   language_id: 161
 IGOR Pro:
   type: programming
@@ -1758,7 +1834,8 @@ INI:
   aliases:
   - dosini
   ace_mode: ini
-  codemirror_mode: text/x-properties
+  codemirror_mode: properties
+  codemirror_mime_mode: text/x-properties
   language_id: 163
 IRC log:
   type: data
@@ -1858,7 +1935,8 @@ JSON:
   tm_scope: source.json
   group: JavaScript
   ace_mode: json
-  codemirror_mode: application/json
+  codemirror_mode: javascript
+  codemirror_mime_mode: application/json
   searchable: false
   extensions:
   - ".json"
@@ -1877,13 +1955,15 @@ JSON5:
   - ".json5"
   tm_scope: source.js
   ace_mode: javascript
-  codemirror_mode: application/json
+  codemirror_mode: javascript
+  codemirror_mime_mode: application/json
   language_id: 175
 JSONLD:
   type: data
   group: JavaScript
   ace_mode: javascript
-  codemirror_mode: application/ld+json
+  codemirror_mode: javascript
+  codemirror_mime_mode: application/ld+json
   extensions:
   - ".jsonld"
   tm_scope: source.js
@@ -1892,7 +1972,8 @@ JSONiq:
   color: "#40d47e"
   type: programming
   ace_mode: jsoniq
-  codemirror_mode: application/json
+  codemirror_mode: javascript
+  codemirror_mime_mode: application/json
   extensions:
   - ".jq"
   tm_scope: source.jq
@@ -1903,8 +1984,8 @@ JSX:
   extensions:
   - ".jsx"
   tm_scope: source.js.jsx
-  ace_mode: jsx
-  codemirror_mode: text/jsx
+  ace_mode: javascript
+  codemirror_mime_mode: text/jsx
   language_id: 178
 Jade:
   group: HTML
@@ -1914,7 +1995,8 @@ Jade:
   - ".pug"
   tm_scope: text.jade
   ace_mode: jade
-  codemirror_mode: text/x-pug
+  codemirror_mode: pug
+  codemirror_mime_mode: text/x-pug
   language_id: 179
 Jasmin:
   type: programming
@@ -1926,7 +2008,8 @@ Jasmin:
 Java:
   type: programming
   ace_mode: java
-  codemirror_mode: text/x-java
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-java
   color: "#b07219"
   extensions:
   - ".java"
@@ -1941,13 +2024,15 @@ Java Server Pages:
   - ".jsp"
   tm_scope: text.html.jsp
   ace_mode: jsp
-  codemirror_mode: application/x-jsp
+  codemirror_mode: htmlembedded
+  codemirror_mime_mode: application/x-jsp
   language_id: 182
 JavaScript:
   type: programming
   tm_scope: source.js
   ace_mode: javascript
-  codemirror_mode: text/javascript
+  codemirror_mode: javascript
+  codemirror_mime_mode: text/javascript
   color: "#f1e05a"
   aliases:
   - js
@@ -1996,12 +2081,14 @@ Julia:
   - ".jl"
   color: "#a270ba"
   ace_mode: julia
-  codemirror_mode: text/x-julia
+  codemirror_mode: julia
+  codemirror_mime_mode: text/x-julia
   language_id: 184
 Jupyter Notebook:
   type: markup
   ace_mode: json
-  codemirror_mode: application/json
+  codemirror_mode: javascript
+  codemirror_mime_mode: application/json
   tm_scope: source.json
   color: "#DA5B0B"
   extensions:
@@ -2031,7 +2118,8 @@ KiCad:
 Kit:
   type: markup
   ace_mode: html
-  codemirror_mode: text/html
+  codemirror_mode: html
+  codemirror_mime_mode: text/html
   extensions:
   - ".kit"
   tm_scope: text.html.basic
@@ -2045,7 +2133,8 @@ Kotlin:
   - ".kts"
   tm_scope: source.Kotlin
   ace_mode: text
-  codemirror_mode: text/x-kotlin
+  codemirror_mode: kotlin
+  codemirror_mime_mode: text/x-kotlin
   language_id: 189
 LFE:
   type: programming
@@ -2055,7 +2144,8 @@ LFE:
   group: Erlang
   tm_scope: source.lisp
   ace_mode: lisp
-  codemirror_mode: text/x-common-lisp
+  codemirror_mode: commonlisp
+  codemirror_mime_mode: text/x-common-lisp
   language_id: 190
 LLVM:
   type: programming
@@ -2088,7 +2178,8 @@ LabVIEW:
   - ".lvproj"
   tm_scope: text.xml
   ace_mode: xml
-  codemirror_mode: text/xml
+  codemirror_mode: xml
+  codemirror_mime_mode: text/xml
   language_id: 194
 Lasso:
   type: programming
@@ -2112,7 +2203,8 @@ Latte:
   - ".latte"
   tm_scope: text.html.smarty
   ace_mode: smarty
-  codemirror_mode: text/x-smarty
+  codemirror_mode: smarty
+  codemirror_mime_mode: text/x-smarty
   language_id: 196
 Lean:
   type: programming
@@ -2128,7 +2220,8 @@ Less:
   - ".less"
   tm_scope: source.css.less
   ace_mode: less
-  codemirror_mode: text/css
+  codemirror_mode: css
+  codemirror_mime_mode: text/css
   color: "#A1D9A1"
   language_id: 198
 Lex:
@@ -2212,7 +2305,8 @@ Literate Haskell:
   - ".lhs"
   tm_scope: text.tex.latex.haskell
   ace_mode: text
-  codemirror_mode: text/x-literate-haskell
+  codemirror_mode: haskell-literate
+  codemirror_mime_mode: text/x-literate-haskell
   language_id: 207
 LiveScript:
   type: programming
@@ -2226,7 +2320,8 @@ LiveScript:
   filenames:
   - Slakefile
   ace_mode: livescript
-  codemirror_mode: text/x-livescript
+  codemirror_mode: livescript
+  codemirror_mime_mode: text/x-livescript
   language_id: 208
 Logos:
   type: programming
@@ -2247,7 +2342,8 @@ Logtalk:
 LookML:
   type: programming
   ace_mode: yaml
-  codemirror_mode: text/x-yaml
+  codemirror_mode: yaml
+  codemirror_mime_mode: text/x-yaml
   color: "#652B81"
   extensions:
   - ".lookml"
@@ -2263,7 +2359,8 @@ LoomScript:
 Lua:
   type: programming
   ace_mode: lua
-  codemirror_mode: text/x-lua
+  codemirror_mode: lua
+  codemirror_mime_mode: text/x-lua
   color: "#000080"
   extensions:
   - ".lua"
@@ -2283,7 +2380,8 @@ M:
   - ".mumps"
   - ".m"
   ace_mode: text
-  codemirror_mode: text/x-mumps
+  codemirror_mode: mumps
+  codemirror_mime_mode: text/x-mumps
   language_id: 214
   tm_scope: none
 M4:
@@ -2321,7 +2419,8 @@ MTML:
   - ".mtml"
   tm_scope: text.html.basic
   ace_mode: html
-  codemirror_mode: text/html
+  codemirror_mode: html
+  codemirror_mime_mode: text/html
   language_id: 218
 MUF:
   type: programming
@@ -2331,7 +2430,8 @@ MUF:
   - ".m"
   tm_scope: none
   ace_mode: forth
-  codemirror_mode: text/x-forth
+  codemirror_mode: forth
+  codemirror_mime_mode: text/x-forth
   language_id: 219
 Makefile:
   type: programming
@@ -2360,7 +2460,8 @@ Makefile:
   interpreters:
   - make
   ace_mode: makefile
-  codemirror_mode: text/x-cmake
+  codemirror_mode: cmake
+  codemirror_mime_mode: text/x-cmake
   language_id: 220
 Mako:
   type: programming
@@ -2373,7 +2474,8 @@ Mako:
 Markdown:
   type: prose
   ace_mode: markdown
-  codemirror_mode: text/x-gfm
+  codemirror_mode: markdown
+  codemirror_mime_mode: text/x-gfm
   wrap: true
   extensions:
   - ".md"
@@ -2407,7 +2509,8 @@ Mathematica:
   aliases:
   - mma
   ace_mode: text
-  codemirror_mode: text/x-mathematica
+  codemirror_mode: mathematica
+  codemirror_mime_mode: text/x-mathematica
   language_id: 224
 Matlab:
   type: programming
@@ -2418,7 +2521,8 @@ Matlab:
   - ".matlab"
   - ".m"
   ace_mode: matlab
-  codemirror_mode: text/x-octave
+  codemirror_mode: octave
+  codemirror_mime_mode: text/x-octave
   language_id: 225
 Maven POM:
   type: data
@@ -2426,7 +2530,8 @@ Maven POM:
   filenames:
   - pom.xml
   ace_mode: xml
-  codemirror_mode: text/xml
+  codemirror_mode: xml
+  codemirror_mime_mode: text/xml
   language_id: 226
 Max:
   type: programming
@@ -2443,7 +2548,8 @@ Max:
   - ".pat"
   tm_scope: source.json
   ace_mode: json
-  codemirror_mode: application/json
+  codemirror_mode: javascript
+  codemirror_mime_mode: application/json
   language_id: 227
 MediaWiki:
   type: prose
@@ -2472,7 +2578,8 @@ Metal:
   - ".metal"
   tm_scope: source.c++
   ace_mode: c_cpp
-  codemirror_mode: text/x-c++src
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-c++src
   language_id: 230
 MiniD:
   type: programming
@@ -2493,7 +2600,8 @@ Mirah:
   - ".mirah"
   tm_scope: source.ruby
   ace_mode: ruby
-  codemirror_mode: text/x-ruby
+  codemirror_mode: ruby
+  codemirror_mime_mode: text/x-ruby
   language_id: 232
 Modelica:
   type: programming
@@ -2501,7 +2609,8 @@ Modelica:
   - ".mo"
   tm_scope: source.modelica
   ace_mode: text
-  codemirror_mode: text/x-modelica
+  codemirror_mode: modelica
+  codemirror_mime_mode: text/x-modelica
   language_id: 233
 Modula-2:
   type: programming
@@ -2571,7 +2680,8 @@ NSIS:
   - ".nsi"
   - ".nsh"
   ace_mode: text
-  codemirror_mode: text/x-nsis
+  codemirror_mode: nsis
+  codemirror_mime_mode: text/x-nsis
   language_id: 242
 Nemerle:
   type: programming
@@ -2605,7 +2715,8 @@ NetLogo:
   - ".nlogo"
   tm_scope: source.lisp
   ace_mode: lisp
-  codemirror_mode: text/x-common-lisp
+  codemirror_mode: commonlisp
+  codemirror_mime_mode: text/x-common-lisp
   language_id: 246
 NewLisp:
   type: programming
@@ -2619,7 +2730,8 @@ NewLisp:
   - newlisp
   tm_scope: source.lisp
   ace_mode: lisp
-  codemirror_mode: text/x-common-lisp
+  codemirror_mode: commonlisp
+  codemirror_mime_mode: text/x-common-lisp
   language_id: 247
 Nginx:
   type: markup
@@ -2632,7 +2744,8 @@ Nginx:
   aliases:
   - nginx configuration file
   ace_mode: text
-  codemirror_mode: text/x-nginx-conf
+  codemirror_mode: nginx
+  codemirror_mime_mode: text/x-nginx-conf
   color: "#9469E9"
   language_id: 248
 Nimrod:
@@ -2680,7 +2793,8 @@ Nu:
   - Nukefile
   tm_scope: source.nu
   ace_mode: scheme
-  codemirror_mode: text/x-scheme
+  codemirror_mode: scheme
+  codemirror_mime_mode: text/x-scheme
   interpreters:
   - nush
   language_id: 253
@@ -2693,13 +2807,15 @@ NumPy:
   - ".numsc"
   tm_scope: none
   ace_mode: text
-  codemirror_mode: text/x-python
+  codemirror_mode: python
+  codemirror_mime_mode: text/x-python
   color: "#9C8AF9"
   language_id: 254
 OCaml:
   type: programming
   ace_mode: ocaml
-  codemirror_mode: text/x-ocaml
+  codemirror_mode: mllike
+  codemirror_mime_mode: text/x-ocaml
   color: "#3be133"
   extensions:
   - ".ml"
@@ -2721,7 +2837,8 @@ ObjDump:
   - ".objdump"
   tm_scope: objdump.x86asm
   ace_mode: assembly_x86
-  codemirror_mode: text/x-gas
+  codemirror_mode: gas
+  codemirror_mime_mode: text/x-gas
   language_id: 256
 Objective-C:
   type: programming
@@ -2735,7 +2852,8 @@ Objective-C:
   - ".m"
   - ".h"
   ace_mode: objectivec
-  codemirror_mode: text/x-objectivec
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-objectivec
   language_id: 257
 Objective-C++:
   type: programming
@@ -2748,7 +2866,8 @@ Objective-C++:
   extensions:
   - ".mm"
   ace_mode: objectivec
-  codemirror_mode: text/x-objectivec
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-objectivec
   language_id: 258
 Objective-J:
   type: programming
@@ -2793,7 +2912,8 @@ OpenCL:
   - ".opencl"
   tm_scope: source.c
   ace_mode: c_cpp
-  codemirror_mode: text/x-csrc
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-csrc
   language_id: 263
 OpenEdge ABL:
   type: programming
@@ -2816,7 +2936,8 @@ OpenRC runscript:
   - openrc-run
   tm_scope: source.shell
   ace_mode: sh
-  codemirror_mode: text/x-sh
+  codemirror_mode: shell
+  codemirror_mime_mode: text/x-sh
   language_id: 265
 OpenSCAD:
   type: programming
@@ -2857,7 +2978,8 @@ Oz:
   - ".oz"
   tm_scope: source.oz
   ace_mode: text
-  codemirror_mode: text/x-oz
+  codemirror_mode: oz
+  codemirror_mime_mode: text/x-oz
   language_id: 270
 PAWN:
   type: programming
@@ -2872,7 +2994,8 @@ PHP:
   type: programming
   tm_scope: text.html.php
   ace_mode: php
-  codemirror_mode: application/x-httpd-php
+  codemirror_mode: php
+  codemirror_mime_mode: application/x-httpd-php
   color: "#4F5D95"
   extensions:
   - ".php"
@@ -2895,7 +3018,8 @@ PHP:
 PLSQL:
   type: programming
   ace_mode: sql
-  codemirror_mode: text/x-plsql
+  codemirror_mode: sql
+  codemirror_mime_mode: text/x-plsql
   tm_scope: none
   color: "#dad8d8"
   extensions:
@@ -2910,7 +3034,8 @@ PLSQL:
 PLpgSQL:
   type: programming
   ace_mode: pgsql
-  codemirror_mode: text/x-sql
+  codemirror_mode: sql
+  codemirror_mime_mode: text/x-sql
   tm_scope: source.sql
   extensions:
   - ".sql"
@@ -2987,13 +3112,15 @@ Pascal:
   interpreters:
   - instantfpc
   ace_mode: pascal
-  codemirror_mode: text/x-pascal
+  codemirror_mode: pascal
+  codemirror_mime_mode: text/x-pascal
   language_id: 281
 Perl:
   type: programming
   tm_scope: source.perl
   ace_mode: perl
-  codemirror_mode: text/x-perl
+  codemirror_mode: perl
+  codemirror_mime_mode: text/x-perl
   color: "#0298c3"
   extensions:
   - ".pl"
@@ -3031,7 +3158,8 @@ Perl6:
   - perl6
   tm_scope: source.perl6fe
   ace_mode: perl
-  codemirror_mode: text/x-perl
+  codemirror_mode: perl
+  codemirror_mime_mode: text/x-perl
   language_id: 283
 Pickle:
   type: data
@@ -3071,7 +3199,8 @@ Pike:
 Pod:
   type: prose
   ace_mode: perl
-  codemirror_mode: text/x-perl
+  codemirror_mode: perl
+  codemirror_mime_mode: text/x-perl
   wrap: true
   extensions:
   - ".pod"
@@ -3117,7 +3246,8 @@ PowerBuilder:
 PowerShell:
   type: programming
   ace_mode: powershell
-  codemirror_mode: text/x-powershell
+  codemirror_mode: powershell
+  codemirror_mime_mode: text/x-powershell
   aliases:
   - posh
   extensions:
@@ -3163,7 +3293,8 @@ Protocol Buffer:
   - ".proto"
   tm_scope: source.protobuf
   ace_mode: protobuf
-  codemirror_mode: text/x-protobuf
+  codemirror_mode: protobuf
+  codemirror_mime_mode: text/x-protobuf
   language_id: 297
 Public Key:
   type: data
@@ -3181,7 +3312,8 @@ Puppet:
   filenames:
   - Modulefile
   ace_mode: text
-  codemirror_mode: text/x-puppet
+  codemirror_mode: puppet
+  codemirror_mime_mode: text/x-puppet
   tm_scope: source.puppet
   language_id: 299
 Pure Data:
@@ -3208,12 +3340,14 @@ PureScript:
   - ".purs"
   tm_scope: source.purescript
   ace_mode: haskell
-  codemirror_mode: text/x-haskell
+  codemirror_mode: haskell
+  codemirror_mime_mode: text/x-haskell
   language_id: 302
 Python:
   type: programming
   ace_mode: python
-  codemirror_mode: text/x-python
+  codemirror_mode: python
+  codemirror_mime_mode: text/x-python
   color: "#3572A5"
   extensions:
   - ".py"
@@ -3288,12 +3422,14 @@ R:
   interpreters:
   - Rscript
   ace_mode: r
-  codemirror_mode: text/x-rsrc
+  codemirror_mode: r
+  codemirror_mime_mode: text/x-rsrc
   language_id: 307
 RAML:
   type: markup
   ace_mode: yaml
-  codemirror_mode: text/x-yaml
+  codemirror_mode: yaml
+  codemirror_mime_mode: text/x-yaml
   tm_scope: source.yaml
   color: "#77d9fb"
   extensions:
@@ -3339,13 +3475,15 @@ RHTML:
   aliases:
   - html+ruby
   ace_mode: rhtml
-  codemirror_mode: application/x-erb
+  codemirror_mode: htmlembedded
+  codemirror_mime_mode: application/x-erb
   language_id: 312
 RMarkdown:
   type: prose
   wrap: true
   ace_mode: markdown
-  codemirror_mode: text/x-gfm
+  codemirror_mode: markdown
+  codemirror_mime_mode: text/x-gfm
   extensions:
   - ".rmd"
   tm_scope: source.gfm
@@ -3358,7 +3496,8 @@ RPM Spec:
   aliases:
   - specfile
   ace_mode: text
-  codemirror_mode: text/x-rpm-spec
+  codemirror_mode: rpm
+  codemirror_mime_mode: text/x-rpm-spec
   language_id: 314
 RUNOFF:
   type: markup
@@ -3461,7 +3600,8 @@ RobotFramework:
 Rouge:
   type: programming
   ace_mode: clojure
-  codemirror_mode: text/x-clojure
+  codemirror_mode: clojure
+  codemirror_mime_mode: text/x-clojure
   color: "#cc0088"
   extensions:
   - ".rg"
@@ -3470,7 +3610,8 @@ Rouge:
 Ruby:
   type: programming
   ace_mode: ruby
-  codemirror_mode: text/x-ruby
+  codemirror_mode: ruby
+  codemirror_mime_mode: text/x-ruby
   color: "#701516"
   aliases:
   - jruby
@@ -3532,7 +3673,8 @@ Rust:
   - ".rs"
   - ".rs.in"
   ace_mode: rust
-  codemirror_mode: text/x-rustsrc
+  codemirror_mode: rust
+  codemirror_mime_mode: text/x-rustsrc
   language_id: 327
 SAS:
   type: programming
@@ -3541,14 +3683,16 @@ SAS:
   - ".sas"
   tm_scope: source.sas
   ace_mode: text
-  codemirror_mode: text/x-sas
+  codemirror_mode: sas
+  codemirror_mime_mode: text/x-sas
   language_id: 328
 SCSS:
   type: markup
   tm_scope: source.scss
   group: CSS
   ace_mode: scss
-  codemirror_mode: text/x-scss
+  codemirror_mode: css
+  codemirror_mime_mode: text/x-scss
   extensions:
   - ".scss"
   color: "#CF649A"
@@ -3576,7 +3720,8 @@ SPARQL:
   type: data
   tm_scope: source.sparql
   ace_mode: text
-  codemirror_mode: application/sparql-query
+  codemirror_mode: sparql
+  codemirror_mime_mode: application/sparql-query
   extensions:
   - ".sparql"
   - ".rq"
@@ -3594,7 +3739,8 @@ SQL:
   type: data
   tm_scope: source.sql
   ace_mode: sql
-  codemirror_mode: text/x-sql
+  codemirror_mode: sql
+  codemirror_mime_mode: text/x-sql
   extensions:
   - ".sql"
   - ".cql"
@@ -3608,7 +3754,8 @@ SQL:
 SQLPL:
   type: programming
   ace_mode: sql
-  codemirror_mode: text/x-sql
+  codemirror_mode: sql
+  codemirror_mime_mode: text/x-sql
   tm_scope: source.sql
   extensions:
   - ".sql"
@@ -3619,7 +3766,8 @@ SRecode Template:
   color: "#348a34"
   tm_scope: source.lisp
   ace_mode: lisp
-  codemirror_mode: text/x-common-lisp
+  codemirror_mode: commonlisp
+  codemirror_mime_mode: text/x-common-lisp
   extensions:
   - ".srt"
   language_id: 335
@@ -3637,7 +3785,8 @@ SVG:
   - ".svg"
   tm_scope: text.xml
   ace_mode: xml
-  codemirror_mode: text/xml
+  codemirror_mode: xml
+  codemirror_mime_mode: text/xml
   language_id: 337
 Sage:
   type: programming
@@ -3647,7 +3796,8 @@ Sage:
   - ".sagews"
   tm_scope: source.python
   ace_mode: python
-  codemirror_mode: text/x-python
+  codemirror_mode: python
+  codemirror_mime_mode: text/x-python
   language_id: 338
 SaltStack:
   type: programming
@@ -3659,7 +3809,8 @@ SaltStack:
   - ".sls"
   tm_scope: source.yaml.salt
   ace_mode: yaml
-  codemirror_mode: text/x-yaml
+  codemirror_mode: yaml
+  codemirror_mime_mode: text/x-yaml
   language_id: 339
 Sass:
   type: markup
@@ -3668,13 +3819,15 @@ Sass:
   extensions:
   - ".sass"
   ace_mode: sass
-  codemirror_mode: text/x-sass
+  codemirror_mode: sass
+  codemirror_mime_mode: text/x-sass
   color: "#CF649A"
   language_id: 340
 Scala:
   type: programming
   ace_mode: scala
-  codemirror_mode: text/x-scala
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-scala
   color: "#c22d40"
   extensions:
   - ".scala"
@@ -3708,7 +3861,8 @@ Scheme:
   - gosh
   - r6rs
   ace_mode: scheme
-  codemirror_mode: text/x-scheme
+  codemirror_mode: scheme
+  codemirror_mime_mode: text/x-scheme
   language_id: 343
 Scilab:
   type: programming
@@ -3760,7 +3914,8 @@ Shell:
   - sh
   - zsh
   ace_mode: sh
-  codemirror_mode: text/x-sh
+  codemirror_mode: shell
+  codemirror_mime_mode: text/x-sh
   language_id: 346
 ShellSession:
   type: programming
@@ -3771,7 +3926,8 @@ ShellSession:
   - console
   tm_scope: text.shell-session
   ace_mode: sh
-  codemirror_mode: text/x-sh
+  codemirror_mode: shell
+  codemirror_mime_mode: text/x-sh
   language_id: 347
 Shen:
   type: programming
@@ -3797,7 +3953,8 @@ Slim:
   - ".slim"
   tm_scope: text.slim
   ace_mode: text
-  codemirror_mode: text/x-slim
+  codemirror_mode: slim
+  codemirror_mime_mode: text/x-slim
   language_id: 350
 Smali:
   type: programming
@@ -3815,14 +3972,16 @@ Smalltalk:
   aliases:
   - squeak
   ace_mode: text
-  codemirror_mode: text/x-stsrc
+  codemirror_mode: smalltalk
+  codemirror_mime_mode: text/x-stsrc
   language_id: 352
 Smarty:
   type: programming
   extensions:
   - ".tpl"
   ace_mode: smarty
-  codemirror_mode: text/x-smarty
+  codemirror_mode: smarty
+  codemirror_mime_mode: text/x-smarty
   tm_scope: text.html.smarty
   language_id: 353
 SourcePawn:
@@ -3844,7 +4003,8 @@ Squirrel:
   - ".nut"
   tm_scope: source.c++
   ace_mode: c_cpp
-  codemirror_mode: text/x-c++src
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-c++src
   language_id: 355
 Stan:
   type: programming
@@ -3866,7 +4026,8 @@ Standard ML:
   - ".sml"
   tm_scope: source.ml
   ace_mode: text
-  codemirror_mode: text/x-ocaml
+  codemirror_mode: mllike
+  codemirror_mime_mode: text/x-ocaml
   language_id: 357
 Stata:
   type: programming
@@ -3887,6 +4048,7 @@ Stylus:
   - ".styl"
   tm_scope: source.stylus
   ace_mode: stylus
+  codemirror_mode: stylus
   language_id: 359
 SubRip Text:
   type: data
@@ -3913,7 +4075,8 @@ Swift:
   extensions:
   - ".swift"
   ace_mode: text
-  codemirror_mode: text/x-swift
+  codemirror_mode: swift
+  codemirror_mime_mode: text/x-swift
   language_id: 362
 SystemVerilog:
   type: programming
@@ -3923,7 +4086,8 @@ SystemVerilog:
   - ".svh"
   - ".vh"
   ace_mode: verilog
-  codemirror_mode: text/x-systemverilog
+  codemirror_mode: verilog
+  codemirror_mime_mode: text/x-systemverilog
   language_id: 363
 TLA:
   type: programming
@@ -3938,7 +4102,8 @@ TOML:
   - ".toml"
   tm_scope: source.toml
   ace_mode: toml
-  codemirror_mode: text/x-toml
+  codemirror_mode: toml
+  codemirror_mime_mode: text/x-toml
   language_id: 365
 TXL:
   type: programming
@@ -3958,7 +4123,8 @@ Tcl:
   - tclsh
   - wish
   ace_mode: tcl
-  codemirror_mode: text/x-tcl
+  codemirror_mode: tcl
+  codemirror_mime_mode: text/x-tcl
   language_id: 367
 Tcsh:
   type: programming
@@ -3968,13 +4134,15 @@ Tcsh:
   - ".csh"
   tm_scope: source.shell
   ace_mode: sh
-  codemirror_mode: text/x-sh
+  codemirror_mode: shell
+  codemirror_mime_mode: text/x-sh
   language_id: 368
 TeX:
   type: markup
   color: "#3D6117"
   ace_mode: tex
-  codemirror_mode: text/x-stex
+  codemirror_mode: stex
+  codemirror_mime_mode: text/x-stex
   wrap: true
   aliases:
   - latex
@@ -4008,7 +4176,8 @@ Terra:
   - ".t"
   color: "#00004c"
   ace_mode: lua
-  codemirror_mode: text/x-lua
+  codemirror_mode: lua
+  codemirror_mime_mode: text/x-lua
   interpreters:
   - lua
   language_id: 371
@@ -4041,7 +4210,8 @@ Text:
 Textile:
   type: prose
   ace_mode: textile
-  codemirror_mode: text/x-textile
+  codemirror_mode: textile
+  codemirror_mime_mode: text/x-textile
   wrap: true
   extensions:
   - ".textile"
@@ -4069,7 +4239,8 @@ Turtle:
   - ".ttl"
   tm_scope: source.turtle
   ace_mode: text
-  codemirror_mode: text/turtle
+  codemirror_mode: turtle
+  codemirror_mime_mode: text/turtle
   language_id: 376
 Twig:
   type: markup
@@ -4078,7 +4249,8 @@ Twig:
   - ".twig"
   tm_scope: text.html.twig
   ace_mode: twig
-  codemirror_mode: text/x-twig
+  codemirror_mode: twig
+  codemirror_mime_mode: text/x-twig
   language_id: 377
 TypeScript:
   type: programming
@@ -4090,13 +4262,16 @@ TypeScript:
   - ".tsx"
   tm_scope: source.ts
   ace_mode: typescript
-  codemirror_mode: text/x-typescript
+  codemirror_mode: javascript
+ codemirror_mode: typescript
+  codemirror_mime_mode: text/x-typescript
   language_id: 378
 Unified Parallel C:
   type: programming
   group: C
   ace_mode: c_cpp
-  codemirror_mode: text/x-csrc
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-csrc
   color: "#4e3617"
   extensions:
   - ".upc"
@@ -4105,7 +4280,8 @@ Unified Parallel C:
 Unity3D Asset:
   type: data
   ace_mode: yaml
-  codemirror_mode: text/x-yaml
+  codemirror_mode: yaml
+  codemirror_mime_mode: text/x-yaml
   extensions:
   - ".anim"
   - ".asset"
@@ -4120,7 +4296,8 @@ Uno:
   extensions:
   - ".uno"
   ace_mode: csharp
-  codemirror_mode: text/x-csharp
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-csharp
   tm_scope: source.cs
   language_id: 381
 UnrealScript:
@@ -4130,7 +4307,8 @@ UnrealScript:
   - ".uc"
   tm_scope: source.java
   ace_mode: java
-  codemirror_mode: text/x-java
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-java
   language_id: 382
 UrWeb:
   type: programming
@@ -4164,7 +4342,8 @@ VHDL:
   - ".vht"
   - ".vhw"
   ace_mode: vhdl
-  codemirror_mode: text/x-vhdl
+  codemirror_mode: vhdl
+  codemirror_mime_mode: text/x-vhdl
   language_id: 385
 Vala:
   type: programming
@@ -4181,7 +4360,8 @@ Verilog:
   - ".v"
   - ".veo"
   ace_mode: verilog
-  codemirror_mode: text/x-verilog
+  codemirror_mode: verilog
+  codemirror_mime_mode: text/x-verilog
   language_id: 387
 VimL:
   type: programming
@@ -4219,7 +4399,8 @@ Visual Basic:
   - vb.net
   - vbnet
   ace_mode: text
-  codemirror_mode: text/x-vb
+  codemirror_mode: vb
+  codemirror_mime_mode: text/x-vb
   language_id: 389
 Volt:
   type: programming
@@ -4228,7 +4409,8 @@ Volt:
   - ".volt"
   tm_scope: source.d
   ace_mode: d
-  codemirror_mode: text/x-d
+  codemirror_mode: d
+  codemirror_mime_mode: text/x-d
   language_id: 390
 Vue:
   type: markup
@@ -4237,6 +4419,7 @@ Vue:
   - ".vue"
   tm_scope: text.html.vue
   ace_mode: html
+  codemirror_mode: vue
   language_id: 391
 Wavefront Material:
   type: data
@@ -4266,7 +4449,8 @@ WebIDL:
   - ".webidl"
   tm_scope: source.webidl
   ace_mode: text
-  codemirror_mode: text/x-webidl
+  codemirror_mode: webidl
+  codemirror_mime_mode: text/x-webidl
   language_id: 395
 World of Warcraft Addon Data:
   type: data
@@ -4292,12 +4476,14 @@ XC:
   - ".xc"
   tm_scope: source.xc
   ace_mode: c_cpp
-  codemirror_mode: text/x-csrc
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-csrc
   language_id: 398
 XML:
   type: data
   ace_mode: xml
-  codemirror_mode: text/xml
+  codemirror_mode: xml
+  codemirror_mime_mode: text/xml
   aliases:
   - rss
   - xsd
@@ -4406,7 +4592,8 @@ XPages:
   - ".xsp.metadata"
   tm_scope: none
   ace_mode: xml
-  codemirror_mode: text/xml
+  codemirror_mode: xml
+  codemirror_mime_mode: text/xml
   language_id: 400
 XProc:
   type: programming
@@ -4415,7 +4602,8 @@ XProc:
   - ".xproc"
   tm_scope: text.xml
   ace_mode: xml
-  codemirror_mode: text/xml
+  codemirror_mode: xml
+  codemirror_mime_mode: text/xml
   language_id: 401
 XQuery:
   type: programming
@@ -4427,7 +4615,8 @@ XQuery:
   - ".xqm"
   - ".xqy"
   ace_mode: xquery
-  codemirror_mode: application/xquery
+  codemirror_mode: xquery
+  codemirror_mime_mode: application/xquery
   tm_scope: source.xq
   language_id: 402
 XS:
@@ -4436,7 +4625,8 @@ XS:
   - ".xs"
   tm_scope: source.c
   ace_mode: c_cpp
-  codemirror_mode: text/x-csrc
+  codemirror_mode: clike
+  codemirror_mime_mode: text/x-csrc
   language_id: 403
 XSLT:
   type: programming
@@ -4447,7 +4637,8 @@ XSLT:
   - ".xsl"
   tm_scope: text.xml.xsl
   ace_mode: xml
-  codemirror_mode: text/xml
+  codemirror_mode: xml
+  codemirror_mime_mode: text/xml
   color: "#EB8CEB"
   language_id: 404
 Xojo:
@@ -4484,7 +4675,8 @@ YAML:
   filenames:
   - ".clang-format"
   ace_mode: yaml
-  codemirror_mode: text/x-yaml
+  codemirror_mode: yaml
+  codemirror_mime_mode: text/x-yaml
   language_id: 407
 YANG:
   type: data
@@ -4541,7 +4733,8 @@ eC:
 edn:
   type: data
   ace_mode: clojure
-  codemirror_mode: text/x-clojure
+  codemirror_mode: clojure
+  codemirror_mime_mode: text/x-clojure
   extensions:
   - ".edn"
   tm_scope: source.clojure
@@ -4589,12 +4782,14 @@ reStructuredText:
   - ".rest.txt"
   - ".rst.txt"
   ace_mode: text
-  codemirror_mode: text/x-rst
+  codemirror_mode: rst
+  codemirror_mime_mode: text/x-rst
   language_id: 419
 wisp:
   type: programming
   ace_mode: clojure
-  codemirror_mode: text/x-clojure
+  codemirror_mode: clojure
+  codemirror_mime_mode: text/x-clojure
   color: "#7582D1"
   extensions:
   - ".wisp"
diff --git a/test/test_language.rb b/test/test_language.rb
index 04c13683..eda2db2a 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -352,7 +352,17 @@ class TestLanguage < Minitest::Test
   end
 
   def test_codemirror_mode
-    assert_equal 'text/x-c++src', Language['C++'].codemirror_mode
+    assert_equal 'ruby', Language['Ruby'].codemirror_mode
+    assert_equal 'javascript', Language['JavaScript'].codemirror_mode
+    assert_equal 'clike', Language['C'].codemirror_mode
+    assert_equal 'clike', Language['C++'].codemirror_mode
+  end
+
+  def test_codemirror_mime_mode
+    assert_equal 'text/x-ruby', Language['Ruby'].codemirror_mime_mode
+    assert_equal 'text/javascript', Language['JavaScript'].codemirror_mime_mode
+    assert_equal 'text/x-csrc', Language['C'].codemirror_mime_mode
+    assert_equal 'text/x-c++src', Language['C++'].codemirror_mime_mode
   end
 
   def test_wrap

From 0406a5b326dab3f3356ae64d86a7cc0641f9b04f Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Fri, 23 Sep 2016 14:39:15 -0700
Subject: [PATCH 5/8] Fix typescript indent

---
 lib/linguist/languages.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 36b61047..9562efb3 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -4262,8 +4262,7 @@ TypeScript:
   - ".tsx"
   tm_scope: source.ts
   ace_mode: typescript
-  codemirror_mode: javascript
- codemirror_mode: typescript
+  codemirror_mode: typescript
   codemirror_mime_mode: text/x-typescript
   language_id: 378
 Unified Parallel C:

From 855f1a1f865675ae4f984f1cfbb28a775732f3be Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Fri, 23 Sep 2016 14:47:49 -0700
Subject: [PATCH 6/8] Validate CodeMirror modes

---
 .gitmodules                |  3 +++
 lib/linguist/language.rb   |  3 +++
 lib/linguist/languages.yml | 12 ++++++------
 test/test_language.rb      |  8 ++++++++
 vendor/CodeMirror          |  1 +
 5 files changed, 21 insertions(+), 6 deletions(-)
 create mode 160000 vendor/CodeMirror

diff --git a/.gitmodules b/.gitmodules
index cbf7a602..832b6423 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -791,3 +791,6 @@
 [submodule "vendor/grammars/language-babel"]
 	path = vendor/grammars/language-babel
 	url = https://github.com/github-linguist/language-babel
+[submodule "vendor/CodeMirror"]
+	path = vendor/CodeMirror
+	url = https://github.com/codemirror/CodeMirror
diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb
index ea88b87f..e4d3cf71 100644
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -402,6 +402,9 @@ module Linguist
 
     # Public: Get CodeMirror mode
     #
+    # Maps to a directory in the `mode/` source code.
+    #   https://github.com/codemirror/CodeMirror/tree/master/mode
+    #
     # Examples
     #
     #  # => "nil"
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 9562efb3..2b816a92 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1083,7 +1083,7 @@ Ecere Projects:
   - ".epj"
   tm_scope: source.json
   ace_mode: json
-  codemirror_mode: json
+  codemirror_mode: javascript
   codemirror_mime_mode: application/json
   language_id: 98
 Eiffel:
@@ -1632,7 +1632,7 @@ HTML:
   type: markup
   tm_scope: text.html.basic
   ace_mode: html
-  codemirror_mode: html
+  codemirror_mode: htmlembedded
   codemirror_mime_mode: text/html
   color: "#e44b23"
   aliases:
@@ -2118,7 +2118,7 @@ KiCad:
 Kit:
   type: markup
   ace_mode: html
-  codemirror_mode: html
+  codemirror_mode: htmlembedded
   codemirror_mime_mode: text/html
   extensions:
   - ".kit"
@@ -2133,7 +2133,7 @@ Kotlin:
   - ".kts"
   tm_scope: source.Kotlin
   ace_mode: text
-  codemirror_mode: kotlin
+  codemirror_mode: clike
   codemirror_mime_mode: text/x-kotlin
   language_id: 189
 LFE:
@@ -2419,7 +2419,7 @@ MTML:
   - ".mtml"
   tm_scope: text.html.basic
   ace_mode: html
-  codemirror_mode: html
+  codemirror_mode: htmlembedded
   codemirror_mime_mode: text/html
   language_id: 218
 MUF:
@@ -4262,7 +4262,7 @@ TypeScript:
   - ".tsx"
   tm_scope: source.ts
   ace_mode: typescript
-  codemirror_mode: typescript
+  codemirror_mode: javascript
   codemirror_mime_mode: text/x-typescript
   language_id: 378
 Unified Parallel C:
diff --git a/test/test_language.rb b/test/test_language.rb
index eda2db2a..0d711d36 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -452,6 +452,14 @@ class TestLanguage < Minitest::Test
     assert missing.empty?, message
   end
 
+  def test_valid_codemirror_mode
+    Language.all.each do |language|
+      if mode = language.codemirror_mode
+        assert File.exist?(File.expand_path("../../vendor/CodeMirror/mode/#{mode}", __FILE__)), "#{mode} isn't a valid CodeMirror mode"
+      end
+    end
+  end
+
   def test_all_popular_languages_exist
     popular = YAML.load(File.read(File.expand_path("../../lib/linguist/popular.yml", __FILE__)))
 
diff --git a/vendor/CodeMirror b/vendor/CodeMirror
new file mode 160000
index 00000000..562e8eff
--- /dev/null
+++ b/vendor/CodeMirror
@@ -0,0 +1 @@
+Subproject commit 562e8eff5b0916d3b63fc59eda9540f8f455c6ed

From 3abe081560ca924caaa425bd38212feb3e7daeb9 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Fri, 23 Sep 2016 16:30:38 -0700
Subject: [PATCH 7/8] Validate codemirror modes

---
 lib/linguist/languages.yml | 42 +++++++++++---------------------------
 test/test_language.rb      | 26 +++++++++++++++++++++++
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 2b816a92..9bb32f8a 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -234,8 +234,6 @@ Apollo Guidance Computer:
   - ".agc"
   tm_scope: source.agc
   ace_mode: assembly_x86
-  codemirror_mode: gas
-  codemirror_mime_mode: text/x-gas
   language_id: 18
 AppleScript:
   type: programming
@@ -298,8 +296,6 @@ Assembly:
   - ".nasm"
   tm_scope: source.assembly
   ace_mode: assembly_x86
-  codemirror_mode: gas
-  codemirror_mime_mode: text/x-gas
   language_id: 24
 Augeas:
   type: programming
@@ -516,8 +512,6 @@ C-ObjDump:
   - ".c-objdump"
   tm_scope: objdump.x86asm
   ace_mode: assembly_x86
-  codemirror_mode: gas
-  codemirror_mime_mode: text/x-gas
   language_id: 44
 C2hs Haskell:
   type: programming
@@ -568,7 +562,7 @@ COLLADA:
   tm_scope: text.xml
   ace_mode: xml
   codemirror_mode: xml
-  codemirror_mime_mode: text/x-xml
+  codemirror_mime_mode: text/xml
   language_id: 49
 CSS:
   type: markup
@@ -799,8 +793,6 @@ Cpp-ObjDump:
   aliases:
   - c++-objdump
   ace_mode: assembly_x86
-  codemirror_mode: gas
-  codemirror_mime_mode: text/x-gas
   language_id: 70
 Creole:
   type: prose
@@ -909,8 +901,6 @@ D-ObjDump:
   - ".d-objdump"
   tm_scope: objdump.x86asm
   ace_mode: assembly_x86
-  codemirror_mode: gas
-  codemirror_mime_mode: text/x-gas
   language_id: 81
 DIGITAL Command Language:
   type: programming
@@ -972,7 +962,7 @@ Dart:
   - dart
   ace_mode: dart
   codemirror_mode: dart
-  codemirror_mime_mode: text/x-dart
+  codemirror_mime_mode: application/dart
   language_id: 87
 Diff:
   type: data
@@ -1337,8 +1327,6 @@ GAS:
   - ".ms"
   tm_scope: source.assembly
   ace_mode: assembly_x86
-  codemirror_mode: gas
-  codemirror_mime_mode: text/x-gas
   language_id: 120
 GCC Machine Description:
   type: programming
@@ -1632,7 +1620,7 @@ HTML:
   type: markup
   tm_scope: text.html.basic
   ace_mode: html
-  codemirror_mode: htmlembedded
+  codemirror_mode: htmlmixed
   codemirror_mime_mode: text/html
   color: "#e44b23"
   aliases:
@@ -1671,7 +1659,7 @@ HTML+ECR:
   extensions:
   - ".ecr"
   ace_mode: text
-  codemirror_mode: htmlembedded
+  codemirror_mode: htmlmixed
   codemirror_mime_mode: text/html
   language_id: 148
 HTML+EEX:
@@ -1683,7 +1671,7 @@ HTML+EEX:
   extensions:
   - ".eex"
   ace_mode: text
-  codemirror_mode: htmlembedded
+  codemirror_mode: htmlmixed
   codemirror_mime_mode: text/html
   language_id: 149
 HTML+ERB:
@@ -1752,7 +1740,6 @@ Handlebars:
   - ".hbs"
   tm_scope: text.html.handlebars
   ace_mode: handlebars
-  codemirror_mode: handlebars
   language_id: 155
 Harbour:
   type: programming
@@ -1962,8 +1949,6 @@ JSONLD:
   type: data
   group: JavaScript
   ace_mode: javascript
-  codemirror_mode: javascript
-  codemirror_mime_mode: application/ld+json
   extensions:
   - ".jsonld"
   tm_scope: source.js
@@ -1985,6 +1970,7 @@ JSX:
   - ".jsx"
   tm_scope: source.js.jsx
   ace_mode: javascript
+  codemirror_mode: jsx
   codemirror_mime_mode: text/jsx
   language_id: 178
 Jade:
@@ -2118,7 +2104,7 @@ KiCad:
 Kit:
   type: markup
   ace_mode: html
-  codemirror_mode: htmlembedded
+  codemirror_mode: htmlmixed
   codemirror_mime_mode: text/html
   extensions:
   - ".kit"
@@ -2419,7 +2405,7 @@ MTML:
   - ".mtml"
   tm_scope: text.html.basic
   ace_mode: html
-  codemirror_mode: htmlembedded
+  codemirror_mode: htmlmixed
   codemirror_mime_mode: text/html
   language_id: 218
 MUF:
@@ -2474,7 +2460,7 @@ Mako:
 Markdown:
   type: prose
   ace_mode: markdown
-  codemirror_mode: markdown
+  codemirror_mode: gfm
   codemirror_mime_mode: text/x-gfm
   wrap: true
   extensions:
@@ -2837,8 +2823,6 @@ ObjDump:
   - ".objdump"
   tm_scope: objdump.x86asm
   ace_mode: assembly_x86
-  codemirror_mode: gas
-  codemirror_mime_mode: text/x-gas
   language_id: 256
 Objective-C:
   type: programming
@@ -3247,7 +3231,7 @@ PowerShell:
   type: programming
   ace_mode: powershell
   codemirror_mode: powershell
-  codemirror_mime_mode: text/x-powershell
+  codemirror_mime_mode: application/x-powershell
   aliases:
   - posh
   extensions:
@@ -3482,7 +3466,7 @@ RMarkdown:
   type: prose
   wrap: true
   ace_mode: markdown
-  codemirror_mode: markdown
+  codemirror_mode: gfm
   codemirror_mime_mode: text/x-gfm
   extensions:
   - ".rmd"
@@ -4048,7 +4032,6 @@ Stylus:
   - ".styl"
   tm_scope: source.stylus
   ace_mode: stylus
-  codemirror_mode: stylus
   language_id: 359
 SubRip Text:
   type: data
@@ -4263,7 +4246,7 @@ TypeScript:
   tm_scope: source.ts
   ace_mode: typescript
   codemirror_mode: javascript
-  codemirror_mime_mode: text/x-typescript
+  codemirror_mime_mode: application/typescript
   language_id: 378
 Unified Parallel C:
   type: programming
@@ -4418,7 +4401,6 @@ Vue:
   - ".vue"
   tm_scope: text.html.vue
   ace_mode: html
-  codemirror_mode: vue
   language_id: 391
 Wavefront Material:
   type: data
diff --git a/test/test_language.rb b/test/test_language.rb
index 0d711d36..48391e59 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -452,6 +452,15 @@ class TestLanguage < Minitest::Test
     assert missing.empty?, message
   end
 
+  def test_codemirror_modes_present
+    Language.all.each do |language|
+      if language.codemirror_mode || language.codemirror_mime_mode
+        assert language.codemirror_mode, "#{language.inspect} missing CodeMirror mode"
+        assert language.codemirror_mime_mode, "#{language.inspect} missing CodeMirror MIME mode"
+      end
+    end
+  end
+
   def test_valid_codemirror_mode
     Language.all.each do |language|
       if mode = language.codemirror_mode
@@ -460,6 +469,23 @@ class TestLanguage < Minitest::Test
     end
   end
 
+  def test_codemirror_mode_and_mime_defined_by_meta_mapping
+    meta = File.read(File.expand_path("../../vendor/CodeMirror/mode/meta.js", __FILE__))
+    Language.all.each do |language|
+      next unless language.codemirror_mode && language.codemirror_mime_mode
+      assert meta.match(/^.+#{Regexp.escape(language.codemirror_mime_mode)}.+#{Regexp.escape(language.codemirror_mode)}.+$/), "#{language.inspect}: #{language.codemirror_mime_mode} not defined under #{language.codemirror_mode}"
+    end
+  end
+
+  def test_codemirror_mime_declared_in_mode_file
+    Language.all.each do |language|
+      next unless language.codemirror_mode && language.codemirror_mime_mode
+      filename = File.expand_path("../../vendor/CodeMirror/mode/#{language.codemirror_mode}/#{language.codemirror_mode}.js", __FILE__)
+      assert File.exist?(filename), "#{filename} does not exist"
+      assert File.read(filename).match(language.codemirror_mime_mode), "#{language.inspect}: #{language.codemirror_mime_mode} not defined in #{filename}"
+    end
+  end
+
   def test_all_popular_languages_exist
     popular = YAML.load(File.read(File.expand_path("../../lib/linguist/popular.yml", __FILE__)))
 

From 67ed060d378f7e39992c0f520bbb4a408f2f5f81 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Fri, 23 Sep 2016 16:33:12 -0700
Subject: [PATCH 8/8] Assert CodeMirror modes and mime types are valid against
 source

---
 lib/linguist/language.rb   |   6 +-
 lib/linguist/languages.yml | 368 ++++++++++++++++++-------------------
 test/test_grammars.rb      |   2 +-
 test/test_language.rb      |  22 +--
 4 files changed, 199 insertions(+), 199 deletions(-)

diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb
index e4d3cf71..875ef956 100644
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -302,7 +302,7 @@ module Linguist
 
       @ace_mode = attributes[:ace_mode]
       @codemirror_mode = attributes[:codemirror_mode]
-      @codemirror_mime_mode = attributes[:codemirror_mime_mode]
+      @codemirror_mime_type = attributes[:codemirror_mime_type]
       @wrap = attributes[:wrap] || false
 
       # Set legacy search term
@@ -423,7 +423,7 @@ module Linguist
     #  # => "text/x-csrc"
     #
     # Returns a String name or nil
-    attr_reader :codemirror_mime_mode
+    attr_reader :codemirror_mime_type
 
     # Public: Should language lines be wrapped
     #
@@ -602,7 +602,7 @@ module Linguist
       :tm_scope          => options['tm_scope'],
       :ace_mode          => options['ace_mode'],
       :codemirror_mode   => options['codemirror_mode'],
-      :codemirror_mime_mode => options['codemirror_mime_mode'],
+      :codemirror_mime_type => options['codemirror_mime_type'],
       :wrap              => options['wrap'],
       :group_name        => options['group'],
       :searchable        => options.fetch('searchable', true),
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 9bb32f8a..269525ce 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -60,7 +60,7 @@ AGS Script:
   tm_scope: source.c++
   ace_mode: c_cpp
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-c++src
+  codemirror_mime_type: text/x-c++src
   language_id: 2
 AMPL:
   type: programming
@@ -99,7 +99,7 @@ APL:
   tm_scope: source.apl
   ace_mode: text
   codemirror_mode: apl
-  codemirror_mime_mode: text/apl
+  codemirror_mime_type: text/apl
   language_id: 6
 ASN.1:
   type: data
@@ -110,7 +110,7 @@ ASN.1:
   tm_scope: source.asn
   ace_mode: text
   codemirror_mode: asn.1
-  codemirror_mime_mode: text/x-ttcn-asn
+  codemirror_mime_type: text/x-ttcn-asn
   language_id: 7
 ASP:
   type: programming
@@ -130,7 +130,7 @@ ASP:
   - ".axd"
   ace_mode: text
   codemirror_mode: htmlembedded
-  codemirror_mime_mode: application/x-aspx
+  codemirror_mime_type: application/x-aspx
   language_id: 8
 ATS:
   type: programming
@@ -194,7 +194,7 @@ Alpine Abuild:
   tm_scope: source.shell
   ace_mode: sh
   codemirror_mode: shell
-  codemirror_mime_mode: text/x-sh
+  codemirror_mime_type: text/x-sh
   language_id: 14
 Ant Build System:
   type: data
@@ -204,7 +204,7 @@ Ant Build System:
   - build.xml
   ace_mode: xml
   codemirror_mode: xml
-  codemirror_mime_mode: application/xml
+  codemirror_mime_type: application/xml
   language_id: 15
 ApacheConf:
   type: markup
@@ -224,7 +224,7 @@ Apex:
   tm_scope: source.java
   ace_mode: java
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-java
+  codemirror_mime_type: text/x-java
   language_id: 17
 Apollo Guidance Computer:
   type: programming
@@ -263,7 +263,7 @@ Arduino:
   tm_scope: source.c++
   ace_mode: c_cpp
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-c++src
+  codemirror_mime_type: text/x-c++src
   language_id: 21
 AsciiDoc:
   type: prose
@@ -434,7 +434,7 @@ Brainfuck:
   tm_scope: source.bf
   ace_mode: text
   codemirror_mode: brainfuck
-  codemirror_mime_mode: text/x-brainfuck
+  codemirror_mime_type: text/x-brainfuck
   language_id: 38
 Brightscript:
   type: programming
@@ -462,13 +462,13 @@ C:
   - tcc
   ace_mode: c_cpp
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-csrc
+  codemirror_mime_type: text/x-csrc
   language_id: 41
 C#:
   type: programming
   ace_mode: csharp
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-csharp
+  codemirror_mime_type: text/x-csharp
   tm_scope: source.cs
   search_term: csharp
   color: "#178600"
@@ -484,7 +484,7 @@ C++:
   type: programming
   ace_mode: c_cpp
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-c++src
+  codemirror_mime_type: text/x-c++src
   search_term: cpp
   color: "#f34b7d"
   aliases:
@@ -523,7 +523,7 @@ C2hs Haskell:
   tm_scope: source.haskell
   ace_mode: haskell
   codemirror_mode: haskell
-  codemirror_mime_mode: text/x-haskell
+  codemirror_mime_type: text/x-haskell
   language_id: 45
 CLIPS:
   type: programming
@@ -541,7 +541,7 @@ CMake:
   - CMakeLists.txt
   ace_mode: text
   codemirror_mode: cmake
-  codemirror_mime_mode: text/x-cmake
+  codemirror_mime_type: text/x-cmake
   language_id: 47
 COBOL:
   type: programming
@@ -553,7 +553,7 @@ COBOL:
   - ".cpy"
   ace_mode: cobol
   codemirror_mode: cobol
-  codemirror_mime_mode: text/x-cobol
+  codemirror_mime_type: text/x-cobol
   language_id: 48
 COLLADA:
   type: data
@@ -562,14 +562,14 @@ COLLADA:
   tm_scope: text.xml
   ace_mode: xml
   codemirror_mode: xml
-  codemirror_mime_mode: text/xml
+  codemirror_mime_type: text/xml
   language_id: 49
 CSS:
   type: markup
   tm_scope: source.css
   ace_mode: css
   codemirror_mode: css
-  codemirror_mime_mode: text/css
+  codemirror_mime_type: text/css
   color: "#563d7c"
   extensions:
   - ".css"
@@ -626,7 +626,7 @@ ChucK:
   tm_scope: source.java
   ace_mode: java
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-java
+  codemirror_mime_type: text/x-java
   language_id: 57
 Cirru:
   type: programming
@@ -664,7 +664,7 @@ Clojure:
   type: programming
   ace_mode: clojure
   codemirror_mode: clojure
-  codemirror_mime_mode: text/x-clojure
+  codemirror_mime_type: text/x-clojure
   color: "#db5855"
   extensions:
   - ".clj"
@@ -684,7 +684,7 @@ CoffeeScript:
   tm_scope: source.coffee
   ace_mode: coffee
   codemirror_mode: coffeescript
-  codemirror_mime_mode: text/x-coffeescript
+  codemirror_mime_type: text/x-coffeescript
   color: "#244776"
   aliases:
   - coffee
@@ -751,7 +751,7 @@ Common Lisp:
   - ecl
   ace_mode: lisp
   codemirror_mode: commonlisp
-  codemirror_mime_mode: text/x-common-lisp
+  codemirror_mime_type: text/x-common-lisp
   language_id: 66
 Component Pascal:
   type: programming
@@ -765,7 +765,7 @@ Component Pascal:
   - objectpascal
   ace_mode: pascal
   codemirror_mode: pascal
-  codemirror_mime_mode: text/x-pascal
+  codemirror_mime_type: text/x-pascal
   language_id: 67
 Cool:
   type: programming
@@ -809,7 +809,7 @@ Crystal:
   - ".cr"
   ace_mode: ruby
   codemirror_mode: crystal
-  codemirror_mime_mode: text/x-crystal
+  codemirror_mime_type: text/x-crystal
   tm_scope: source.crystal
   interpreters:
   - crystal
@@ -860,7 +860,7 @@ Cuda:
   tm_scope: source.cuda-c++
   ace_mode: c_cpp
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-c++src
+  codemirror_mime_type: text/x-c++src
   color: "#3A4E3A"
   language_id: 77
 Cycript:
@@ -870,7 +870,7 @@ Cycript:
   tm_scope: source.js
   ace_mode: javascript
   codemirror_mode: javascript
-  codemirror_mime_mode: text/javascript
+  codemirror_mime_type: text/javascript
   language_id: 78
 Cython:
   type: programming
@@ -883,7 +883,7 @@ Cython:
   - pyrex
   ace_mode: text
   codemirror_mode: python
-  codemirror_mime_mode: text/x-cython
+  codemirror_mime_type: text/x-cython
   language_id: 79
 D:
   type: programming
@@ -893,7 +893,7 @@ D:
   - ".di"
   ace_mode: d
   codemirror_mode: d
-  codemirror_mime_mode: text/x-d
+  codemirror_mime_type: text/x-d
   language_id: 80
 D-ObjDump:
   type: data
@@ -940,7 +940,7 @@ DTrace:
   tm_scope: source.c
   ace_mode: c_cpp
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-csrc
+  codemirror_mime_type: text/x-csrc
   language_id: 85
 Darcs Patch:
   type: data
@@ -962,7 +962,7 @@ Dart:
   - dart
   ace_mode: dart
   codemirror_mode: dart
-  codemirror_mime_mode: application/dart
+  codemirror_mime_type: application/dart
   language_id: 87
 Diff:
   type: data
@@ -974,7 +974,7 @@ Diff:
   tm_scope: source.diff
   ace_mode: diff
   codemirror_mode: diff
-  codemirror_mime_mode: text/x-diff
+  codemirror_mime_type: text/x-diff
   language_id: 88
 Dockerfile:
   type: data
@@ -985,7 +985,7 @@ Dockerfile:
   - Dockerfile
   ace_mode: dockerfile
   codemirror_mode: dockerfile
-  codemirror_mime_mode: text/x-dockerfile
+  codemirror_mime_type: text/x-dockerfile
   language_id: 89
 Dogescript:
   type: programming
@@ -1005,7 +1005,7 @@ Dylan:
   - ".lid"
   ace_mode: text
   codemirror_mode: dylan
-  codemirror_mime_mode: text/x-dylan
+  codemirror_mime_type: text/x-dylan
   language_id: 91
 E:
   type: programming
@@ -1026,7 +1026,7 @@ ECL:
   tm_scope: none
   ace_mode: text
   codemirror_mode: ecl
-  codemirror_mime_mode: text/x-ecl
+  codemirror_mime_type: text/x-ecl
   language_id: 93
 ECLiPSe:
   type: programming
@@ -1053,7 +1053,7 @@ EQ:
   tm_scope: source.cs
   ace_mode: csharp
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-csharp
+  codemirror_mime_type: text/x-csharp
   language_id: 96
 Eagle:
   type: markup
@@ -1064,7 +1064,7 @@ Eagle:
   tm_scope: text.xml
   ace_mode: xml
   codemirror_mode: xml
-  codemirror_mime_mode: text/xml
+  codemirror_mime_type: text/xml
   language_id: 97
 Ecere Projects:
   type: data
@@ -1074,7 +1074,7 @@ Ecere Projects:
   tm_scope: source.json
   ace_mode: json
   codemirror_mode: javascript
-  codemirror_mime_mode: application/json
+  codemirror_mime_type: application/json
   language_id: 98
 Eiffel:
   type: programming
@@ -1083,7 +1083,7 @@ Eiffel:
   - ".e"
   ace_mode: eiffel
   codemirror_mode: eiffel
-  codemirror_mime_mode: text/x-eiffel
+  codemirror_mime_type: text/x-eiffel
   language_id: 99
 Elixir:
   type: programming
@@ -1105,7 +1105,7 @@ Elm:
   tm_scope: source.elm
   ace_mode: elm
   codemirror_mode: elm
-  codemirror_mime_mode: text/x-elm
+  codemirror_mime_type: text/x-elm
   language_id: 101
 Emacs Lisp:
   type: programming
@@ -1130,7 +1130,7 @@ Emacs Lisp:
   - ".emacs.desktop"
   ace_mode: lisp
   codemirror_mode: commonlisp
-  codemirror_mime_mode: text/x-common-lisp
+  codemirror_mime_type: text/x-common-lisp
   language_id: 102
 EmberScript:
   type: programming
@@ -1141,7 +1141,7 @@ EmberScript:
   tm_scope: source.coffee
   ace_mode: coffee
   codemirror_mode: coffeescript
-  codemirror_mime_mode: text/x-coffeescript
+  codemirror_mime_type: text/x-coffeescript
   language_id: 103
 Erlang:
   type: programming
@@ -1160,7 +1160,7 @@ Erlang:
   - rebar.lock
   ace_mode: erlang
   codemirror_mode: erlang
-  codemirror_mime_mode: text/x-erlang
+  codemirror_mime_type: text/x-erlang
   interpreters:
   - escript
   language_id: 104
@@ -1177,7 +1177,7 @@ F#:
   tm_scope: source.fsharp
   ace_mode: text
   codemirror_mode: mllike
-  codemirror_mime_mode: text/x-fsharp
+  codemirror_mime_type: text/x-fsharp
   language_id: 105
 FLUX:
   type: programming
@@ -1203,7 +1203,7 @@ FORTRAN:
   tm_scope: source.fortran.modern
   ace_mode: text
   codemirror_mode: fortran
-  codemirror_mime_mode: text/x-fortran
+  codemirror_mime_type: text/x-fortran
   language_id: 107
 Factor:
   type: programming
@@ -1215,7 +1215,7 @@ Factor:
   - ".factor-rc"
   ace_mode: text
   codemirror_mode: factor
-  codemirror_mime_mode: text/x-factor
+  codemirror_mime_type: text/x-factor
   language_id: 108
 Fancy:
   type: programming
@@ -1272,7 +1272,7 @@ Forth:
   - ".fs"
   ace_mode: forth
   codemirror_mode: forth
-  codemirror_mime_mode: text/x-forth
+  codemirror_mime_type: text/x-forth
   language_id: 114
 FreeMarker:
   type: programming
@@ -1335,7 +1335,7 @@ GCC Machine Description:
   tm_scope: source.lisp
   ace_mode: lisp
   codemirror_mode: commonlisp
-  codemirror_mime_mode: text/x-common-lisp
+  codemirror_mime_type: text/x-common-lisp
   language_id: 121
 GDB:
   type: programming
@@ -1381,7 +1381,7 @@ Game Maker Language:
   tm_scope: source.c++
   ace_mode: c_cpp
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-c++src
+  codemirror_mime_type: text/x-c++src
   language_id: 125
 Genshi:
   type: programming
@@ -1393,7 +1393,7 @@ Genshi:
   - xml+kid
   ace_mode: xml
   codemirror_mode: xml
-  codemirror_mime_mode: text/xml
+  codemirror_mime_type: text/xml
   language_id: 126
 Gentoo Ebuild:
   type: programming
@@ -1403,7 +1403,7 @@ Gentoo Ebuild:
   tm_scope: source.shell
   ace_mode: sh
   codemirror_mode: shell
-  codemirror_mime_mode: text/x-sh
+  codemirror_mime_type: text/x-sh
   language_id: 127
 Gentoo Eclass:
   type: programming
@@ -1413,7 +1413,7 @@ Gentoo Eclass:
   tm_scope: source.shell
   ace_mode: sh
   codemirror_mode: shell
-  codemirror_mime_mode: text/x-sh
+  codemirror_mime_type: text/x-sh
   language_id: 128
 Gettext Catalog:
   type: prose
@@ -1435,7 +1435,7 @@ Glyph:
   tm_scope: source.tcl
   ace_mode: tcl
   codemirror_mode: tcl
-  codemirror_mime_mode: text/x-tcl
+  codemirror_mime_type: text/x-tcl
   language_id: 130
 Gnuplot:
   type: programming
@@ -1457,7 +1457,7 @@ Go:
   - ".go"
   ace_mode: golang
   codemirror_mode: go
-  codemirror_mime_mode: text/x-go
+  codemirror_mime_type: text/x-go
   language_id: 132
 Golo:
   type: programming
@@ -1504,7 +1504,7 @@ Grammatical Framework:
   tm_scope: source.haskell
   ace_mode: haskell
   codemirror_mode: haskell
-  codemirror_mime_mode: text/x-haskell
+  codemirror_mime_type: text/x-haskell
   language_id: 137
 Graph Modeling Language:
   type: data
@@ -1565,13 +1565,13 @@ Groff:
   - troff
   ace_mode: text
   codemirror_mode: troff
-  codemirror_mime_mode: text/troff
+  codemirror_mime_type: text/troff
   language_id: 141
 Groovy:
   type: programming
   ace_mode: groovy
   codemirror_mode: groovy
-  codemirror_mime_mode: text/x-groovy
+  codemirror_mime_type: text/x-groovy
   color: "#e69f56"
   extensions:
   - ".groovy"
@@ -1594,7 +1594,7 @@ Groovy Server Pages:
   tm_scope: text.html.jsp
   ace_mode: jsp
   codemirror_mode: htmlembedded
-  codemirror_mime_mode: application/x-jsp
+  codemirror_mime_type: application/x-jsp
   language_id: 143
 HCL:
   type: programming
@@ -1603,7 +1603,7 @@ HCL:
   - ".tf"
   ace_mode: ruby
   codemirror_mode: ruby
-  codemirror_mime_mode: text/x-ruby
+  codemirror_mime_type: text/x-ruby
   tm_scope: source.ruby
   language_id: 144
 HLSL:
@@ -1621,7 +1621,7 @@ HTML:
   tm_scope: text.html.basic
   ace_mode: html
   codemirror_mode: htmlmixed
-  codemirror_mime_mode: text/html
+  codemirror_mime_type: text/html
   color: "#e44b23"
   aliases:
   - xhtml
@@ -1648,7 +1648,7 @@ HTML+Django:
   - htmldjango
   ace_mode: django
   codemirror_mode: django
-  codemirror_mime_mode: text/x-django
+  codemirror_mime_type: text/x-django
   language_id: 147
 HTML+ECR:
   type: markup
@@ -1660,7 +1660,7 @@ HTML+ECR:
   - ".ecr"
   ace_mode: text
   codemirror_mode: htmlmixed
-  codemirror_mime_mode: text/html
+  codemirror_mime_type: text/html
   language_id: 148
 HTML+EEX:
   type: markup
@@ -1672,7 +1672,7 @@ HTML+EEX:
   - ".eex"
   ace_mode: text
   codemirror_mode: htmlmixed
-  codemirror_mime_mode: text/html
+  codemirror_mime_type: text/html
   language_id: 149
 HTML+ERB:
   type: markup
@@ -1685,7 +1685,7 @@ HTML+ERB:
   - ".erb.deface"
   ace_mode: text
   codemirror_mode: htmlembedded
-  codemirror_mime_mode: application/x-erb
+  codemirror_mime_type: application/x-erb
   language_id: 150
 HTML+PHP:
   type: markup
@@ -1695,7 +1695,7 @@ HTML+PHP:
   - ".phtml"
   ace_mode: php
   codemirror_mode: php
-  codemirror_mime_mode: application/x-httpd-php
+  codemirror_mime_type: application/x-httpd-php
   language_id: 151
 HTTP:
   type: data
@@ -1704,13 +1704,13 @@ HTTP:
   tm_scope: source.httpspec
   ace_mode: text
   codemirror_mode: http
-  codemirror_mime_mode: message/http
+  codemirror_mime_type: message/http
   language_id: 152
 Hack:
   type: programming
   ace_mode: php
   codemirror_mode: php
-  codemirror_mime_mode: application/x-httpd-php
+  codemirror_mime_type: application/x-httpd-php
   extensions:
   - ".hh"
   - ".php"
@@ -1725,7 +1725,7 @@ Haml:
   - ".haml.deface"
   ace_mode: haml
   codemirror_mode: haml
-  codemirror_mime_mode: text/x-haml
+  codemirror_mime_type: text/x-haml
   color: "#ECE2A9"
   language_id: 154
 Handlebars:
@@ -1759,13 +1759,13 @@ Haskell:
   - runhaskell
   ace_mode: haskell
   codemirror_mode: haskell
-  codemirror_mime_mode: text/x-haskell
+  codemirror_mime_type: text/x-haskell
   language_id: 157
 Haxe:
   type: programming
   ace_mode: haxe
   codemirror_mode: haxe
-  codemirror_mime_mode: text/x-haxe
+  codemirror_mime_type: text/x-haxe
   color: "#df7900"
   extensions:
   - ".hx"
@@ -1797,7 +1797,7 @@ IDL:
   - ".dlm"
   ace_mode: text
   codemirror_mode: idl
-  codemirror_mime_mode: text/x-idl
+  codemirror_mime_type: text/x-idl
   language_id: 161
 IGOR Pro:
   type: programming
@@ -1822,7 +1822,7 @@ INI:
   - dosini
   ace_mode: ini
   codemirror_mode: properties
-  codemirror_mime_mode: text/x-properties
+  codemirror_mime_type: text/x-properties
   language_id: 163
 IRC log:
   type: data
@@ -1923,7 +1923,7 @@ JSON:
   group: JavaScript
   ace_mode: json
   codemirror_mode: javascript
-  codemirror_mime_mode: application/json
+  codemirror_mime_type: application/json
   searchable: false
   extensions:
   - ".json"
@@ -1943,7 +1943,7 @@ JSON5:
   tm_scope: source.js
   ace_mode: javascript
   codemirror_mode: javascript
-  codemirror_mime_mode: application/json
+  codemirror_mime_type: application/json
   language_id: 175
 JSONLD:
   type: data
@@ -1958,7 +1958,7 @@ JSONiq:
   type: programming
   ace_mode: jsoniq
   codemirror_mode: javascript
-  codemirror_mime_mode: application/json
+  codemirror_mime_type: application/json
   extensions:
   - ".jq"
   tm_scope: source.jq
@@ -1971,7 +1971,7 @@ JSX:
   tm_scope: source.js.jsx
   ace_mode: javascript
   codemirror_mode: jsx
-  codemirror_mime_mode: text/jsx
+  codemirror_mime_type: text/jsx
   language_id: 178
 Jade:
   group: HTML
@@ -1982,7 +1982,7 @@ Jade:
   tm_scope: text.jade
   ace_mode: jade
   codemirror_mode: pug
-  codemirror_mime_mode: text/x-pug
+  codemirror_mime_type: text/x-pug
   language_id: 179
 Jasmin:
   type: programming
@@ -1995,7 +1995,7 @@ Java:
   type: programming
   ace_mode: java
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-java
+  codemirror_mime_type: text/x-java
   color: "#b07219"
   extensions:
   - ".java"
@@ -2011,14 +2011,14 @@ Java Server Pages:
   tm_scope: text.html.jsp
   ace_mode: jsp
   codemirror_mode: htmlembedded
-  codemirror_mime_mode: application/x-jsp
+  codemirror_mime_type: application/x-jsp
   language_id: 182
 JavaScript:
   type: programming
   tm_scope: source.js
   ace_mode: javascript
   codemirror_mode: javascript
-  codemirror_mime_mode: text/javascript
+  codemirror_mime_type: text/javascript
   color: "#f1e05a"
   aliases:
   - js
@@ -2068,13 +2068,13 @@ Julia:
   color: "#a270ba"
   ace_mode: julia
   codemirror_mode: julia
-  codemirror_mime_mode: text/x-julia
+  codemirror_mime_type: text/x-julia
   language_id: 184
 Jupyter Notebook:
   type: markup
   ace_mode: json
   codemirror_mode: javascript
-  codemirror_mime_mode: application/json
+  codemirror_mime_type: application/json
   tm_scope: source.json
   color: "#DA5B0B"
   extensions:
@@ -2105,7 +2105,7 @@ Kit:
   type: markup
   ace_mode: html
   codemirror_mode: htmlmixed
-  codemirror_mime_mode: text/html
+  codemirror_mime_type: text/html
   extensions:
   - ".kit"
   tm_scope: text.html.basic
@@ -2120,7 +2120,7 @@ Kotlin:
   tm_scope: source.Kotlin
   ace_mode: text
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-kotlin
+  codemirror_mime_type: text/x-kotlin
   language_id: 189
 LFE:
   type: programming
@@ -2131,7 +2131,7 @@ LFE:
   tm_scope: source.lisp
   ace_mode: lisp
   codemirror_mode: commonlisp
-  codemirror_mime_mode: text/x-common-lisp
+  codemirror_mime_type: text/x-common-lisp
   language_id: 190
 LLVM:
   type: programming
@@ -2165,7 +2165,7 @@ LabVIEW:
   tm_scope: text.xml
   ace_mode: xml
   codemirror_mode: xml
-  codemirror_mime_mode: text/xml
+  codemirror_mime_type: text/xml
   language_id: 194
 Lasso:
   type: programming
@@ -2190,7 +2190,7 @@ Latte:
   tm_scope: text.html.smarty
   ace_mode: smarty
   codemirror_mode: smarty
-  codemirror_mime_mode: text/x-smarty
+  codemirror_mime_type: text/x-smarty
   language_id: 196
 Lean:
   type: programming
@@ -2207,7 +2207,7 @@ Less:
   tm_scope: source.css.less
   ace_mode: less
   codemirror_mode: css
-  codemirror_mime_mode: text/css
+  codemirror_mime_type: text/css
   color: "#A1D9A1"
   language_id: 198
 Lex:
@@ -2292,7 +2292,7 @@ Literate Haskell:
   tm_scope: text.tex.latex.haskell
   ace_mode: text
   codemirror_mode: haskell-literate
-  codemirror_mime_mode: text/x-literate-haskell
+  codemirror_mime_type: text/x-literate-haskell
   language_id: 207
 LiveScript:
   type: programming
@@ -2307,7 +2307,7 @@ LiveScript:
   - Slakefile
   ace_mode: livescript
   codemirror_mode: livescript
-  codemirror_mime_mode: text/x-livescript
+  codemirror_mime_type: text/x-livescript
   language_id: 208
 Logos:
   type: programming
@@ -2329,7 +2329,7 @@ LookML:
   type: programming
   ace_mode: yaml
   codemirror_mode: yaml
-  codemirror_mime_mode: text/x-yaml
+  codemirror_mime_type: text/x-yaml
   color: "#652B81"
   extensions:
   - ".lookml"
@@ -2346,7 +2346,7 @@ Lua:
   type: programming
   ace_mode: lua
   codemirror_mode: lua
-  codemirror_mime_mode: text/x-lua
+  codemirror_mime_type: text/x-lua
   color: "#000080"
   extensions:
   - ".lua"
@@ -2367,7 +2367,7 @@ M:
   - ".m"
   ace_mode: text
   codemirror_mode: mumps
-  codemirror_mime_mode: text/x-mumps
+  codemirror_mime_type: text/x-mumps
   language_id: 214
   tm_scope: none
 M4:
@@ -2406,7 +2406,7 @@ MTML:
   tm_scope: text.html.basic
   ace_mode: html
   codemirror_mode: htmlmixed
-  codemirror_mime_mode: text/html
+  codemirror_mime_type: text/html
   language_id: 218
 MUF:
   type: programming
@@ -2417,7 +2417,7 @@ MUF:
   tm_scope: none
   ace_mode: forth
   codemirror_mode: forth
-  codemirror_mime_mode: text/x-forth
+  codemirror_mime_type: text/x-forth
   language_id: 219
 Makefile:
   type: programming
@@ -2447,7 +2447,7 @@ Makefile:
   - make
   ace_mode: makefile
   codemirror_mode: cmake
-  codemirror_mime_mode: text/x-cmake
+  codemirror_mime_type: text/x-cmake
   language_id: 220
 Mako:
   type: programming
@@ -2461,7 +2461,7 @@ Markdown:
   type: prose
   ace_mode: markdown
   codemirror_mode: gfm
-  codemirror_mime_mode: text/x-gfm
+  codemirror_mime_type: text/x-gfm
   wrap: true
   extensions:
   - ".md"
@@ -2496,7 +2496,7 @@ Mathematica:
   - mma
   ace_mode: text
   codemirror_mode: mathematica
-  codemirror_mime_mode: text/x-mathematica
+  codemirror_mime_type: text/x-mathematica
   language_id: 224
 Matlab:
   type: programming
@@ -2508,7 +2508,7 @@ Matlab:
   - ".m"
   ace_mode: matlab
   codemirror_mode: octave
-  codemirror_mime_mode: text/x-octave
+  codemirror_mime_type: text/x-octave
   language_id: 225
 Maven POM:
   type: data
@@ -2517,7 +2517,7 @@ Maven POM:
   - pom.xml
   ace_mode: xml
   codemirror_mode: xml
-  codemirror_mime_mode: text/xml
+  codemirror_mime_type: text/xml
   language_id: 226
 Max:
   type: programming
@@ -2535,7 +2535,7 @@ Max:
   tm_scope: source.json
   ace_mode: json
   codemirror_mode: javascript
-  codemirror_mime_mode: application/json
+  codemirror_mime_type: application/json
   language_id: 227
 MediaWiki:
   type: prose
@@ -2565,7 +2565,7 @@ Metal:
   tm_scope: source.c++
   ace_mode: c_cpp
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-c++src
+  codemirror_mime_type: text/x-c++src
   language_id: 230
 MiniD:
   type: programming
@@ -2587,7 +2587,7 @@ Mirah:
   tm_scope: source.ruby
   ace_mode: ruby
   codemirror_mode: ruby
-  codemirror_mime_mode: text/x-ruby
+  codemirror_mime_type: text/x-ruby
   language_id: 232
 Modelica:
   type: programming
@@ -2596,7 +2596,7 @@ Modelica:
   tm_scope: source.modelica
   ace_mode: text
   codemirror_mode: modelica
-  codemirror_mime_mode: text/x-modelica
+  codemirror_mime_type: text/x-modelica
   language_id: 233
 Modula-2:
   type: programming
@@ -2667,7 +2667,7 @@ NSIS:
   - ".nsh"
   ace_mode: text
   codemirror_mode: nsis
-  codemirror_mime_mode: text/x-nsis
+  codemirror_mime_type: text/x-nsis
   language_id: 242
 Nemerle:
   type: programming
@@ -2702,7 +2702,7 @@ NetLogo:
   tm_scope: source.lisp
   ace_mode: lisp
   codemirror_mode: commonlisp
-  codemirror_mime_mode: text/x-common-lisp
+  codemirror_mime_type: text/x-common-lisp
   language_id: 246
 NewLisp:
   type: programming
@@ -2717,7 +2717,7 @@ NewLisp:
   tm_scope: source.lisp
   ace_mode: lisp
   codemirror_mode: commonlisp
-  codemirror_mime_mode: text/x-common-lisp
+  codemirror_mime_type: text/x-common-lisp
   language_id: 247
 Nginx:
   type: markup
@@ -2731,7 +2731,7 @@ Nginx:
   - nginx configuration file
   ace_mode: text
   codemirror_mode: nginx
-  codemirror_mime_mode: text/x-nginx-conf
+  codemirror_mime_type: text/x-nginx-conf
   color: "#9469E9"
   language_id: 248
 Nimrod:
@@ -2780,7 +2780,7 @@ Nu:
   tm_scope: source.nu
   ace_mode: scheme
   codemirror_mode: scheme
-  codemirror_mime_mode: text/x-scheme
+  codemirror_mime_type: text/x-scheme
   interpreters:
   - nush
   language_id: 253
@@ -2794,14 +2794,14 @@ NumPy:
   tm_scope: none
   ace_mode: text
   codemirror_mode: python
-  codemirror_mime_mode: text/x-python
+  codemirror_mime_type: text/x-python
   color: "#9C8AF9"
   language_id: 254
 OCaml:
   type: programming
   ace_mode: ocaml
   codemirror_mode: mllike
-  codemirror_mime_mode: text/x-ocaml
+  codemirror_mime_type: text/x-ocaml
   color: "#3be133"
   extensions:
   - ".ml"
@@ -2837,7 +2837,7 @@ Objective-C:
   - ".h"
   ace_mode: objectivec
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-objectivec
+  codemirror_mime_type: text/x-objectivec
   language_id: 257
 Objective-C++:
   type: programming
@@ -2851,7 +2851,7 @@ Objective-C++:
   - ".mm"
   ace_mode: objectivec
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-objectivec
+  codemirror_mime_type: text/x-objectivec
   language_id: 258
 Objective-J:
   type: programming
@@ -2897,7 +2897,7 @@ OpenCL:
   tm_scope: source.c
   ace_mode: c_cpp
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-csrc
+  codemirror_mime_type: text/x-csrc
   language_id: 263
 OpenEdge ABL:
   type: programming
@@ -2921,7 +2921,7 @@ OpenRC runscript:
   tm_scope: source.shell
   ace_mode: sh
   codemirror_mode: shell
-  codemirror_mime_mode: text/x-sh
+  codemirror_mime_type: text/x-sh
   language_id: 265
 OpenSCAD:
   type: programming
@@ -2963,7 +2963,7 @@ Oz:
   tm_scope: source.oz
   ace_mode: text
   codemirror_mode: oz
-  codemirror_mime_mode: text/x-oz
+  codemirror_mime_type: text/x-oz
   language_id: 270
 PAWN:
   type: programming
@@ -2979,7 +2979,7 @@ PHP:
   tm_scope: text.html.php
   ace_mode: php
   codemirror_mode: php
-  codemirror_mime_mode: application/x-httpd-php
+  codemirror_mime_type: application/x-httpd-php
   color: "#4F5D95"
   extensions:
   - ".php"
@@ -3003,7 +3003,7 @@ PLSQL:
   type: programming
   ace_mode: sql
   codemirror_mode: sql
-  codemirror_mime_mode: text/x-plsql
+  codemirror_mime_type: text/x-plsql
   tm_scope: none
   color: "#dad8d8"
   extensions:
@@ -3019,7 +3019,7 @@ PLpgSQL:
   type: programming
   ace_mode: pgsql
   codemirror_mode: sql
-  codemirror_mime_mode: text/x-sql
+  codemirror_mime_type: text/x-sql
   tm_scope: source.sql
   extensions:
   - ".sql"
@@ -3097,14 +3097,14 @@ Pascal:
   - instantfpc
   ace_mode: pascal
   codemirror_mode: pascal
-  codemirror_mime_mode: text/x-pascal
+  codemirror_mime_type: text/x-pascal
   language_id: 281
 Perl:
   type: programming
   tm_scope: source.perl
   ace_mode: perl
   codemirror_mode: perl
-  codemirror_mime_mode: text/x-perl
+  codemirror_mime_type: text/x-perl
   color: "#0298c3"
   extensions:
   - ".pl"
@@ -3143,7 +3143,7 @@ Perl6:
   tm_scope: source.perl6fe
   ace_mode: perl
   codemirror_mode: perl
-  codemirror_mime_mode: text/x-perl
+  codemirror_mime_type: text/x-perl
   language_id: 283
 Pickle:
   type: data
@@ -3184,7 +3184,7 @@ Pod:
   type: prose
   ace_mode: perl
   codemirror_mode: perl
-  codemirror_mime_mode: text/x-perl
+  codemirror_mime_type: text/x-perl
   wrap: true
   extensions:
   - ".pod"
@@ -3231,7 +3231,7 @@ PowerShell:
   type: programming
   ace_mode: powershell
   codemirror_mode: powershell
-  codemirror_mime_mode: application/x-powershell
+  codemirror_mime_type: application/x-powershell
   aliases:
   - posh
   extensions:
@@ -3278,7 +3278,7 @@ Protocol Buffer:
   tm_scope: source.protobuf
   ace_mode: protobuf
   codemirror_mode: protobuf
-  codemirror_mime_mode: text/x-protobuf
+  codemirror_mime_type: text/x-protobuf
   language_id: 297
 Public Key:
   type: data
@@ -3297,7 +3297,7 @@ Puppet:
   - Modulefile
   ace_mode: text
   codemirror_mode: puppet
-  codemirror_mime_mode: text/x-puppet
+  codemirror_mime_type: text/x-puppet
   tm_scope: source.puppet
   language_id: 299
 Pure Data:
@@ -3325,13 +3325,13 @@ PureScript:
   tm_scope: source.purescript
   ace_mode: haskell
   codemirror_mode: haskell
-  codemirror_mime_mode: text/x-haskell
+  codemirror_mime_type: text/x-haskell
   language_id: 302
 Python:
   type: programming
   ace_mode: python
   codemirror_mode: python
-  codemirror_mime_mode: text/x-python
+  codemirror_mime_type: text/x-python
   color: "#3572A5"
   extensions:
   - ".py"
@@ -3407,13 +3407,13 @@ R:
   - Rscript
   ace_mode: r
   codemirror_mode: r
-  codemirror_mime_mode: text/x-rsrc
+  codemirror_mime_type: text/x-rsrc
   language_id: 307
 RAML:
   type: markup
   ace_mode: yaml
   codemirror_mode: yaml
-  codemirror_mime_mode: text/x-yaml
+  codemirror_mime_type: text/x-yaml
   tm_scope: source.yaml
   color: "#77d9fb"
   extensions:
@@ -3460,14 +3460,14 @@ RHTML:
   - html+ruby
   ace_mode: rhtml
   codemirror_mode: htmlembedded
-  codemirror_mime_mode: application/x-erb
+  codemirror_mime_type: application/x-erb
   language_id: 312
 RMarkdown:
   type: prose
   wrap: true
   ace_mode: markdown
   codemirror_mode: gfm
-  codemirror_mime_mode: text/x-gfm
+  codemirror_mime_type: text/x-gfm
   extensions:
   - ".rmd"
   tm_scope: source.gfm
@@ -3481,7 +3481,7 @@ RPM Spec:
   - specfile
   ace_mode: text
   codemirror_mode: rpm
-  codemirror_mime_mode: text/x-rpm-spec
+  codemirror_mime_type: text/x-rpm-spec
   language_id: 314
 RUNOFF:
   type: markup
@@ -3585,7 +3585,7 @@ Rouge:
   type: programming
   ace_mode: clojure
   codemirror_mode: clojure
-  codemirror_mime_mode: text/x-clojure
+  codemirror_mime_type: text/x-clojure
   color: "#cc0088"
   extensions:
   - ".rg"
@@ -3595,7 +3595,7 @@ Ruby:
   type: programming
   ace_mode: ruby
   codemirror_mode: ruby
-  codemirror_mime_mode: text/x-ruby
+  codemirror_mime_type: text/x-ruby
   color: "#701516"
   aliases:
   - jruby
@@ -3658,7 +3658,7 @@ Rust:
   - ".rs.in"
   ace_mode: rust
   codemirror_mode: rust
-  codemirror_mime_mode: text/x-rustsrc
+  codemirror_mime_type: text/x-rustsrc
   language_id: 327
 SAS:
   type: programming
@@ -3668,7 +3668,7 @@ SAS:
   tm_scope: source.sas
   ace_mode: text
   codemirror_mode: sas
-  codemirror_mime_mode: text/x-sas
+  codemirror_mime_type: text/x-sas
   language_id: 328
 SCSS:
   type: markup
@@ -3676,7 +3676,7 @@ SCSS:
   group: CSS
   ace_mode: scss
   codemirror_mode: css
-  codemirror_mime_mode: text/x-scss
+  codemirror_mime_type: text/x-scss
   extensions:
   - ".scss"
   color: "#CF649A"
@@ -3705,7 +3705,7 @@ SPARQL:
   tm_scope: source.sparql
   ace_mode: text
   codemirror_mode: sparql
-  codemirror_mime_mode: application/sparql-query
+  codemirror_mime_type: application/sparql-query
   extensions:
   - ".sparql"
   - ".rq"
@@ -3724,7 +3724,7 @@ SQL:
   tm_scope: source.sql
   ace_mode: sql
   codemirror_mode: sql
-  codemirror_mime_mode: text/x-sql
+  codemirror_mime_type: text/x-sql
   extensions:
   - ".sql"
   - ".cql"
@@ -3739,7 +3739,7 @@ SQLPL:
   type: programming
   ace_mode: sql
   codemirror_mode: sql
-  codemirror_mime_mode: text/x-sql
+  codemirror_mime_type: text/x-sql
   tm_scope: source.sql
   extensions:
   - ".sql"
@@ -3751,7 +3751,7 @@ SRecode Template:
   tm_scope: source.lisp
   ace_mode: lisp
   codemirror_mode: commonlisp
-  codemirror_mime_mode: text/x-common-lisp
+  codemirror_mime_type: text/x-common-lisp
   extensions:
   - ".srt"
   language_id: 335
@@ -3770,7 +3770,7 @@ SVG:
   tm_scope: text.xml
   ace_mode: xml
   codemirror_mode: xml
-  codemirror_mime_mode: text/xml
+  codemirror_mime_type: text/xml
   language_id: 337
 Sage:
   type: programming
@@ -3781,7 +3781,7 @@ Sage:
   tm_scope: source.python
   ace_mode: python
   codemirror_mode: python
-  codemirror_mime_mode: text/x-python
+  codemirror_mime_type: text/x-python
   language_id: 338
 SaltStack:
   type: programming
@@ -3794,7 +3794,7 @@ SaltStack:
   tm_scope: source.yaml.salt
   ace_mode: yaml
   codemirror_mode: yaml
-  codemirror_mime_mode: text/x-yaml
+  codemirror_mime_type: text/x-yaml
   language_id: 339
 Sass:
   type: markup
@@ -3804,14 +3804,14 @@ Sass:
   - ".sass"
   ace_mode: sass
   codemirror_mode: sass
-  codemirror_mime_mode: text/x-sass
+  codemirror_mime_type: text/x-sass
   color: "#CF649A"
   language_id: 340
 Scala:
   type: programming
   ace_mode: scala
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-scala
+  codemirror_mime_type: text/x-scala
   color: "#c22d40"
   extensions:
   - ".scala"
@@ -3846,7 +3846,7 @@ Scheme:
   - r6rs
   ace_mode: scheme
   codemirror_mode: scheme
-  codemirror_mime_mode: text/x-scheme
+  codemirror_mime_type: text/x-scheme
   language_id: 343
 Scilab:
   type: programming
@@ -3899,7 +3899,7 @@ Shell:
   - zsh
   ace_mode: sh
   codemirror_mode: shell
-  codemirror_mime_mode: text/x-sh
+  codemirror_mime_type: text/x-sh
   language_id: 346
 ShellSession:
   type: programming
@@ -3911,7 +3911,7 @@ ShellSession:
   tm_scope: text.shell-session
   ace_mode: sh
   codemirror_mode: shell
-  codemirror_mime_mode: text/x-sh
+  codemirror_mime_type: text/x-sh
   language_id: 347
 Shen:
   type: programming
@@ -3938,7 +3938,7 @@ Slim:
   tm_scope: text.slim
   ace_mode: text
   codemirror_mode: slim
-  codemirror_mime_mode: text/x-slim
+  codemirror_mime_type: text/x-slim
   language_id: 350
 Smali:
   type: programming
@@ -3957,7 +3957,7 @@ Smalltalk:
   - squeak
   ace_mode: text
   codemirror_mode: smalltalk
-  codemirror_mime_mode: text/x-stsrc
+  codemirror_mime_type: text/x-stsrc
   language_id: 352
 Smarty:
   type: programming
@@ -3965,7 +3965,7 @@ Smarty:
   - ".tpl"
   ace_mode: smarty
   codemirror_mode: smarty
-  codemirror_mime_mode: text/x-smarty
+  codemirror_mime_type: text/x-smarty
   tm_scope: text.html.smarty
   language_id: 353
 SourcePawn:
@@ -3988,7 +3988,7 @@ Squirrel:
   tm_scope: source.c++
   ace_mode: c_cpp
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-c++src
+  codemirror_mime_type: text/x-c++src
   language_id: 355
 Stan:
   type: programming
@@ -4011,7 +4011,7 @@ Standard ML:
   tm_scope: source.ml
   ace_mode: text
   codemirror_mode: mllike
-  codemirror_mime_mode: text/x-ocaml
+  codemirror_mime_type: text/x-ocaml
   language_id: 357
 Stata:
   type: programming
@@ -4059,7 +4059,7 @@ Swift:
   - ".swift"
   ace_mode: text
   codemirror_mode: swift
-  codemirror_mime_mode: text/x-swift
+  codemirror_mime_type: text/x-swift
   language_id: 362
 SystemVerilog:
   type: programming
@@ -4070,7 +4070,7 @@ SystemVerilog:
   - ".vh"
   ace_mode: verilog
   codemirror_mode: verilog
-  codemirror_mime_mode: text/x-systemverilog
+  codemirror_mime_type: text/x-systemverilog
   language_id: 363
 TLA:
   type: programming
@@ -4086,7 +4086,7 @@ TOML:
   tm_scope: source.toml
   ace_mode: toml
   codemirror_mode: toml
-  codemirror_mime_mode: text/x-toml
+  codemirror_mime_type: text/x-toml
   language_id: 365
 TXL:
   type: programming
@@ -4107,7 +4107,7 @@ Tcl:
   - wish
   ace_mode: tcl
   codemirror_mode: tcl
-  codemirror_mime_mode: text/x-tcl
+  codemirror_mime_type: text/x-tcl
   language_id: 367
 Tcsh:
   type: programming
@@ -4118,14 +4118,14 @@ Tcsh:
   tm_scope: source.shell
   ace_mode: sh
   codemirror_mode: shell
-  codemirror_mime_mode: text/x-sh
+  codemirror_mime_type: text/x-sh
   language_id: 368
 TeX:
   type: markup
   color: "#3D6117"
   ace_mode: tex
   codemirror_mode: stex
-  codemirror_mime_mode: text/x-stex
+  codemirror_mime_type: text/x-stex
   wrap: true
   aliases:
   - latex
@@ -4160,7 +4160,7 @@ Terra:
   color: "#00004c"
   ace_mode: lua
   codemirror_mode: lua
-  codemirror_mime_mode: text/x-lua
+  codemirror_mime_type: text/x-lua
   interpreters:
   - lua
   language_id: 371
@@ -4194,7 +4194,7 @@ Textile:
   type: prose
   ace_mode: textile
   codemirror_mode: textile
-  codemirror_mime_mode: text/x-textile
+  codemirror_mime_type: text/x-textile
   wrap: true
   extensions:
   - ".textile"
@@ -4223,7 +4223,7 @@ Turtle:
   tm_scope: source.turtle
   ace_mode: text
   codemirror_mode: turtle
-  codemirror_mime_mode: text/turtle
+  codemirror_mime_type: text/turtle
   language_id: 376
 Twig:
   type: markup
@@ -4233,7 +4233,7 @@ Twig:
   tm_scope: text.html.twig
   ace_mode: twig
   codemirror_mode: twig
-  codemirror_mime_mode: text/x-twig
+  codemirror_mime_type: text/x-twig
   language_id: 377
 TypeScript:
   type: programming
@@ -4246,14 +4246,14 @@ TypeScript:
   tm_scope: source.ts
   ace_mode: typescript
   codemirror_mode: javascript
-  codemirror_mime_mode: application/typescript
+  codemirror_mime_type: application/typescript
   language_id: 378
 Unified Parallel C:
   type: programming
   group: C
   ace_mode: c_cpp
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-csrc
+  codemirror_mime_type: text/x-csrc
   color: "#4e3617"
   extensions:
   - ".upc"
@@ -4263,7 +4263,7 @@ Unity3D Asset:
   type: data
   ace_mode: yaml
   codemirror_mode: yaml
-  codemirror_mime_mode: text/x-yaml
+  codemirror_mime_type: text/x-yaml
   extensions:
   - ".anim"
   - ".asset"
@@ -4279,7 +4279,7 @@ Uno:
   - ".uno"
   ace_mode: csharp
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-csharp
+  codemirror_mime_type: text/x-csharp
   tm_scope: source.cs
   language_id: 381
 UnrealScript:
@@ -4290,7 +4290,7 @@ UnrealScript:
   tm_scope: source.java
   ace_mode: java
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-java
+  codemirror_mime_type: text/x-java
   language_id: 382
 UrWeb:
   type: programming
@@ -4325,7 +4325,7 @@ VHDL:
   - ".vhw"
   ace_mode: vhdl
   codemirror_mode: vhdl
-  codemirror_mime_mode: text/x-vhdl
+  codemirror_mime_type: text/x-vhdl
   language_id: 385
 Vala:
   type: programming
@@ -4343,7 +4343,7 @@ Verilog:
   - ".veo"
   ace_mode: verilog
   codemirror_mode: verilog
-  codemirror_mime_mode: text/x-verilog
+  codemirror_mime_type: text/x-verilog
   language_id: 387
 VimL:
   type: programming
@@ -4382,7 +4382,7 @@ Visual Basic:
   - vbnet
   ace_mode: text
   codemirror_mode: vb
-  codemirror_mime_mode: text/x-vb
+  codemirror_mime_type: text/x-vb
   language_id: 389
 Volt:
   type: programming
@@ -4392,7 +4392,7 @@ Volt:
   tm_scope: source.d
   ace_mode: d
   codemirror_mode: d
-  codemirror_mime_mode: text/x-d
+  codemirror_mime_type: text/x-d
   language_id: 390
 Vue:
   type: markup
@@ -4431,7 +4431,7 @@ WebIDL:
   tm_scope: source.webidl
   ace_mode: text
   codemirror_mode: webidl
-  codemirror_mime_mode: text/x-webidl
+  codemirror_mime_type: text/x-webidl
   language_id: 395
 World of Warcraft Addon Data:
   type: data
@@ -4458,13 +4458,13 @@ XC:
   tm_scope: source.xc
   ace_mode: c_cpp
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-csrc
+  codemirror_mime_type: text/x-csrc
   language_id: 398
 XML:
   type: data
   ace_mode: xml
   codemirror_mode: xml
-  codemirror_mime_mode: text/xml
+  codemirror_mime_type: text/xml
   aliases:
   - rss
   - xsd
@@ -4574,7 +4574,7 @@ XPages:
   tm_scope: none
   ace_mode: xml
   codemirror_mode: xml
-  codemirror_mime_mode: text/xml
+  codemirror_mime_type: text/xml
   language_id: 400
 XProc:
   type: programming
@@ -4584,7 +4584,7 @@ XProc:
   tm_scope: text.xml
   ace_mode: xml
   codemirror_mode: xml
-  codemirror_mime_mode: text/xml
+  codemirror_mime_type: text/xml
   language_id: 401
 XQuery:
   type: programming
@@ -4597,7 +4597,7 @@ XQuery:
   - ".xqy"
   ace_mode: xquery
   codemirror_mode: xquery
-  codemirror_mime_mode: application/xquery
+  codemirror_mime_type: application/xquery
   tm_scope: source.xq
   language_id: 402
 XS:
@@ -4607,7 +4607,7 @@ XS:
   tm_scope: source.c
   ace_mode: c_cpp
   codemirror_mode: clike
-  codemirror_mime_mode: text/x-csrc
+  codemirror_mime_type: text/x-csrc
   language_id: 403
 XSLT:
   type: programming
@@ -4619,7 +4619,7 @@ XSLT:
   tm_scope: text.xml.xsl
   ace_mode: xml
   codemirror_mode: xml
-  codemirror_mime_mode: text/xml
+  codemirror_mime_type: text/xml
   color: "#EB8CEB"
   language_id: 404
 Xojo:
@@ -4657,7 +4657,7 @@ YAML:
   - ".clang-format"
   ace_mode: yaml
   codemirror_mode: yaml
-  codemirror_mime_mode: text/x-yaml
+  codemirror_mime_type: text/x-yaml
   language_id: 407
 YANG:
   type: data
@@ -4715,7 +4715,7 @@ edn:
   type: data
   ace_mode: clojure
   codemirror_mode: clojure
-  codemirror_mime_mode: text/x-clojure
+  codemirror_mime_type: text/x-clojure
   extensions:
   - ".edn"
   tm_scope: source.clojure
@@ -4764,13 +4764,13 @@ reStructuredText:
   - ".rst.txt"
   ace_mode: text
   codemirror_mode: rst
-  codemirror_mime_mode: text/x-rst
+  codemirror_mime_type: text/x-rst
   language_id: 419
 wisp:
   type: programming
   ace_mode: clojure
   codemirror_mode: clojure
-  codemirror_mime_mode: text/x-clojure
+  codemirror_mime_type: text/x-clojure
   color: "#7582D1"
   extensions:
   - ".wisp"
diff --git a/test/test_grammars.rb b/test/test_grammars.rb
index 3b03ca81..1b878847 100644
--- a/test/test_grammars.rb
+++ b/test/test_grammars.rb
@@ -126,7 +126,7 @@ class TestGrammars < Minitest::Test
   private
 
   def submodule_paths
-    @submodule_paths ||= `git config --list --file "#{File.join(ROOT, ".gitmodules")}"`.lines.grep(/\.path=/).map { |line| line.chomp.split("=", 2).last }
+    @submodule_paths ||= `git config --list --file "#{File.join(ROOT, ".gitmodules")}"`.lines.grep(/\.path=/).map { |line| line.chomp.split("=", 2).last }.reject { |path| path =~ /CodeMirror/ }
   end
 
   # Returns a hash of submodules in the form of submodule_path => license
diff --git a/test/test_language.rb b/test/test_language.rb
index 48391e59..1f6d19d2 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -358,11 +358,11 @@ class TestLanguage < Minitest::Test
     assert_equal 'clike', Language['C++'].codemirror_mode
   end
 
-  def test_codemirror_mime_mode
-    assert_equal 'text/x-ruby', Language['Ruby'].codemirror_mime_mode
-    assert_equal 'text/javascript', Language['JavaScript'].codemirror_mime_mode
-    assert_equal 'text/x-csrc', Language['C'].codemirror_mime_mode
-    assert_equal 'text/x-c++src', Language['C++'].codemirror_mime_mode
+  def test_codemirror_mime_type
+    assert_equal 'text/x-ruby', Language['Ruby'].codemirror_mime_type
+    assert_equal 'text/javascript', Language['JavaScript'].codemirror_mime_type
+    assert_equal 'text/x-csrc', Language['C'].codemirror_mime_type
+    assert_equal 'text/x-c++src', Language['C++'].codemirror_mime_type
   end
 
   def test_wrap
@@ -454,9 +454,9 @@ class TestLanguage < Minitest::Test
 
   def test_codemirror_modes_present
     Language.all.each do |language|
-      if language.codemirror_mode || language.codemirror_mime_mode
+      if language.codemirror_mode || language.codemirror_mime_type
         assert language.codemirror_mode, "#{language.inspect} missing CodeMirror mode"
-        assert language.codemirror_mime_mode, "#{language.inspect} missing CodeMirror MIME mode"
+        assert language.codemirror_mime_type, "#{language.inspect} missing CodeMirror MIME mode"
       end
     end
   end
@@ -472,17 +472,17 @@ class TestLanguage < Minitest::Test
   def test_codemirror_mode_and_mime_defined_by_meta_mapping
     meta = File.read(File.expand_path("../../vendor/CodeMirror/mode/meta.js", __FILE__))
     Language.all.each do |language|
-      next unless language.codemirror_mode && language.codemirror_mime_mode
-      assert meta.match(/^.+#{Regexp.escape(language.codemirror_mime_mode)}.+#{Regexp.escape(language.codemirror_mode)}.+$/), "#{language.inspect}: #{language.codemirror_mime_mode} not defined under #{language.codemirror_mode}"
+      next unless language.codemirror_mode && language.codemirror_mime_type
+      assert meta.match(/^.+#{Regexp.escape(language.codemirror_mime_type)}.+#{Regexp.escape(language.codemirror_mode)}.+$/), "#{language.inspect}: #{language.codemirror_mime_type} not defined under #{language.codemirror_mode}"
     end
   end
 
   def test_codemirror_mime_declared_in_mode_file
     Language.all.each do |language|
-      next unless language.codemirror_mode && language.codemirror_mime_mode
+      next unless language.codemirror_mode && language.codemirror_mime_type
       filename = File.expand_path("../../vendor/CodeMirror/mode/#{language.codemirror_mode}/#{language.codemirror_mode}.js", __FILE__)
       assert File.exist?(filename), "#{filename} does not exist"
-      assert File.read(filename).match(language.codemirror_mime_mode), "#{language.inspect}: #{language.codemirror_mime_mode} not defined in #{filename}"
+      assert File.read(filename).match(language.codemirror_mime_type), "#{language.inspect}: #{language.codemirror_mime_type} not defined in #{filename}"
     end
   end