Bug 1206425 - Reorganize CodeMirror file structure for easier upgrades r=bgrins
authorGabriel Luong <gabriel.luong@gmail.com>
Fri, 25 Sep 2015 11:34:06 -0700
changeset 264686 760f14443b762f9c5de8794273209181de352523
parent 264685 5505a568b4846f16719f7253e990dac5980bfba9
child 264687 c6d706919dd24ee542381022d2907a601cdb0410
push id65707
push usercbook@mozilla.com
push dateMon, 28 Sep 2015 12:18:34 +0000
treeherdermozilla-inbound@2c0e60a8f736 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbgrins
bugs1206425
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1206425 - Reorganize CodeMirror file structure for easier upgrades r=bgrins
devtools/client/jar.mn
devtools/client/sourceeditor/codemirror/addon/comment/comment.js
devtools/client/sourceeditor/codemirror/addon/comment/continuecomment.js
devtools/client/sourceeditor/codemirror/addon/dialog/dialog.css
devtools/client/sourceeditor/codemirror/addon/dialog/dialog.js
devtools/client/sourceeditor/codemirror/addon/edit/closebrackets.js
devtools/client/sourceeditor/codemirror/addon/edit/closetag.js
devtools/client/sourceeditor/codemirror/addon/edit/continuelist.js
devtools/client/sourceeditor/codemirror/addon/edit/matchbrackets.js
devtools/client/sourceeditor/codemirror/addon/edit/matchtags.js
devtools/client/sourceeditor/codemirror/addon/edit/trailingspace.js
devtools/client/sourceeditor/codemirror/addon/fold/brace-fold.js
devtools/client/sourceeditor/codemirror/addon/fold/comment-fold.js
devtools/client/sourceeditor/codemirror/addon/fold/foldcode.js
devtools/client/sourceeditor/codemirror/addon/fold/foldgutter.css
devtools/client/sourceeditor/codemirror/addon/fold/foldgutter.js
devtools/client/sourceeditor/codemirror/addon/fold/indent-fold.js
devtools/client/sourceeditor/codemirror/addon/fold/markdown-fold.js
devtools/client/sourceeditor/codemirror/addon/fold/xml-fold.js
devtools/client/sourceeditor/codemirror/addon/hint/show-hint.js
devtools/client/sourceeditor/codemirror/addon/search/match-highlighter.js
devtools/client/sourceeditor/codemirror/addon/search/search.js
devtools/client/sourceeditor/codemirror/addon/search/searchcursor.js
devtools/client/sourceeditor/codemirror/addon/selection/active-line.js
devtools/client/sourceeditor/codemirror/addon/selection/mark-selection.js
devtools/client/sourceeditor/codemirror/addon/tern/tern.css
devtools/client/sourceeditor/codemirror/addon/tern/tern.js
devtools/client/sourceeditor/codemirror/codemirror.css
devtools/client/sourceeditor/codemirror/codemirror.js
devtools/client/sourceeditor/codemirror/comment/comment.js
devtools/client/sourceeditor/codemirror/comment/continuecomment.js
devtools/client/sourceeditor/codemirror/dialog/dialog.css
devtools/client/sourceeditor/codemirror/dialog/dialog.js
devtools/client/sourceeditor/codemirror/edit/closebrackets.js
devtools/client/sourceeditor/codemirror/edit/closetag.js
devtools/client/sourceeditor/codemirror/edit/continuelist.js
devtools/client/sourceeditor/codemirror/edit/matchbrackets.js
devtools/client/sourceeditor/codemirror/edit/matchtags.js
devtools/client/sourceeditor/codemirror/edit/trailingspace.js
devtools/client/sourceeditor/codemirror/fold/brace-fold.js
devtools/client/sourceeditor/codemirror/fold/comment-fold.js
devtools/client/sourceeditor/codemirror/fold/foldcode.js
devtools/client/sourceeditor/codemirror/fold/foldgutter.css
devtools/client/sourceeditor/codemirror/fold/foldgutter.js
devtools/client/sourceeditor/codemirror/fold/indent-fold.js
devtools/client/sourceeditor/codemirror/fold/markdown-fold.js
devtools/client/sourceeditor/codemirror/fold/xml-fold.js
devtools/client/sourceeditor/codemirror/hint/show-hint.js
devtools/client/sourceeditor/codemirror/lib/codemirror.css
devtools/client/sourceeditor/codemirror/lib/codemirror.js
devtools/client/sourceeditor/codemirror/search/match-highlighter.js
devtools/client/sourceeditor/codemirror/search/search.js
devtools/client/sourceeditor/codemirror/search/searchcursor.js
devtools/client/sourceeditor/codemirror/selection/active-line.js
devtools/client/sourceeditor/codemirror/selection/mark-selection.js
devtools/client/sourceeditor/codemirror/tern/tern.css
devtools/client/sourceeditor/codemirror/tern/tern.js
devtools/client/sourceeditor/test/browser.ini
devtools/client/sourceeditor/test/browser_codemirror.js
devtools/client/sourceeditor/test/browser_vimemacs.js
devtools/client/sourceeditor/test/cm_comment_test.js
devtools/client/sourceeditor/test/cm_doc_test.js
devtools/client/sourceeditor/test/cm_driver.js
devtools/client/sourceeditor/test/cm_emacs_test.js
devtools/client/sourceeditor/test/cm_mode_javascript_test.js
devtools/client/sourceeditor/test/cm_mode_test.css
devtools/client/sourceeditor/test/cm_mode_test.js
devtools/client/sourceeditor/test/cm_multi_test.js
devtools/client/sourceeditor/test/cm_search_test.js
devtools/client/sourceeditor/test/cm_sublime_test.js
devtools/client/sourceeditor/test/cm_test.js
devtools/client/sourceeditor/test/cm_vim_test.js
devtools/client/sourceeditor/test/codemirror.html
devtools/client/sourceeditor/test/codemirror/codemirror.html
devtools/client/sourceeditor/test/codemirror/comment_test.js
devtools/client/sourceeditor/test/codemirror/doc_test.js
devtools/client/sourceeditor/test/codemirror/driver.js
devtools/client/sourceeditor/test/codemirror/emacs_test.js
devtools/client/sourceeditor/test/codemirror/mode/javascript/test.js
devtools/client/sourceeditor/test/codemirror/mode_test.css
devtools/client/sourceeditor/test/codemirror/mode_test.js
devtools/client/sourceeditor/test/codemirror/multi_test.js
devtools/client/sourceeditor/test/codemirror/search_test.js
devtools/client/sourceeditor/test/codemirror/sublime_test.js
devtools/client/sourceeditor/test/codemirror/test.js
devtools/client/sourceeditor/test/codemirror/vim_test.js
devtools/client/sourceeditor/test/codemirror/vimemacs.html
devtools/client/sourceeditor/test/vimemacs.html
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -34,42 +34,42 @@ devtools.jar:
     content/layoutview/view.js (layoutview/view.js)
     content/layoutview/view.xhtml (layoutview/view.xhtml)
     content/fontinspector/font-inspector.js (fontinspector/font-inspector.js)
     content/fontinspector/font-inspector.xhtml (fontinspector/font-inspector.xhtml)
     content/fontinspector/font-inspector.css (fontinspector/font-inspector.css)
     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)
     content/debugger/debugger-controller.js (debugger/debugger-controller.js)
     content/debugger/debugger-view.js (debugger/debugger-view.js)
     content/debugger/views/workers-view.js (debugger/views/workers-view.js)
     content/debugger/views/sources-view.js (debugger/views/sources-view.js)
     content/debugger/views/variable-bubble-view.js (debugger/views/variable-bubble-view.js)
