upgrade CodeMirror to 4.7.0

bower.json

@@ -17,8 +17,8 @@
     "jquery": ">=1.7.0",
     "jquery-ui": ">=1.9.2",
     "es5-shim": "^4.0.3",
-    "codemirror3": "codemirror#^3.24.0",
-    "require-css": "^0.1.2"
+    "require-css": "^0.1.2",
+    "codemirror": "^4.7.0"
   },
   "devDependencies": {
     "jquery": ">=1.7.0 <2.1.0"

codemirror.amd.json

@@ -0,0 +1,10 @@
+{
+    "paths": {
+        "codemirror": "."
+    },
+    "shim": {
+        "codemirror/lib/codemirror": {
+            "deps": [ "css!codemirror/lib/codemirror" ]
+        }
+    }
+}

codemirror3.amd.json

@@ -1,17 +0,0 @@
-{
-    "paths": {
-        "codemirror3": "."
-    },
-    "shim": {
-        "codemirror3/lib/codemirror": {
-            "deps": [ "css!codemirror3/lib/codemirror" ],
-            "exports": "CodeMirror"
-        },
-        "codemirror3/mode/smalltalk/smalltalk": {
-            "deps": [ "../../lib/codemirror" ]
-        },
-        "codemirror3/addon/hint/show-hint": {
-            "deps": [ "../../lib/codemirror" ]
-        }
-    }
-}

config.js

@@ -9,6 +9,7 @@ require.config({
     "jquery-ui": "bower_components/jquery-ui/jquery-ui.min",
     "amber_lib/es5-shim": "bower_components/es5-shim",
     "codemirror3": "bower_components/codemirror3",
+    "codemirror": "bower_components/codemirror",
     "helios/showdown": "my/helios/bower_components/showdown/src/showdown",
     "requireJS": "node_modules/requirejs/require",
     "bootstrap2.3.2": "my/helios/bower_components/bootstrap2.3.2/bootstrap",
@@ -38,8 +39,6 @@ require.config({
     },
     "codemirror3/lib/codemirror": {
       "deps": [
-        "css!codemirror3/lib/codemirror",
-        "css!codemirror3/lib/codemirror",
         "css!codemirror3/lib/codemirror",
         "css!codemirror3/lib/codemirror"
       ],
@@ -47,20 +46,22 @@ require.config({
     },
     "codemirror3/mode/smalltalk/smalltalk": {
       "deps": [
-        "../../lib/codemirror",
-        "../../lib/codemirror",
         "../../lib/codemirror",
         "../../lib/codemirror"
       ]
     },
     "codemirror3/addon/hint/show-hint": {
       "deps": [
-        "../../lib/codemirror",
-        "../../lib/codemirror",
         "../../lib/codemirror",
         "../../lib/codemirror"
       ]
     },
+    "codemirror/lib/codemirror": {
+      "deps": [
+        "css!codemirror/lib/codemirror",
+        "css!codemirror/lib/codemirror"
+      ]
+    },
     "bootstrap2.3.2/js/bootstrap": {
       "deps": [
         "jquery",

src/IDE.js

@@ -1416,7 +1416,7 @@ var self=this;
 return $core.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv(require)._value_("codemirror3/lib/codemirror");
+$1=$recv(require)._value_("codemirror/lib/codemirror");
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"codeMirror",{},$globals.SourceArea.klass)});
@@ -1424,7 +1424,7 @@ return $1;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "codeMirror\x0a\x09^ require value: 'codemirror3/lib/codemirror'",
+source: "codeMirror\x0a\x09^ require value: 'codemirror/lib/codemirror'",
 referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["value:"]

src/IDE.st

@@ -330,7 +330,7 @@ renderOn: html
 !SourceArea class methodsFor: 'accessing'!
 
 codeMirror
-	^ require value: 'codemirror3/lib/codemirror'
+	^ require value: 'codemirror/lib/codemirror'
 ! !
 
 !SourceArea class methodsFor: 'initialization'!

support/devel.js

@@ -2,12 +2,12 @@ define([
 	'./helpers', // pre-fetch, dep of ./deploy
 	'./deploy', // pre-fetch, dep of ./lang
 	'./lang',
-    'codemirror3/lib/codemirror',
-    'codemirror3/mode/smalltalk/smalltalk',
-    'codemirror3/addon/hint/show-hint',
-    'css!codemirror3/theme/ambiance',
-    'css!codemirror3/lib/codemirror',
-    'css!codemirror3/addon/hint/show-hint',
+    'codemirror/lib/codemirror',
+    'codemirror/mode/smalltalk/smalltalk',
+    'codemirror/addon/hint/show-hint',
+    'css!codemirror/theme/ambiance',
+    'css!codemirror/lib/codemirror',
+    'css!codemirror/addon/hint/show-hint',
     'jquery-ui',
     'amber_core/IDE',
     'amber_core/Examples',