Bug 1206425 - Reorganize CodeMirror file structure for easier upgrades r=bgrins

--HG--
rename : devtools/client/sourceeditor/codemirror/comment/comment.js => devtools/client/sourceeditor/codemirror/addon/comment/comment.js
rename : devtools/client/sourceeditor/codemirror/comment/continuecomment.js => devtools/client/sourceeditor/codemirror/addon/comment/continuecomment.js
rename : devtools/client/sourceeditor/codemirror/dialog/dialog.css => devtools/client/sourceeditor/codemirror/addon/dialog/dialog.css
rename : devtools/client/sourceeditor/codemirror/dialog/dialog.js => devtools/client/sourceeditor/codemirror/addon/dialog/dialog.js
rename : devtools/client/sourceeditor/codemirror/edit/closebrackets.js => devtools/client/sourceeditor/codemirror/addon/edit/closebrackets.js
rename : devtools/client/sourceeditor/codemirror/edit/closetag.js => devtools/client/sourceeditor/codemirror/addon/edit/closetag.js
rename : devtools/client/sourceeditor/codemirror/edit/continuelist.js => devtools/client/sourceeditor/codemirror/addon/edit/continuelist.js
rename : devtools/client/sourceeditor/codemirror/edit/matchbrackets.js => devtools/client/sourceeditor/codemirror/addon/edit/matchbrackets.js
rename : devtools/client/sourceeditor/codemirror/edit/matchtags.js => devtools/client/sourceeditor/codemirror/addon/edit/matchtags.js
rename : devtools/client/sourceeditor/codemirror/edit/trailingspace.js => devtools/client/sourceeditor/codemirror/addon/edit/trailingspace.js
rename : devtools/client/sourceeditor/codemirror/fold/brace-fold.js => devtools/client/sourceeditor/codemirror/addon/fold/brace-fold.js
rename : devtools/client/sourceeditor/codemirror/fold/comment-fold.js => devtools/client/sourceeditor/codemirror/addon/fold/comment-fold.js
rename : devtools/client/sourceeditor/codemirror/fold/foldcode.js => devtools/client/sourceeditor/codemirror/addon/fold/foldcode.js
rename : devtools/client/sourceeditor/codemirror/fold/foldgutter.css => devtools/client/sourceeditor/codemirror/addon/fold/foldgutter.css
rename : devtools/client/sourceeditor/codemirror/fold/foldgutter.js => devtools/client/sourceeditor/codemirror/addon/fold/foldgutter.js
rename : devtools/client/sourceeditor/codemirror/fold/indent-fold.js => devtools/client/sourceeditor/codemirror/addon/fold/indent-fold.js
rename : devtools/client/sourceeditor/codemirror/fold/markdown-fold.js => devtools/client/sourceeditor/codemirror/addon/fold/markdown-fold.js
rename : devtools/client/sourceeditor/codemirror/fold/xml-fold.js => devtools/client/sourceeditor/codemirror/addon/fold/xml-fold.js
rename : devtools/client/sourceeditor/codemirror/hint/show-hint.js => devtools/client/sourceeditor/codemirror/addon/hint/show-hint.js
rename : devtools/client/sourceeditor/codemirror/search/match-highlighter.js => devtools/client/sourceeditor/codemirror/addon/search/match-highlighter.js
rename : devtools/client/sourceeditor/codemirror/search/search.js => devtools/client/sourceeditor/codemirror/addon/search/search.js
rename : devtools/client/sourceeditor/codemirror/search/searchcursor.js => devtools/client/sourceeditor/codemirror/addon/search/searchcursor.js
rename : devtools/client/sourceeditor/codemirror/selection/active-line.js => devtools/client/sourceeditor/codemirror/addon/selection/active-line.js
rename : devtools/client/sourceeditor/codemirror/selection/mark-selection.js => devtools/client/sourceeditor/codemirror/addon/selection/mark-selection.js
rename : devtools/client/sourceeditor/codemirror/tern/tern.css => devtools/client/sourceeditor/codemirror/addon/tern/tern.css
rename : devtools/client/sourceeditor/codemirror/tern/tern.js => devtools/client/sourceeditor/codemirror/addon/tern/tern.js
rename : devtools/client/sourceeditor/codemirror/codemirror.css => devtools/client/sourceeditor/codemirror/lib/codemirror.css
rename : devtools/client/sourceeditor/codemirror/codemirror.js => devtools/client/sourceeditor/codemirror/lib/codemirror.js
rename : devtools/client/sourceeditor/test/codemirror.html => devtools/client/sourceeditor/test/codemirror/codemirror.html
rename : devtools/client/sourceeditor/test/cm_comment_test.js => devtools/client/sourceeditor/test/codemirror/comment_test.js
rename : devtools/client/sourceeditor/test/cm_doc_test.js => devtools/client/sourceeditor/test/codemirror/doc_test.js
rename : devtools/client/sourceeditor/test/cm_driver.js => devtools/client/sourceeditor/test/codemirror/driver.js
rename : devtools/client/sourceeditor/test/cm_emacs_test.js => devtools/client/sourceeditor/test/codemirror/emacs_test.js
rename : devtools/client/sourceeditor/test/cm_mode_javascript_test.js => devtools/client/sourceeditor/test/codemirror/mode/javascript/test.js
rename : devtools/client/sourceeditor/test/cm_mode_test.css => devtools/client/sourceeditor/test/codemirror/mode_test.css
rename : devtools/client/sourceeditor/test/cm_mode_test.js => devtools/client/sourceeditor/test/codemirror/mode_test.js
rename : devtools/client/sourceeditor/test/cm_multi_test.js => devtools/client/sourceeditor/test/codemirror/multi_test.js
rename : devtools/client/sourceeditor/test/cm_search_test.js => devtools/client/sourceeditor/test/codemirror/search_test.js
rename : devtools/client/sourceeditor/test/cm_sublime_test.js => devtools/client/sourceeditor/test/codemirror/sublime_test.js
rename : devtools/client/sourceeditor/test/cm_test.js => devtools/client/sourceeditor/test/codemirror/test.js
rename : devtools/client/sourceeditor/test/cm_vim_test.js => devtools/client/sourceeditor/test/codemirror/vim_test.js
rename : devtools/client/sourceeditor/test/vimemacs.html => devtools/client/sourceeditor/test/codemirror/vimemacs.html