rename from devtools/client/sourceeditor/codemirror/comment/comment.js
rename to devtools/client/sourceeditor/codemirror/addon/comment/comment.js
rename from devtools/client/sourceeditor/codemirror/comment/continuecomment.js
rename to devtools/client/sourceeditor/codemirror/addon/comment/continuecomment.js
rename from devtools/client/sourceeditor/codemirror/dialog/dialog.css
rename to devtools/client/sourceeditor/codemirror/addon/dialog/dialog.css
rename from devtools/client/sourceeditor/codemirror/dialog/dialog.js
rename to devtools/client/sourceeditor/codemirror/addon/dialog/dialog.js
rename from devtools/client/sourceeditor/codemirror/edit/closebrackets.js
rename to devtools/client/sourceeditor/codemirror/addon/edit/closebrackets.js
rename from devtools/client/sourceeditor/codemirror/edit/closetag.js
rename to devtools/client/sourceeditor/codemirror/addon/edit/closetag.js
rename from devtools/client/sourceeditor/codemirror/edit/continuelist.js
rename to devtools/client/sourceeditor/codemirror/addon/edit/continuelist.js
rename from devtools/client/sourceeditor/codemirror/edit/matchbrackets.js
rename to devtools/client/sourceeditor/codemirror/addon/edit/matchbrackets.js
rename from devtools/client/sourceeditor/codemirror/edit/matchtags.js
rename to devtools/client/sourceeditor/codemirror/addon/edit/matchtags.js
rename from devtools/client/sourceeditor/codemirror/edit/trailingspace.js
rename to devtools/client/sourceeditor/codemirror/addon/edit/trailingspace.js
rename from devtools/client/sourceeditor/codemirror/fold/brace-fold.js
rename to devtools/client/sourceeditor/codemirror/addon/fold/brace-fold.js
rename from devtools/client/sourceeditor/codemirror/fold/comment-fold.js
rename to devtools/client/sourceeditor/codemirror/addon/fold/comment-fold.js
rename from devtools/client/sourceeditor/codemirror/fold/foldcode.js
rename to devtools/client/sourceeditor/codemirror/addon/fold/foldcode.js
rename from devtools/client/sourceeditor/codemirror/fold/foldgutter.css
rename to devtools/client/sourceeditor/codemirror/addon/fold/foldgutter.css
rename from devtools/client/sourceeditor/codemirror/fold/foldgutter.js
rename to devtools/client/sourceeditor/codemirror/addon/fold/foldgutter.js
rename from devtools/client/sourceeditor/codemirror/fold/indent-fold.js
rename to devtools/client/sourceeditor/codemirror/addon/fold/indent-fold.js
rename from devtools/client/sourceeditor/codemirror/fold/markdown-fold.js
rename to devtools/client/sourceeditor/codemirror/addon/fold/markdown-fold.js
rename from devtools/client/sourceeditor/codemirror/fold/xml-fold.js
rename to devtools/client/sourceeditor/codemirror/addon/fold/xml-fold.js
rename from devtools/client/sourceeditor/codemirror/hint/show-hint.js
rename to devtools/client/sourceeditor/codemirror/addon/hint/show-hint.js
rename from devtools/client/sourceeditor/codemirror/search/match-highlighter.js
rename to devtools/client/sourceeditor/codemirror/addon/search/match-highlighter.js
rename from devtools/client/sourceeditor/codemirror/search/search.js
rename to devtools/client/sourceeditor/codemirror/addon/search/search.js
rename from devtools/client/sourceeditor/codemirror/search/searchcursor.js
rename to devtools/client/sourceeditor/codemirror/addon/search/searchcursor.js
rename from devtools/client/sourceeditor/codemirror/selection/active-line.js
rename to devtools/client/sourceeditor/codemirror/addon/selection/active-line.js
rename from devtools/client/sourceeditor/codemirror/selection/mark-selection.js
rename to devtools/client/sourceeditor/codemirror/addon/selection/mark-selection.js
rename from devtools/client/sourceeditor/codemirror/tern/tern.css
rename to devtools/client/sourceeditor/codemirror/addon/tern/tern.css
rename from devtools/client/sourceeditor/codemirror/tern/tern.js
rename to devtools/client/sourceeditor/codemirror/addon/tern/tern.js
rename from devtools/client/sourceeditor/codemirror/codemirror.css
rename to devtools/client/sourceeditor/codemirror/lib/codemirror.css
rename from devtools/client/sourceeditor/codemirror/codemirror.js
rename to devtools/client/sourceeditor/codemirror/lib/codemirror.js
--- a/devtools/client/sourceeditor/test/browser.ini
+++ b/devtools/client/sourceeditor/test/browser.ini
@@ -1,32 +1,33 @@
 [DEFAULT]
 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]
 [browser_editor_autocomplete_js.js]
 [browser_editor_basic.js]
 [browser_editor_cursor.js]
 [browser_editor_find_again.js]
 [browser_editor_goto_line.js]
