separate codemirrors in amber and helios:

 - as they use old version (3.x), use name codemirror3;
 - they both have their own codemirror3.amd.json;
 - they both load pieces of CM locally, no reuse;
 - legacy IDE not loaded into Helios window - to promote
   CodeMirror upgrade and preventing clashes.

bower.json

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

codemirror.amd.json

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

codemirror3.amd.json

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

config.js

@@ -4,11 +4,11 @@ var require;
 if (!require) require = {config: function (x) {require = x;}};
 require.config({
   "paths": {
-    "jquery-ui": "bower_components/jquery-ui/jquery-ui.min",
+    "require-css": "bower_components/require-css",
     "jquery": "bower_components/jquery/jquery",
-    "amber_lib/codemirror": "bower_components/codemirror",
+    "jquery-ui": "bower_components/jquery-ui/jquery-ui.min",
     "amber_lib/es5-shim": "bower_components/es5-shim",
-    "require-css": "bower_components/require-css",
+    "codemirror3": "bower_components/codemirror3",
     "amber_lib/showdown": "my/helios/bower_components/showdown",
     "requireJS": "node_modules/requirejs/require",
     "bootstrap2.3.2": "my/helios/bower_components/bootstrap2.3.2/bootstrap",
@@ -17,10 +17,15 @@ require.config({
     "amber_vm/_st": "support/deprecated-vm-files/as-receiver",
     "amber_css": "support/resources",
     "amber_core": "src",
-    "amber_cli": "external/amber-cli/src",
     "helios": "my/helios/src",
     "helios/resources": "my/helios/resources",
-    "helios/index": "my/helios/index"
+    "helios/index": "my/helios/index",
+    "amber_cli": "external/amber-cli/src"
+  },
+  "map": {
+    "*": {
+      "css": "require-css/css"
+    }
   },
   "shim": {
     "jquery-ui": {
@@ -31,22 +36,25 @@ require.config({
         "jquery"
       ]
     },
-    "amber_lib/codemirror/lib/codemirror": {
+    "codemirror3/lib/codemirror": {
       "deps": [
-        "css!amber_lib/codemirror/lib/codemirror",
-        "css!amber_lib/codemirror/lib/codemirror",
-        "css!amber_lib/codemirror/lib/codemirror"
+        "css!codemirror3/lib/codemirror",
+        "css!codemirror3/lib/codemirror",
+        "css!codemirror3/lib/codemirror",
+        "css!codemirror3/lib/codemirror"
       ]
     },
-    "amber_lib/codemirror/mode/smalltalk/smalltalk": {
+    "codemirror3/mode/smalltalk/smalltalk": {
       "deps": [
+        "../../lib/codemirror",
         "../../lib/codemirror",
         "../../lib/codemirror",
         "../../lib/codemirror"
       ]
     },
-    "amber_lib/codemirror/addon/hint/show-hint": {
+    "codemirror3/addon/hint/show-hint": {
       "deps": [
+        "../../lib/codemirror",
         "../../lib/codemirror",
         "../../lib/codemirror",
         "../../lib/codemirror"
@@ -62,11 +70,6 @@ require.config({
       "exports": "console"
     }
   },
-  "map": {
-    "*": {
-      "css": "require-css/css"
-    }
-  },
   "rjs_comment1": "require.min should be removed",
   "rjs_comment2": "it's backward compatibility hack if config finds",
   "rjs_comment3": "support/requirejs before node_modules/requirejs;",

support/codemirror.js

@@ -1,8 +0,0 @@
-define([
-    'amber_lib/codemirror/lib/codemirror',
-    'amber_lib/codemirror/mode/smalltalk/smalltalk',
-    'amber_lib/codemirror/addon/hint/show-hint',
-    'css!amber_lib/codemirror/theme/ambiance',
-    'css!amber_lib/codemirror/lib/codemirror',
-    'css!amber_lib/codemirror/addon/hint/show-hint'
-]);

support/devel.js

@@ -2,7 +2,12 @@ define([
 	'./helpers', // pre-fetch, dep of ./deploy
 	'./deploy', // pre-fetch, dep of ./lang
 	'./lang',
-	'./codemirror',
+    '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',
     'jquery-ui',
     'amber_core/IDE',
     'amber_core/Examples',