devtools/client/jar.mn

@@ -39,32 +39,32 @@ devtools.jar:
     content/animationinspector/animation-controller.js (animationinspector/animation-controller.js)
     content/animationinspector/animation-panel.js (animationinspector/animation-panel.js)
     content/animationinspector/animation-inspector.xhtml (animationinspector/animation-inspector.xhtml)
-    content/sourceeditor/codemirror/codemirror.js (sourceeditor/codemirror/codemirror.js)
-    content/sourceeditor/codemirror/codemirror.css (sourceeditor/codemirror/codemirror.css)
+    content/sourceeditor/codemirror/comment/comment.js (sourceeditor/codemirror/addon/comment/comment.js)
+    content/sourceeditor/codemirror/edit/trailingspace.js (sourceeditor/codemirror/addon/edit/trailingspace.js)
+    content/sourceeditor/codemirror/edit/matchbrackets.js (sourceeditor/codemirror/addon/edit/matchbrackets.js)
+    content/sourceeditor/codemirror/edit/closebrackets.js (sourceeditor/codemirror/addon/edit/closebrackets.js)
+    content/sourceeditor/codemirror/dialog/dialog.js (sourceeditor/codemirror/addon/dialog/dialog.js)
+    content/sourceeditor/codemirror/dialog/dialog.css (sourceeditor/codemirror/addon/dialog/dialog.css)
+    content/sourceeditor/codemirror/fold/foldcode.js (sourceeditor/codemirror/addon/fold/foldcode.js)
+    content/sourceeditor/codemirror/fold/brace-fold.js (sourceeditor/codemirror/addon/fold/brace-fold.js)
+    content/sourceeditor/codemirror/fold/comment-fold.js (sourceeditor/codemirror/addon/fold/comment-fold.js)
+    content/sourceeditor/codemirror/fold/xml-fold.js (sourceeditor/codemirror/addon/fold/xml-fold.js)
+    content/sourceeditor/codemirror/fold/foldgutter.js (sourceeditor/codemirror/addon/fold/foldgutter.js)
+    content/sourceeditor/codemirror/hint/show-hint.js (sourceeditor/codemirror/addon/hint/show-hint.js)
+    content/sourceeditor/codemirror/search/search.js (sourceeditor/codemirror/addon/search/search.js)
+    content/sourceeditor/codemirror/search/searchcursor.js (sourceeditor/codemirror/addon/search/searchcursor.js)
+    content/sourceeditor/codemirror/selection/active-line.js (sourceeditor/codemirror/addon/selection/active-line.js)
+    content/sourceeditor/codemirror/tern/tern.js (sourceeditor/codemirror/addon/tern/tern.js)
+    content/sourceeditor/codemirror/codemirror.js (sourceeditor/codemirror/lib/codemirror.js)
+    content/sourceeditor/codemirror/codemirror.css (sourceeditor/codemirror/lib/codemirror.css)
     content/sourceeditor/codemirror/mode/javascript.js (sourceeditor/codemirror/mode/javascript.js)
     content/sourceeditor/codemirror/mode/xml.js (sourceeditor/codemirror/mode/xml.js)
     content/sourceeditor/codemirror/mode/css.js (sourceeditor/codemirror/mode/css.js)
     content/sourceeditor/codemirror/mode/htmlmixed.js (sourceeditor/codemirror/mode/htmlmixed.js)
     content/sourceeditor/codemirror/mode/clike.js (sourceeditor/codemirror/mode/clike.js)