--- a/devtools/client/sourceeditor/test/browser_codemirror.js
+++ b/devtools/client/sourceeditor/test/browser_codemirror.js
@@ -1,15 +1,15 @@
 /* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "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() {
   requestLongerTimeout(3);
   waitForExplicitFinish();
 
   let tab = gBrowser.addTab();
   gBrowser.selectedTab = tab;
--- a/devtools/client/sourceeditor/test/browser_vimemacs.js
+++ b/devtools/client/sourceeditor/test/browser_vimemacs.js
@@ -1,14 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "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() {
   requestLongerTimeout(3);
   waitForExplicitFinish();
 
   let tab = gBrowser.addTab();
   gBrowser.selectedTab = tab;
rename from devtools/client/sourceeditor/test/codemirror.html
rename to devtools/client/sourceeditor/test/codemirror/codemirror.html
--- a/devtools/client/sourceeditor/test/codemirror.html
+++ b/devtools/client/sourceeditor/test/codemirror/codemirror.html
@@ -53,26 +53,26 @@
     <div style="border: 1px solid black; padding: 1px; max-width: 700px;">
       <div style="width: 0px;" id=progress><div style="padding: 3px;">Ran <span id="progress_ran">0</span><span id="progress_total"> of 0</span> tests</div></div>
     </div>
     <p id=status>Please enable JavaScript...</p>
     <div id=output></div>
 
     <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>
     <script src="cm_vim_test.js"></script>
     <script src="cm_emacs_test.js"></script>
     -->
 
     <!-- These modes/addons are not used by Editor
rename from devtools/client/sourceeditor/test/cm_comment_test.js
rename to devtools/client/sourceeditor/test/codemirror/comment_test.js
rename from devtools/client/sourceeditor/test/cm_doc_test.js
rename to devtools/client/sourceeditor/test/codemirror/doc_test.js
rename from devtools/client/sourceeditor/test/cm_driver.js
rename to devtools/client/sourceeditor/test/codemirror/driver.js
rename from devtools/client/sourceeditor/test/cm_emacs_test.js
rename to devtools/client/sourceeditor/test/codemirror/emacs_test.js
rename from devtools/client/sourceeditor/test/cm_mode_javascript_test.js
rename to devtools/client/sourceeditor/test/codemirror/mode/javascript/test.js
rename from devtools/client/sourceeditor/test/cm_mode_test.css
rename to devtools/client/sourceeditor/test/codemirror/mode_test.css
rename from devtools/client/sourceeditor/test/cm_mode_test.js
rename to devtools/client/sourceeditor/test/codemirror/mode_test.js
rename from devtools/client/sourceeditor/test/cm_multi_test.js
rename to devtools/client/sourceeditor/test/codemirror/multi_test.js
rename from devtools/client/sourceeditor/test/cm_search_test.js
rename to devtools/client/sourceeditor/test/codemirror/search_test.js
rename from devtools/client/sourceeditor/test/cm_sublime_test.js
rename to devtools/client/sourceeditor/test/codemirror/sublime_test.js
rename from devtools/client/sourceeditor/test/cm_test.js
rename to devtools/client/sourceeditor/test/codemirror/test.js
rename from devtools/client/sourceeditor/test/cm_vim_test.js
rename to devtools/client/sourceeditor/test/codemirror/vim_test.js
rename from devtools/client/sourceeditor/test/vimemacs.html
rename to devtools/client/sourceeditor/test/codemirror/vimemacs.html
--- a/devtools/client/sourceeditor/test/vimemacs.html
+++ b/devtools/client/sourceeditor/test/codemirror/vimemacs.html
@@ -53,20 +53,20 @@
     <div style="border: 1px solid black; padding: 1px; max-width: 700px;">
       <div style="width: 0px;" id=progress><div style="padding: 3px;">Ran <span id="progress_ran">0</span><span id="progress_total"> of 0</span> tests</div></div>
     </div>
     <p id=status>Please enable JavaScript...</p>
     <div id=output></div>
 
     <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>
     <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>