-    content/sourceeditor/codemirror/selection/active-line.js (sourceeditor/codemirror/selection/active-line.js)
-    content/sourceeditor/codemirror/edit/trailingspace.js (sourceeditor/codemirror/edit/trailingspace.js)
-    content/sourceeditor/codemirror/edit/matchbrackets.js (sourceeditor/codemirror/edit/matchbrackets.js)
-    content/sourceeditor/codemirror/edit/closebrackets.js (sourceeditor/codemirror/edit/closebrackets.js)
-    content/sourceeditor/codemirror/comment/comment.js (sourceeditor/codemirror/comment/comment.js)
-    content/sourceeditor/codemirror/search/searchcursor.js (sourceeditor/codemirror/search/searchcursor.js)
-    content/sourceeditor/codemirror/search/search.js (sourceeditor/codemirror/search/search.js)
-    content/sourceeditor/codemirror/dialog/dialog.js (sourceeditor/codemirror/dialog/dialog.js)
-    content/sourceeditor/codemirror/dialog/dialog.css (sourceeditor/codemirror/dialog/dialog.css)
     content/sourceeditor/codemirror/keymap/emacs.js (sourceeditor/codemirror/keymap/emacs.js)
     content/sourceeditor/codemirror/keymap/sublime.js (sourceeditor/codemirror/keymap/sublime.js)
     content/sourceeditor/codemirror/keymap/vim.js (sourceeditor/codemirror/keymap/vim.js)
-    content/sourceeditor/codemirror/fold/foldcode.js (sourceeditor/codemirror/fold/foldcode.js)
-    content/sourceeditor/codemirror/fold/brace-fold.js (sourceeditor/codemirror/fold/brace-fold.js)
-    content/sourceeditor/codemirror/fold/comment-fold.js (sourceeditor/codemirror/fold/comment-fold.js)
-    content/sourceeditor/codemirror/fold/xml-fold.js (sourceeditor/codemirror/fold/xml-fold.js)
-    content/sourceeditor/codemirror/fold/foldgutter.js (sourceeditor/codemirror/fold/foldgutter.js)
-    content/sourceeditor/codemirror/tern/tern.js (sourceeditor/codemirror/tern/tern.js)
-    content/sourceeditor/codemirror/hint/show-hint.js (sourceeditor/codemirror/hint/show-hint.js)
     content/sourceeditor/codemirror/mozilla.css (sourceeditor/codemirror/mozilla.css)
     content/debugger/debugger.xul (debugger/debugger.xul)
     content/debugger/debugger.css (debugger/debugger.css)

devtools/client/sourceeditor/test/browser.ini

@@ -2,26 +2,27 @@
 tags = devtools
 subsuite = devtools
 support-files =
-  cm_comment_test.js
-  cm_doc_test.js
-  cm_driver.js
-  cm_emacs_test.js
-  cm_mode_test.css
-  cm_mode_test.js
-  cm_multi_test.js
-  cm_mode_ruby.js
-  cm_script_injection_test.js
-  cm_search_test.js
-  cm_sublime_test.js
-  cm_test.js
-  cm_vim_test.js
-  codemirror.html
+  codemirror/comment_test.js
+  codemirror/doc_test.js
+  codemirror/driver.js
+  codemirror/emacs_test.js
+  codemirror/mode_test.css
+  codemirror/mode_test.js
+  codemirror/multi_test.js
+  codemirror/search_test.js
+  codemirror/sublime_test.js
+  codemirror/test.js
+  codemirror/vim_test.js
+  codemirror/codemirror.html
+  codemirror/vimemacs.html
+  codemirror/mode/javascript/test.js
   css_statemachine_testcases.css
   css_statemachine_tests.json
   css_autocompletion_tests.json
-  vimemacs.html
   head.js
   helper_codemirror_runner.js
+  cm_mode_ruby.js
+  cm_script_injection_test.js
 
 [browser_editor_autocomplete_basic.js]
 [browser_editor_autocomplete_events.js]

devtools/client/sourceeditor/test/browser_codemirror.js

@@ -4,7 +4,7 @@
 
 "use strict";
 
-const URI = "chrome://mochitests/content/browser/devtools/client/sourceeditor/test/codemirror.html";
+const URI = "chrome://mochitests/content/browser/devtools/client/sourceeditor/test/codemirror/codemirror.html";
 loadHelperScript("helper_codemirror_runner.js");
 
 function test() {

devtools/client/sourceeditor/test/browser_vimemacs.js

@@ -3,7 +3,7 @@
 
 "use strict";
 
-const URI = "chrome://mochitests/content/browser/devtools/client/sourceeditor/test/vimemacs.html";
+const URI = "chrome://mochitests/content/browser/devtools/client/sourceeditor/test/codemirror/vimemacs.html";
 loadHelperScript("helper_codemirror_runner.js");
 
 function test() {

devtools/client/sourceeditor/test/codemirror/codemirror.html

@@ -58,16 +58,16 @@
 
     <div id=testground></div>
 
-    <script src="cm_driver.js"></script>
-    <script src="cm_test.js"></script>
-    <script src="cm_comment_test.js"></script>
-    <script src="cm_doc_test.js"></script>
-    <script src="cm_driver.js"></script>
-    <script src="cm_emacs_test.js"></script>
-    <script src="cm_mode_test.js"></script>
-    <script src="cm_mode_javascript_test.js"></script>
-    <script src="cm_multi_test.js"></script>
-    <script src="cm_search_test.js"></script>
+    <script src="driver.js"></script>
+    <script src="test.js"></script>
+    <script src="comment_test.js"></script>
+    <script src="doc_test.js"></script>
+    <script src="driver.js"></script>
+    <script src="emacs_test.js"></script>
+    <script src="mode_test.js"></script>
+    <script src="mode/javascript/test.js"></script>
+    <script src="multi_test.js"></script>
+    <script src="search_test.js"></script>
 
     <!-- VIM and Emacs mode tests are in vimemacs.html
     <script src="cm_sublime_test.js"></script>

devtools/client/sourceeditor/test/codemirror/vimemacs.html

@@ -58,10 +58,10 @@
 
     <div id=testground></div>
 
-    <script src="cm_driver.js"></script>
-    <script src="cm_sublime_test.js"></script>
-    <script src="cm_vim_test.js"></script>
-    <script src="cm_emacs_test.js"></script>
+    <script src="driver.js"></script>
+    <script src="sublime_test.js"></script>
+    <script src="vim_test.js"></script>
+    <script src="emacs_test.js"></script>
 
     <!-- Basic tests are in codemirror.html
     <script src="cm_driver.js"></script>