diff --git a/lib/util/dialog.css b/addon/dialog/dialog.css
similarity index 100%
rename from lib/util/dialog.css
rename to addon/dialog/dialog.css
diff --git a/lib/util/dialog.js b/addon/dialog/dialog.js
similarity index 100%
rename from lib/util/dialog.js
rename to addon/dialog/dialog.js
diff --git a/lib/util/closetag.js b/addon/edit/closetag.js
similarity index 100%
rename from lib/util/closetag.js
rename to addon/edit/closetag.js
diff --git a/lib/util/continuecomment.js b/addon/edit/continuecomment.js
similarity index 100%
rename from lib/util/continuecomment.js
rename to addon/edit/continuecomment.js
diff --git a/lib/util/continuelist.js b/addon/edit/continuelist.js
similarity index 100%
rename from lib/util/continuelist.js
rename to addon/edit/continuelist.js
diff --git a/lib/util/matchbrackets.js b/addon/edit/matchbrackets.js
similarity index 100%
rename from lib/util/matchbrackets.js
rename to addon/edit/matchbrackets.js
diff --git a/lib/util/collapserange.js b/addon/fold/collapserange.js
similarity index 100%
rename from lib/util/collapserange.js
rename to addon/fold/collapserange.js
diff --git a/lib/util/foldcode.js b/addon/fold/foldcode.js
similarity index 100%
rename from lib/util/foldcode.js
rename to addon/fold/foldcode.js
diff --git a/lib/util/formatting.js b/addon/format/formatting.js
similarity index 100%
rename from lib/util/formatting.js
rename to addon/format/formatting.js
diff --git a/lib/util/javascript-hint.js b/addon/hint/javascript-hint.js
similarity index 100%
rename from lib/util/javascript-hint.js
rename to addon/hint/javascript-hint.js
diff --git a/lib/util/pig-hint.js b/addon/hint/pig-hint.js
similarity index 100%
rename from lib/util/pig-hint.js
rename to addon/hint/pig-hint.js
diff --git a/lib/util/python-hint.js b/addon/hint/python-hint.js
similarity index 100%
rename from lib/util/python-hint.js
rename to addon/hint/python-hint.js
diff --git a/lib/util/simple-hint.css b/addon/hint/simple-hint.css
similarity index 100%
rename from lib/util/simple-hint.css
rename to addon/hint/simple-hint.css
diff --git a/lib/util/simple-hint.js b/addon/hint/simple-hint.js
similarity index 100%
rename from lib/util/simple-hint.js
rename to addon/hint/simple-hint.js
diff --git a/lib/util/xml-hint.js b/addon/hint/xml-hint.js
similarity index 100%
rename from lib/util/xml-hint.js
rename to addon/hint/xml-hint.js
diff --git a/lib/util/loadmode.js b/addon/mode/loadmode.js
similarity index 100%
rename from lib/util/loadmode.js
rename to addon/mode/loadmode.js
diff --git a/lib/util/multiplex.js b/addon/mode/multiplex.js
similarity index 100%
rename from lib/util/multiplex.js
rename to addon/mode/multiplex.js
diff --git a/lib/util/overlay.js b/addon/mode/overlay.js
similarity index 100%
rename from lib/util/overlay.js
rename to addon/mode/overlay.js
diff --git a/lib/util/colorize.js b/addon/runmode/colorize.js
similarity index 100%
rename from lib/util/colorize.js
rename to addon/runmode/colorize.js
diff --git a/lib/util/runmodeonly.js b/addon/runmode/runmode-standalone.js
similarity index 100%
rename from lib/util/runmodeonly.js
rename to addon/runmode/runmode-standalone.js
diff --git a/lib/util/runmode.js b/addon/runmode/runmode.js
similarity index 100%
rename from lib/util/runmode.js
rename to addon/runmode/runmode.js
diff --git a/lib/util/runmode-standalone.js b/addon/runmode/runmode.node.js
similarity index 100%
rename from lib/util/runmode-standalone.js
rename to addon/runmode/runmode.node.js
diff --git a/lib/util/match-highlighter.js b/addon/search/match-highlighter.js
similarity index 100%
rename from lib/util/match-highlighter.js
rename to addon/search/match-highlighter.js
diff --git a/lib/util/search.js b/addon/search/search.js
similarity index 100%
rename from lib/util/search.js
rename to addon/search/search.js
diff --git a/lib/util/searchcursor.js b/addon/search/searchcursor.js
similarity index 100%
rename from lib/util/searchcursor.js
rename to addon/search/searchcursor.js
diff --git a/bin/compress b/bin/compress
index de86ca1f693396a3e259c4c386d83b40e3156ce0..eb45e1d194edfbc80c4b0cce3a7e821ad92f044e 100755
--- a/bin/compress
+++ b/bin/compress
@@ -6,7 +6,7 @@
//
// bin/compress codemirror runmode javascript xml
//
-// Will take lib/codemirror.js, lib/util/runmode.js,
+// Will take lib/codemirror.js, addon/runmode/runmode.js,
// mode/javascript/javascript.js, and mode/xml/xml.js, run them though
// the online minifier at http://marijnhaverbeke.nl/uglifyjs, and spit
// out the result.
@@ -61,6 +61,7 @@ function walk(dir) {
}
walk("lib/");
+walk("addon/");
walk("mode/");
if (!blob) help(false);
diff --git a/demo/closetag.html b/demo/closetag.html
index c33d10875f753ebb2caf960de8f7ad553ae6075a..87f4f019f65f6b22b4442fd1c752232d2b1dd7dd 100644
--- a/demo/closetag.html
+++ b/demo/closetag.html
@@ -5,7 +5,7 @@
<title>CodeMirror: Close-Tag Demo</title>
<link rel="stylesheet" href="../lib/codemirror.css">
<script src="../lib/codemirror.js"></script>
- <script src="../lib/util/closetag.js"></script>
+ <script src="../addon/edit/closetag.js"></script>
<script src="../mode/xml/xml.js"></script>
<script src="../mode/javascript/javascript.js"></script>
<script src="../mode/css/css.js"></script>
diff --git a/demo/collapserange.html b/demo/collapserange.html
index 87aad82307442c6d34954a38a4aad3e6682c121a..5a6df0d25726650fffb4bfbbd4e7aae800706a79 100644
--- a/demo/collapserange.html
+++ b/demo/collapserange.html
@@ -5,7 +5,7 @@
<title>CodeMirror: Range Collapsing Demo</title>
<link rel="stylesheet" href="../lib/codemirror.css">
<script src="../lib/codemirror.js"></script>
- <script src="../lib/util/collapserange.js"></script>
+ <script src="../addon/fold/collapserange.js"></script>
<script src="../mode/javascript/javascript.js"></script>
<link rel="stylesheet" href="../doc/docs.css">
diff --git a/demo/complete.html b/demo/complete.html
index 13569edf929a4f8b6f617cf0de02304c76a85a1a..2efbd3d622b5750e0ab1c4093444e6725f74c622 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -5,9 +5,9 @@
<title>CodeMirror: Autocomplete Demo</title>
<link rel="stylesheet" href="../lib/codemirror.css">
<script src="../lib/codemirror.js"></script>
- <script src="../lib/util/simple-hint.js"></script>
- <link rel="stylesheet" href="../lib/util/simple-hint.css">
- <script src="../lib/util/javascript-hint.js"></script>
+ <script src="../addon/hint/simple-hint.js"></script>
+ <link rel="stylesheet" href="../addon/hint/simple-hint.css">
+ <script src="../addon/hint/javascript-hint.js"></script>
<script src="../mode/javascript/javascript.js"></script>
<link rel="stylesheet" href="../doc/docs.css">
</head>
@@ -53,8 +53,8 @@ function getCompletions(token, context) {
</textarea></form>
<p>Press <strong>ctrl-space</strong> to activate autocompletion. See
-the code (<a href="../lib/util/simple-hint.js">here</a>
-and <a href="../lib/util/javascript-hint.js">here</a>) to figure out
+the code (<a href="../addon/hint/simple-hint.js">here</a>
+and <a href="../addon/hint/javascript-hint.js">here</a>) to figure out
how it works.</p>
<script>
diff --git a/demo/folding.html b/demo/folding.html
index e6180fe888c4580983c88b57265fe2991db6db0f..f28e5af4692de0be941f8f40efa41d65037a9e52 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -5,7 +5,7 @@
<title>CodeMirror: Code Folding Demo</title>
<link rel="stylesheet" href="../lib/codemirror.css">
<script src="../lib/codemirror.js"></script>
- <script src="../lib/util/foldcode.js"></script>
+ <script src="../addon/fold/foldcode.js"></script>
<script src="../mode/javascript/javascript.js"></script>
<script src="../mode/xml/xml.js"></script>
<link rel="stylesheet" href="../doc/docs.css">
@@ -25,7 +25,7 @@
<h1>CodeMirror: Code Folding Demo</h1>
<p>Demonstration of code folding using the code
- in <a href="../lib/util/foldcode.js"><code>foldcode.js</code></a>.
+ in <a href="../addon/fold/foldcode.js"><code>foldcode.js</code></a>.
Press ctrl-q or click on the gutter to fold a block, again
to unfold.<br>Try the <a href="collapserange.html">Range Colapse demo</a> as well.</p>
<form>
diff --git a/demo/formatting.html b/demo/formatting.html
index b9e800d9cf0348cd1c9312c65c7b9e35b6b83c55..5d2f4b40fcde2d3d524524b3491601ef4f574de0 100644
--- a/demo/formatting.html
+++ b/demo/formatting.html
@@ -5,7 +5,7 @@
<title>CodeMirror: Formatting Demo</title>
<link rel="stylesheet" href="../lib/codemirror.css">
<script src="../lib/codemirror.js"></script>
- <script src="../lib/util/formatting.js"></script>
+ <script src="../addon/format/formatting.js"></script>
<script src="../mode/css/css.js"></script>
<script src="../mode/xml/xml.js"></script>
<script src="../mode/javascript/javascript.js"></script>
diff --git a/demo/loadmode.html b/demo/loadmode.html
index ffe97e30b60a010cf4573b86a413e9af1e160185..1bd958f70b053ef14f1759cffaf4376d3ca28f5c 100644
--- a/demo/loadmode.html
+++ b/demo/loadmode.html
@@ -5,7 +5,7 @@
<title>CodeMirror: Lazy Mode Loading Demo</title>
<link rel="stylesheet" href="../lib/codemirror.css">
<script src="../lib/codemirror.js"></script>
- <script src="../lib/util/loadmode.js"></script>
+ <script src="../addon/mode/loadmode.js"></script>
<link rel="stylesheet" href="../doc/docs.css">
<style type="text/css">
diff --git a/demo/matchhighlighter.html b/demo/matchhighlighter.html
index c8a4bdf986e55f01a0902e5d40306a242bbfd80a..ea5944ce336c5231b4868865b32ba0bc2313b847 100644
--- a/demo/matchhighlighter.html
+++ b/demo/matchhighlighter.html
@@ -5,8 +5,8 @@
<title>CodeMirror: Match Highlighter Demo</title>
<link rel="stylesheet" href="../lib/codemirror.css">
<script src="../lib/codemirror.js"></script>
- <script src="../lib/util/searchcursor.js"></script>
- <script src="../lib/util/match-highlighter.js"></script>
+ <script src="../addon/search/searchcursor.js"></script>
+ <script src="../addon/search/match-highlighter.js"></script>
<link rel="stylesheet" href="../doc/docs.css">
<style type="text/css">
diff --git a/demo/multiplex.html b/demo/multiplex.html
index 25fffd32942128be719e24569570fc5883ffdb3b..9ebe8f357b9555f1aad8faa8cc0374d144cfd338 100644
--- a/demo/multiplex.html
+++ b/demo/multiplex.html
@@ -5,7 +5,7 @@
<title>CodeMirror: Multiplexing Parser Demo</title>
<link rel="stylesheet" href="../lib/codemirror.css">
<script src="../lib/codemirror.js"></script>
- <script src="../lib/util/multiplex.js"></script>
+ <script src="../addon/mode/multiplex.js"></script>
<script src="../mode/xml/xml.js"></script>
<link rel="stylesheet" href="../doc/docs.css">
@@ -52,8 +52,8 @@ var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
boundary strings, switches to one or more inner modes. The out
(HTML) mode does not get fed the content of the <code><<
>></code> blocks. See
- the <a href="../doc/manual.html#util_multiplex">manual</a> and
- the <a href="../lib/util/multiplex.js">source</a> for more
+ the <a href="../doc/manual.html#addon_multiplex">manual</a> and
+ the <a href="../addon/mode/multiplex.js">source</a> for more
information.</p>
</body>
diff --git a/demo/mustache.html b/demo/mustache.html
index c2ce331077f18af1b5c122d2ace2b6c6ebf7f5e4..9d2081dc49aa1e228a21c0738ed0a36aa32f5757 100644
--- a/demo/mustache.html
+++ b/demo/mustache.html
@@ -5,7 +5,7 @@
<title>CodeMirror: Overlay Parser Demo</title>
<link rel="stylesheet" href="../lib/codemirror.css">
<script src="../lib/codemirror.js"></script>
- <script src="../lib/util/overlay.js"></script>
+ <script src="../addon/mode/overlay.js"></script>
<script src="../mode/xml/xml.js"></script>
<link rel="stylesheet" href="../doc/docs.css">
@@ -52,7 +52,7 @@ var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: "mu
<p>Demonstration of a mode that parses HTML, highlighting
the <a href="http://mustache.github.com/">Mustache</a> templating
directives inside of it by using the code
- in <a href="../lib/util/overlay.js"><code>overlay.js</code></a>. View
+ in <a href="../addon/mode/overlay.js"><code>overlay.js</code></a>. View
source to see the 15 lines of code needed to accomplish this.</p>
</body>
diff --git a/demo/runmode.html b/demo/runmode.html
index 53ac04f9177f5fc61fbd7ffc88bc4f8b2904f206..dba808ba7a66cefedac922d5804d56c89c40e4e2 100644
--- a/demo/runmode.html
+++ b/demo/runmode.html
@@ -5,7 +5,7 @@
<title>CodeMirror: Mode Runner Demo</title>
<link rel="stylesheet" href="../lib/codemirror.css">
<script src="../lib/codemirror.js"></script>
- <script src="../lib/util/runmode.js"></script>
+ <script src="../addon/runmode/runmode.js"></script>
<script src="../mode/xml/xml.js"></script>
<link rel="stylesheet" href="../doc/docs.css">
</head>
@@ -30,7 +30,7 @@ function doHighlight() {
<p>Running a CodeMirror mode outside of the editor.
The <code>CodeMirror.runMode</code> function, defined
- in <code><a href="../lib/util/runmode.js">lib/runmode.js</a></code> takes the following arguments:</p>
+ in <code><a href="../addon/runmode/runmode.js">lib/runmode.js</a></code> takes the following arguments:</p>
<dl>
<dt><code>text (string)</code></dt>
diff --git a/demo/search.html b/demo/search.html
index 219c80572e7ada364b4204a76e00cbcb49c7b2a3..d72107156cb7ac808dbdbac9bb068c0b160d5c68 100644
--- a/demo/search.html
+++ b/demo/search.html
@@ -6,10 +6,10 @@
<link rel="stylesheet" href="../lib/codemirror.css">
<script src="../lib/codemirror.js"></script>
<script src="../mode/xml/xml.js"></script>
- <script src="../lib/util/dialog.js"></script>
- <link rel="stylesheet" href="../lib/util/dialog.css">
- <script src="../lib/util/searchcursor.js"></script>
- <script src="../lib/util/search.js"></script>
+ <script src="../addon/dialog/dialog.js"></script>
+ <link rel="stylesheet" href="../addon/dialog/dialog.css">
+ <script src="../addon/search/searchcursor.js"></script>
+ <script src="../addon/search/search.js"></script>
<link rel="stylesheet" href="../doc/docs.css">
<style type="text/css">
@@ -76,10 +76,10 @@ var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: "te
<dt>Shift-Ctrl-R / Shift-Cmd-Option-F</dt><dd>Replace all</dd>
</dl>
<p>Searching is enabled by
- including <a href="../lib/util/search.js">lib/util/search.js</a>
- and <a href="../lib/util/searchcursor.js">lib/util/searchcursor.js</a>.
+ including <a href="../addon/search/search.js">addon/search/search.js</a>
+ and <a href="../addon/search/searchcursor.js">addon/search/searchcursor.js</a>.
For good-looking input dialogs, you also want to include
- <a href="../lib/util/dialog.js">lib/util/dialog.js</a>
- and <a href="../lib/util/dialog.css">lib/util/dialog.css</a>.</p>
+ <a href="../addon/dialog/dialog.js">addon/dialog/dialog.js</a>
+ and <a href="../addon/dialog/dialog.css">addon/dialog/dialog.css</a>.</p>
</body>
</html>
diff --git a/demo/vim.html b/demo/vim.html
index d2a143acf10bad09bf0440c2fe6c7a700ea85801..c5835d40dafacc74be875c59b9d7852c9c650760 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -5,12 +5,12 @@
<title>CodeMirror: Vim bindings demo</title>
<link rel="stylesheet" href="../lib/codemirror.css">
<script src="../lib/codemirror.js"></script>
- <script src="../lib/util/dialog.js"></script>
- <script src="../lib/util/searchcursor.js"></script>
+ <script src="../addon/dialog/dialog.js"></script>
+ <script src="../addon/search/searchcursor.js"></script>
<script src="../mode/clike/clike.js"></script>
<script src="../keymap/vim.js"></script>
<link rel="stylesheet" href="../doc/docs.css">
- <link rel="stylesheet" href="../lib/util/dialog.css">
+ <link rel="stylesheet" href="../addon/dialog/dialog.css">
<style type="text/css">
.CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
index 142d52b477a95f410abbe25e914456e051b7a325..b7dfb42b6c23a8228a5d8c86ed3a1bc8c206fe81 100644
--- a/demo/xmlcomplete.html
+++ b/demo/xmlcomplete.html
@@ -5,10 +5,10 @@
<title>CodeMirror: XML Autocomplete Demo</title>
<link rel="stylesheet" href="../lib/codemirror.css">
<script src="../lib/codemirror.js"></script>
- <script src="../lib/util/simple-hint.js"></script>
- <link rel="stylesheet" href="../lib/util/simple-hint.css">
- <script src="../lib/util/closetag.js"></script>
- <script src="../lib/util/xml-hint.js"></script>
+ <script src="../addon/hint/simple-hint.js"></script>
+ <link rel="stylesheet" href="../addon/hint/simple-hint.css">
+ <script src="../addon/edit/closetag.js"></script>
+ <script src="../addon/hint/xml-hint.js"></script>
<script src="../mode/xml/xml.js"></script>
<link rel="stylesheet" href="../doc/docs.css">
<style type="text/css">
@@ -23,8 +23,8 @@
<p>Type '<' or space inside tag or
press <strong>ctrl-space</strong> to activate autocompletion. See
- the code (<a href="../lib/util/simple-hint.js">here</a>
- and <a href="../lib/util/xml-hint.js">here</a>) to figure out how
+ the code (<a href="../addon/hint/simple-hint.js">here</a>
+ and <a href="../addon/hint/xml-hint.js">here</a>) to figure out how
it works.</p>
<script>
diff --git a/doc/compress.html b/doc/compress.html
index 74e68d0559b749c779298ec0064216686bc7b9bc..2315838c80fb3e5d9a50241c4f78c556f66ff03e 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -127,23 +127,30 @@
<option value="http://codemirror.net/mode/yaml/yaml.js">yaml.js</option>
<option value="http://codemirror.net/mode/z80/z80.js">z80.js</option>
</optgroup>
- <optgroup label="Utilities and add-ons">
- <option value="http://codemirror.net/lib/util/overlay.js">overlay.js</option>
- <option value="http://codemirror.net/lib/util/multiplex.js">multiplex.js</option>
- <option value="http://codemirror.net/lib/util/runmode.js">runmode.js</option>
- <option value="http://codemirror.net/lib/util/simple-hint.js">simple-hint.js</option>
- <option value="http://codemirror.net/lib/util/javascript-hint.js">javascript-hint.js</option>
- <option value="http://codemirror.net/lib/util/xml-hint.js">xml-hint.js</option>
- <option value="http://codemirror.net/lib/util/python-hint.js">python-hint.js</option>
- <option value="http://codemirror.net/lib/util/foldcode.js">foldcode.js</option>
- <option value="http://codemirror.net/lib/util/dialog.js">dialog.js</option>
- <option value="http://codemirror.net/lib/util/search.js">search.js</option>
- <option value="http://codemirror.net/lib/util/searchcursor.js">searchcursor.js</option>
- <option value="http://codemirror.net/lib/util/matchbrackets.js">matchbrackets.js</option>
- <option value="http://codemirror.net/lib/util/formatting.js">formatting.js</option>
- <option value="http://codemirror.net/lib/util/match-highlighter.js">match-highlighter.js</option>
- <option value="http://codemirror.net/lib/util/closetag.js">closetag.js</option>
- <option value="http://codemirror.net/lib/util/loadmode.js">loadmode.js</option>
+ <optgroup label="Add-ons">
+ <option value="http://codemirror.net/addon/dialog/dialog.js">dialog.js</option>
+ <option value="http://codemirror.net/addon/edit/closetag.js">closetag.js</option>
+ <option value="http://codemirror.net/addon/edit/continuecomment.js">continuecomment.js</option>
+ <option value="http://codemirror.net/addon/edit/continuelist.js">continuelist.js</option>
+ <option value="http://codemirror.net/addon/edit/matchbrackets.js">matchbrackets.js</option>
+ <option value="http://codemirror.net/addon/fold/foldcode.js">foldcode.js</option>
+ <option value="http://codemirror.net/addon/fold/collapserange.js">collapserange.js</option>
+ <option value="http://codemirror.net/addon/format/formatting.js">formatting.js</option>
+ <option value="http://codemirror.net/addon/hint/simple-hint.js">simple-hint.js</option>
+ <option value="http://codemirror.net/addon/hint/javascript-hint.js">javascript-hint.js</option>
+ <option value="http://codemirror.net/addon/hint/xml-hint.js">xml-hint.js</option>
+ <option value="http://codemirror.net/addon/hint/pig-hint.js">pig-hint.js</option>
+ <option value="http://codemirror.net/addon/hint/python-hint.js">python-hint.js</option>
+ <option value="http://codemirror.net/addon/mode/loadmode.js">loadmode.js</option>
+ <option value="http://codemirror.net/addon/mode/overlay.js">overlay.js</option>
+ <option value="http://codemirror.net/addon/mode/multiplex.js">multiplex.js</option>
+ <option value="http://codemirror.net/addon/runmode/colorize.js">colorize.js</option>
+ <option value="http://codemirror.net/addon/runmode/runmode.js">runmode.js</option>
+ <option value="http://codemirror.net/addon/runmode/runmode-standalone.js">runmode-standalone.js</option>
+ <option value="http://codemirror.net/addon/runmode/runmode.node.js">runmode.node.js</option>
+ <option value="http://codemirror.net/addon/search/search.js">search.js</option>
+ <option value="http://codemirror.net/addon/search/searchcursor.js">searchcursor.js</option>
+ <option value="http://codemirror.net/addon/search/match-highlighter.js">match-highlighter.js</option>
</optgroup>
<optgroup label="Keymaps">
<option value="http://codemirror.net/keymap/emacs.js">emacs.js</option>
diff --git a/doc/manual.html b/doc/manual.html
index 7bb525a46f7621f25ed5f728862b63ebd0dfba78..8f9574b871e52e26d7a54dfdf131aa81392f911b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -8,8 +8,8 @@
<style>dl dl {margin: 0;}</style>
<script src="../lib/codemirror.js"></script>
<link rel="stylesheet" href="../lib/codemirror.css">
- <script src="../lib/util/runmode.js"></script>
- <script src="../lib/util/colorize.js"></script>
+ <script src="../addon/runmode/runmode.js"></script>
+ <script src="../addon/runmode/colorize.js"></script>
<script src="../mode/javascript/javascript.js"></script>
<script src="../mode/xml/xml.js"></script>
<script src="../mode/css/css.js"></script>
@@ -1103,19 +1103,19 @@
<h2 id="addons">Add-ons</h2>
- <p>The <code>lib/util</code> directory in the distribution
- contains a number of reusable components that implement extra
- editor functionality. In brief, they are:</p>
+ <p>The <code>addon</code> directory in the distribution contains a
+ number of reusable components that implement extra editor
+ functionality. In brief, they are:</p>
<dl>
- <dt id="util_dialog"><a href="../lib/util/dialog.js"><code>dialog.js</code></a></dt>
+ <dt id="addon_dialog"><a href="../addon/dialog/dialog.js"><code>dialog.js</code></a></dt>
<dd>Provides a very simple way to query users for text input.
Adds an <code>openDialog</code> method to CodeMirror instances,
which can be called with an HTML fragment that provides the
prompt (should include an <code>input</code> tag), and a
callback function that is called when text has been entered.
- Depends on <code>lib/util/dialog.css</code>.</dd>
- <dt id="util_searchcursor"><a href="../lib/util/searchcursor.js"><code>searchcursor.js</code></a></dt>
+ Depends on <code>addon/dialog/dialog.css</code>.</dd>
+ <dt id="addon_searchcursor"><a href="../addon/search/searchcursor.js"><code>searchcursor.js</code></a></dt>
<dd>Adds the <code>getSearchCursor(query, start, caseFold) →
cursor</code> method to CodeMirror instances, which can be used
to implement search/replace functionality. <code>query</code>
@@ -1144,14 +1144,14 @@
replacement.</dd>
</dl></dd>
- <dt id="util_search"><a href="../lib/util/search.js"><code>search.js</code></a></dt>
+ <dt id="addon_search"><a href="../addon/search/search.js"><code>search.js</code></a></dt>
<dd>Implements the search commands. CodeMirror has keys bound to
these by default, but will not do anything with them unless an
implementation is provided. Depends
on <code>searchcursor.js</code>, and will make use
- of <a href="#util_dialog"><code>openDialog</code></a> when
+ of <a href="#addon_dialog"><code>openDialog</code></a> when
available to make prompting for search queries less ugly.</dd>
- <dt id="util_matchbrackets"><a href="../lib/util/matchbrackets.js"><code>matchbrackets.js</code></a></dt>
+ <dt id="addon_matchbrackets"><a href="../addon/edit/matchbrackets.js"><code>matchbrackets.js</code></a></dt>
<dd>Defines an option <code>matchBrackets</code> which, when set
to true, causes matching brackets to be highlighted whenever the
cursor is next to them. It also adds a
@@ -1159,7 +1159,7 @@
once, and a method <code>findMatchingBracket</code> that can be
used to run the bracket-finding algorithm that this uses
internally.</dd>
- <dt id="util_foldcode"><a href="../lib/util/foldcode.js"><code>foldcode.js</code></a></dt>
+ <dt id="addon_foldcode"><a href="../addon/fold/foldcode.js"><code>foldcode.js</code></a></dt>
<dd>Helps with code folding.
See <a href="../demo/folding.html">the demo</a> for an example.
Call <code>CodeMirror.newFoldFunction</code> with a range-finder
@@ -1175,17 +1175,21 @@
where indentation determines block structure (Python, Haskell),
and <code>CodeMirror.tagRangeFinder</code>, for XML-style
languages.</dd>
- <dt id="util_collapserange"><a href="../lib/util/collapserange.js"><code>collapserange.js</code></a></dt>
+ <dt id="addon_collapserange"><a href="../addon/fold/collapserange.js"><code>collapserange.js</code></a></dt>
<dd>Another approach to
folding. <a href="../demo/collapserange.html">See demo</a>.
Allows the user to select a range to fold by clicking in the
gutter.</dd>
- <dt id="util_runmode"><a href="../lib/util/runmode.js"><code>runmode.js</code></a></dt>
+ <dt id="addon_runmode"><a href="../addon/runmode/runmode.js"><code>runmode.js</code></a></dt>
<dd>Can be used to run a CodeMirror mode over text without
actually opening an editor instance.
- See <a href="../demo/runmode.html">the demo</a> for an
- example.</dd>
- <dt id="util_overlay"><a href="../lib/util/overlay.js"><code>overlay.js</code></a></dt>
+ See <a href="../demo/runmode.html">the demo</a> for an example.
+ There alternate version of the file avaible for
+ running <a href="../addon/runmode/runmode-standalone.js">stand-alone</a>
+ (without including all of CodeMirror) and
+ for <a href="../addon/runmode/runmode.node.js">running under
+ node.js</a>.</dd>
+ <dt id="addon_overlay"><a href="../addon/mode/overlay.js"><code>overlay.js</code></a></dt>
<dd>Mode combinator that can be used to extend a mode with an
'overlay' — a secondary mode is run over the stream, along with
the base mode, and can color specific pieces of text without
@@ -1193,7 +1197,7 @@
Defines <code>CodeMirror.overlayMode</code>, which is used to
create such a mode. See <a href="../demo/mustache.html">this
demo</a> for a detailed example.</dd>
- <dt id="util_multiplex"><a href="../lib/util/multiplex.js"><code>multiplex.js</code></a></dt>
+ <dt id="addon_multiplex"><a href="../addon/mode/multiplex.js"><code>multiplex.js</code></a></dt>
<dd>Mode combinator that can be used to easily 'multiplex'
between several modes.
Defines <code>CodeMirror.multiplexingMode</code> which, when
@@ -1212,7 +1216,7 @@
see the content between the delimiters.
See <a href="../demo/multiplex.html">this demo</a> for an
example.</dd>
- <dt id="util_simple-hint"><a href="../lib/util/simple-hint.js"><code>simple-hint.js</code></a></dt>
+ <dt id="addon_simple-hint"><a href="../addon/hint/simple-hint.js"><code>simple-hint.js</code></a></dt>
<dd>Provides a framework for showing autocompletion hints.
Defines <code>CodeMirror.simpleHint</code>, which takes a
CodeMirror instance and a hinting function, and pops up a widget
@@ -1222,36 +1226,36 @@
is an array of strings (the completions), and <code>from</code>
and <code>to</code> give the start and end of the token that is
being completed. Depends
- on <code>lib/util/simple-hint.css</code>.</dd>
- <dt id="util_javascript-hint"><a href="../lib/util/javascript-hint.js"><code>javascript-hint.js</code></a></dt>
+ on <code>addon/hint/simple-hint.css</code>.</dd>
+ <dt id="addon_javascript-hint"><a href="../addon/hint/javascript-hint.js"><code>javascript-hint.js</code></a></dt>
<dd>Defines <code>CodeMirror.javascriptHint</code>
and <code>CodeMirror.coffeescriptHint</code>, which are simple
hinting functions for the JavaScript and CoffeeScript
modes.</dd>
- <dt id="util_xml-hint"><a href="../lib/util/xml-hint.js"><code>xml-hint.js</code></a></dt>
+ <dt id="addon_xml-hint"><a href="../addon/hint/xml-hint.js"><code>xml-hint.js</code></a></dt>
<dd>Defines <code>CodeMirror.xmlHint</code>, a hinting function
for XML (which requires a schema to be defined).</dd>
- <dt id="util_python-hint"><a href="../lib/util/python-hint.js"><code>python-hint.js</code></a></dt>
+ <dt id="addon_python-hint"><a href="../addon/hint/python-hint.js"><code>python-hint.js</code></a></dt>
<dd>Defines <code>CodeMirror.pythonHint</code>, a hinter for Python code.</dd>
- <dt id="util_match-highlighter"><a href="../lib/util/match-highlighter.js"><code>match-highlighter.js</code></a></dt>
+ <dt id="addon_match-highlighter"><a href="../addon/search/match-highlighter.js"><code>match-highlighter.js</code></a></dt>
<dd>Adds a <code>matchHighlight</code> method to CodeMirror
instances that can be called (typically from
a <a href="#event_cursorActivity"><code>cursorActivity</code></a>
handler) to highlight all instances of a currently selected word
with the a classname given as a first argument to the method.
Depends on
- the <a href="#util_searchcursor"><code>searchcursor</code></a>
+ the <a href="#addon_searchcursor"><code>searchcursor</code></a>
add-on. Demo <a href="../demo/matchhighlighter.html">here</a>.</dd>
- <dt id="util_formatting"><a href="../lib/util/formatting.js"><code>formatting.js</code></a></dt>
+ <dt id="addon_formatting"><a href="../addon/format/formatting.js"><code>formatting.js</code></a></dt>
<dd>Adds <code>commentRange</code>, <code>autoIndentRange</code>,
and <code>autoFormatRange</code> methods that, respectively,
comment (or uncomment), indent, or format (add line breaks) a
range of code. <a href="../demo/formatting.html">Demo here.</a></dd>
- <dt id="util_closetag"><a href="../lib/util/closetag.js"><code>closetag.js</code></a></dt>
+ <dt id="addon_closetag"><a href="../addon/edit/closetag.js"><code>closetag.js</code></a></dt>
<dd>Provides utility functions for adding automatic tag closing
to XML modes. See
the <a href="../demo/closetag.html">demo</a>.</dd>
- <dt id="util_loadmode"><a href="../lib/util/loadmode.js"><code>loadmode.js</code></a></dt>
+ <dt id="addon_loadmode"><a href="../addon/mode/loadmode.js"><code>loadmode.js</code></a></dt>
<dd>Defines a <code>CodeMirror.requireMode(modename,
callback)</code> function that will try to load a given mode and
call the callback when it succeeded. You'll have to
@@ -1263,7 +1267,7 @@
which will ensure the given mode is loaded and cause the given
editor instance to refresh its mode when the loading
succeeded. See the <a href="../demo/loadmode.html">demo</a>.</dd>
- <dt id="util_continuecomment"><a href="../lib/util/continuecomment.js"><code>continuecomment.js</code></a></dt>
+ <dt id="addon_continuecomment"><a href="../addon/edit/continuecomment.js"><code>continuecomment.js</code></a></dt>
<dd>Adds a <a href="#commands">command</a>
called <code>newlineAndIndentContinueComment</code> that you can
bind <code>Enter</code> to in order to have the editor prefix
@@ -1456,8 +1460,8 @@
extra methods, <code>innerMode</code> which, given a state object,
returns a <code>{state, mode}</code> object with the inner mode
and its state for the current position. These are used by utility
- scripts such as the <a href="#util_formatting">autoformatter</a>
- and the <a href="#util_closetag">tag closer</a> to get context
+ scripts such as the <a href="#addon_formatting">autoformatter</a>
+ and the <a href="#addon_closetag">tag closer</a> to get context
information. Use the <code>CodeMirror.innerMode</code> helper
function to, starting from a mode and a state, recursively walk
down to the innermost mode and state.</p>
diff --git a/doc/oldrelease.html b/doc/oldrelease.html
index dafe7386522398ef9419f23357c1c7be83387447..aff806e06d6975779357e424a01c9afd9803df2b 100644
--- a/doc/oldrelease.html
+++ b/doc/oldrelease.html
@@ -91,8 +91,8 @@
<li>Add <a href="manual.html#option_autoClearEmptyLines"><code>autoClearEmptyLines</code></a> option.</li>
<li>Properly use tab stops when rendering tabs.</li>
<li>Make PHP mode more robust.</li>
- <li>Support indentation blocks in <a href="manual.html#util_foldcode">code folder</a>.</li>
- <li>Add a script for <a href="manual.html#util_match-highlighter">highlighting instances of the selection</a>.</li>
+ <li>Support indentation blocks in <a href="manual.html#addon_foldcode">code folder</a>.</li>
+ <li>Add a script for <a href="manual.html#addon_match-highlighter">highlighting instances of the selection</a>.</li>
<li>New <a href="../mode/properties/index.html">.properties</a> mode.</li>
<li>Fix many bugs.</li>
</ul>
@@ -148,7 +148,7 @@
and <a href="../theme/rubyblue.css">Rubyblue</a> themes.</li>
<li>Add <a href="manual.html#setBookmark"><code>setBookmark</code></a> method.</li>
<li>Move some of the demo code into reusable components
- under <a href="../lib/util/"><code>lib/util</code></a>.</li>
+ under <a href="../addon/"><code>lib/util</code></a>.</li>
<li>Make screen-coord-finding code faster and more reliable.</li>
<li>Fix drag-and-drop in Firefox.</li>
<li>Improve support for IME.</li>
diff --git a/doc/upgrade_v3.html b/doc/upgrade_v3.html
index eaaffec17f7cabefd83432a289561a5ea4c5d224..7e8a6b61ae378cbe4112860beebfb3186fe6091a 100644
--- a/doc/upgrade_v3.html
+++ b/doc/upgrade_v3.html
@@ -7,8 +7,8 @@
<link rel="stylesheet" type="text/css" href="docs.css"/>
<script src="../lib/codemirror.js"></script>
<link rel="stylesheet" href="../lib/codemirror.css">
- <script src="../lib/util/runmode.js"></script>
- <script src="../lib/util/colorize.js"></script>
+ <script src="../addon/runmode/runmode.js"></script>
+ <script src="../addon/runmode/colorize.js"></script>
<script src="../mode/javascript/javascript.js"></script>
<script src="../mode/xml/xml.js"></script>
<script src="../mode/css/css.js"></script>
@@ -174,9 +174,9 @@ and <a href="manual.html#getScrollInfo"><code>getScrollInfo</code></a>.</p>
<h2 id=matchbrackets>Bracket matching no longer in core</h2>
-<p>The <a href="manual.html#util_matchbrackets"><code>matchBrackets</code></a>
+<p>The <a href="manual.html#addon_matchbrackets"><code>matchBrackets</code></a>
option is no longer defined in the core editor.
-Load <code>lib/util/matchbrackets.js</code> to enable it.</p>
+Load <code>addon/edit/matchbrackets.js</code> to enable it.</p>
<h2 id=modes>Mode management</h2>
diff --git a/index.html b/index.html
index 174bc27fd3bb1fcc0e681758f9aa6df85147bb20..e921f0f300acce2b2d895d03ba32617d979dc396 100644
--- a/index.html
+++ b/index.html
@@ -329,7 +329,7 @@
<li>Add <a href="doc/manual.html#defaultTextHeight"><code>defaultTextHeight</code></a> method.</li>
<li>Various extensions to the vim keymap.</li>
<li>Make <a href="mode/php/index.html">PHP mode</a> build on <a href="mode/htmlmixed/index.html">mixed HTML mode</a>.</li>
- <li>Add <a href="doc/manual.html#util_continuecomment">comment-continuing</a> add-on.</li>
+ <li>Add <a href="doc/manual.html#addon_continuecomment">comment-continuing</a> add-on.</li>
<li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v2.35...v2.36">list of patches</a>.</li>
</ul>
diff --git a/mode/clike/index.html b/mode/clike/index.html
index ca10c4bc23a9cba1d55597f2ecd2ce72710702c7..5f90394d958f92ef93115a93c39249e718a5b609 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -5,7 +5,7 @@
<title>CodeMirror: C-like mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/matchbrackets.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
<script src="clike.js"></script>
<link rel="stylesheet" href="../../doc/docs.css">
<style>.CodeMirror {border: 2px inset #dee;}</style>
diff --git a/mode/clike/scala.html b/mode/clike/scala.html
index 39115967ab8b452c649a17f0309695a673dcf318..f3c7eea498ab41eae04721d859269d7ec64dc20d 100644
--- a/mode/clike/scala.html
+++ b/mode/clike/scala.html
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="../../lib/codemirror.css">
<link rel="stylesheet" href="../../theme/ambiance.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/matchbrackets.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
<script src="clike.js"></script>
<link rel="stylesheet" href="../../doc/docs.css">
<style>
diff --git a/mode/d/index.html b/mode/d/index.html
index 89a849895c681ac2990b22a98c8b0a5a89424b16..13332727ad6185a642c6b56b284dc5a84f22dbe2 100755
--- a/mode/d/index.html
+++ b/mode/d/index.html
@@ -5,7 +5,7 @@
<title>CodeMirror: D mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/matchbrackets.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
<script src="d.js"></script>
<link rel="stylesheet" href="../../doc/docs.css">
<style>.CodeMirror {border: 2px inset #dee;}</style>
diff --git a/mode/erlang/index.html b/mode/erlang/index.html
index f6bee8f7233615e06bc23760856a88ea91fe1803..fd21521c88b43ab50071b1b92b3d8efb69028cc9 100644
--- a/mode/erlang/index.html
+++ b/mode/erlang/index.html
@@ -5,7 +5,7 @@
<title>CodeMirror: Erlang mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/matchbrackets.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
<script src="erlang.js"></script>
<link rel="stylesheet" href="../../theme/erlang-dark.css">
<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index e4ea473571d1e6fb41ea959560101fa596a67b0c..b5bdb8888f2e6078b5b6b21d6fcb7f58bf0fbd07 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -5,7 +5,7 @@
<title>CodeMirror: GFM mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/overlay.js"></script>
+ <script src="../../addon/mode/overlay.js"></script>
<script src="../xml/xml.js"></script>
<script src="../markdown/markdown.js"></script>
<script src="gfm.js"></script>
diff --git a/mode/go/index.html b/mode/go/index.html
index 1a9ef53852f40a7de0ea50be12e60a53f78b7da0..8a6aafca29de358e10ae2c6c16057098ff97e7a1 100644
--- a/mode/go/index.html
+++ b/mode/go/index.html
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="../../lib/codemirror.css">
<link rel="stylesheet" href="../../theme/elegant.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/matchbrackets.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
<script src="go.js"></script>
<link rel="stylesheet" href="../../doc/docs.css">
<style>.CodeMirror {border:1px solid #999; background:#ffc}</style>
diff --git a/mode/groovy/index.html b/mode/groovy/index.html
index d0d76bfa90f8c0f44defdd1fcd8fefce9ec258f3..3d395957749a68c56f894cb0a551a5aa13720e8b 100644
--- a/mode/groovy/index.html
+++ b/mode/groovy/index.html
@@ -5,7 +5,7 @@
<title>CodeMirror: Groovy mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/matchbrackets.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
<script src="groovy.js"></script>
<link rel="stylesheet" href="../../doc/docs.css">
<style>.CodeMirror {border-top: 1px solid #500; border-bottom: 1px solid #500;}</style>
diff --git a/mode/haskell/index.html b/mode/haskell/index.html
index b304a2768284e5361fcdd123854181abde109030..56307b8a95d53355c9fc5144e13b2cc8ac954793 100644
--- a/mode/haskell/index.html
+++ b/mode/haskell/index.html
@@ -5,7 +5,7 @@
<title>CodeMirror: Haskell mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/matchbrackets.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
<script src="haskell.js"></script>
<link rel="stylesheet" href="../../theme/elegant.css">
<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index d81413c0a658e162e0bf0c050d6e9f870adff64f..9222ddf170108f16be8bf26501fc6f99fe332a4b 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -5,8 +5,8 @@
<title>CodeMirror: JavaScript mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/matchbrackets.js"></script>
- <script src="../../lib/util/continuecomment.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
+ <script src="../../addon/edit/continuecomment.js"></script>
<script src="javascript.js"></script>
<link rel="stylesheet" href="../../doc/docs.css">
<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
diff --git a/mode/less/index.html b/mode/less/index.html
index 7f27cf30e95aa14a5f206be15923543cdfbc8f4c..78c1e53074caefabd809d756252127590b5a4b00 100644
--- a/mode/less/index.html
+++ b/mode/less/index.html
@@ -5,7 +5,7 @@
<title>CodeMirror: LESS mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/matchbrackets.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
<script src="less.js"></script>
<style>.CodeMirror {background: #f8f8f8; border: 1px solid #ddd; font-size:12px; height: 400px}</style>
<link rel="stylesheet" href="../../doc/docs.css">
diff --git a/mode/lua/index.html b/mode/lua/index.html
index df83f9b47d1e85e6aa2eac19d7bfe7ae00f2bf69..a0a42d91c49e600570a69c9001b149bb2ebad57e 100644
--- a/mode/lua/index.html
+++ b/mode/lua/index.html
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>CodeMirror: Lua mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
- <script src="../../lib/util/matchbrackets.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
<script src="../../lib/codemirror.js"></script>
<script src="lua.js"></script>
<link rel="stylesheet" href="../../theme/neat.css">
diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index 5d7452f1e83525fd03d7a21827e2aab71880098f..6f97b10e7304142accb123b011e201287aec8264 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -5,7 +5,7 @@
<title>CodeMirror: Markdown mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/continuelist.js"></script>
+ <script src="../../addon/edit/continuelist.js"></script>
<script src="../xml/xml.js"></script>
<script src="markdown.js"></script>
<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
diff --git a/mode/ocaml/index.html b/mode/ocaml/index.html
index 962fa29eb1efb5375c201514dbb4f368ab640bcd..c10a84fade08619fa363cee6beb9ddbb08af582c 100644
--- a/mode/ocaml/index.html
+++ b/mode/ocaml/index.html
@@ -10,7 +10,7 @@
</style>
<script src=../../lib/codemirror.js></script>
-<script src=../../lib/util/matchbrackets.js></script>
+<script src=../../addon/edit/matchbrackets.js></script>
<script src=ocaml.js></script>
<h1>CodeMirror: OCaml mode</h1>
diff --git a/mode/php/index.html b/mode/php/index.html
index 4b21c1900a3aa1f2a95cdb2ffc57bc247930524d..3d4c336ce0f84ef884f84d7727b2ec9cebf30b44 100644
--- a/mode/php/index.html
+++ b/mode/php/index.html
@@ -5,7 +5,7 @@
<title>CodeMirror: PHP mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/matchbrackets.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
<script src="../htmlmixed/htmlmixed.js"></script>
<script src="../xml/xml.js"></script>
<script src="../javascript/javascript.js"></script>
diff --git a/mode/python/index.html b/mode/python/index.html
index 7a26d278dbb16e8f3acd25cbdeeedce39d614064..c1df119485c0f6208a2405c64d16dbbbd8a8927e 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -5,7 +5,7 @@
<title>CodeMirror: Python mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/matchbrackets.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
<script src="python.js"></script>
<link rel="stylesheet" href="../../doc/docs.css">
<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
diff --git a/mode/ruby/index.html b/mode/ruby/index.html
index f226289d7d9b8d08a62ea262a2415083c41513a1..64cfe5ef34327a2eed167be2e144d8c1d16b7716 100644
--- a/mode/ruby/index.html
+++ b/mode/ruby/index.html
@@ -5,7 +5,7 @@
<title>CodeMirror: Ruby mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/matchbrackets.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
<script src="ruby.js"></script>
<style>
.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
diff --git a/mode/sass/index.html b/mode/sass/index.html
index 71c05e0c3016e0ffb230b6d4959b9dd272ebb31a..3af7bff9ed9d9daccc37dec5c39baf7bb6aa86cb 100644
--- a/mode/sass/index.html
+++ b/mode/sass/index.html
@@ -5,7 +5,7 @@
<title>CodeMirror: Sass mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/matchbrackets.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
<script src="sass.js"></script>
<style>.CodeMirror {border: 1px solid #ddd; font-size:12px; height: 400px}</style>
<link rel="stylesheet" href="../../doc/docs.css">
diff --git a/mode/shell/index.html b/mode/shell/index.html
index 0827053ceebbf7f80af9c74e8a39c4dd79d18e50..9a2ef7c4cd77b079120538cc4d1c51f2a6ccc250 100644
--- a/mode/shell/index.html
+++ b/mode/shell/index.html
@@ -10,7 +10,7 @@
</style>
<script src=../../lib/codemirror.js></script>
-<script src="../../lib/util/matchbrackets.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
<script src=shell.js></script>
<h1>CodeMirror: Shell mode</h1>
diff --git a/mode/smalltalk/index.html b/mode/smalltalk/index.html
index 690b560fd7f6d032689d0420431c4dbdda2bbdc8..b7aebdb7fbac6ccea9559fd6534d7aa365fd2ab2 100644
--- a/mode/smalltalk/index.html
+++ b/mode/smalltalk/index.html
@@ -5,7 +5,7 @@
<title>CodeMirror: Smalltalk mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/matchbrackets.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
<script src="smalltalk.js"></script>
<link rel="stylesheet" href="../../doc/docs.css">
<style>
diff --git a/mode/sparql/index.html b/mode/sparql/index.html
index a99febd5305b4d33249eed9d2661ba2f647fac14..e7433871c79d1adf7c5e8e01d473a09d3530c26c 100644
--- a/mode/sparql/index.html
+++ b/mode/sparql/index.html
@@ -5,7 +5,7 @@
<title>CodeMirror: SPARQL mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/matchbrackets.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
<script src="sparql.js"></script>
<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
<link rel="stylesheet" href="../../doc/docs.css">
diff --git a/mode/tiddlywiki/index.html b/mode/tiddlywiki/index.html
index 89ae85892b211af3e9ad27542106a22440cf4ecb..848f33a592b55d4099fa22bc674cf90554f134a4 100644
--- a/mode/tiddlywiki/index.html
+++ b/mode/tiddlywiki/index.html
@@ -5,7 +5,7 @@
<title>CodeMirror: TiddlyWiki mode</title>
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
- <script src="../../lib/util/matchbrackets.js"></script>
+ <script src="../../addon/edit/matchbrackets.js"></script>
<script src="tiddlywiki.js"></script>
<link rel="stylesheet" href="tiddlywiki.css">
<link rel="stylesheet" href="../../doc/docs.css">
diff --git a/mode/vb/index.html b/mode/vb/index.html
index 1670c7d05b039d1fd44b6162fe6061c4977bfbf6..74dd5e81619b3e38bedc341f43aac0dc8ed4ef9e 100644
--- a/mode/vb/index.html
+++ b/mode/vb/index.html
@@ -12,7 +12,7 @@
.CodeMirror-scroll { overflow-x: auto; overflow-y: hidden;}
.CodeMirror pre { font-family: Inconsolata; font-size: 14px}
</style>
- <script type="text/javascript" src="../../lib/util/runmode.js"></script>
+ <script type="text/javascript" src="../../addon/runmode/runmode.js"></script>
</head>
<body onload="init()">
<h1>CodeMirror: VB.NET mode</h1>
diff --git a/test/index.html b/test/index.html
index 9634ac23e836cc74578a0db529ddb107599a26cf..4bb4a77be56a337649230186b0a753f343d213b5 100644
--- a/test/index.html
+++ b/test/index.html
@@ -7,8 +7,8 @@
<link rel="stylesheet" href="../doc/docs.css">
<link rel="stylesheet" href="mode_test.css">
<script src="../lib/codemirror.js"></script>
- <script src="../lib/util/overlay.js"></script>
- <script src="../lib/util/searchcursor.js"></script>
+ <script src="../addon/mode/overlay.js"></script>
+ <script src="../addon/search/searchcursor.js"></script>
<script src="../mode/javascript/javascript.js"></script>
<script src="../mode/xml/xml.js"></script>
<script src="../keymap/vim.js"></script>
diff --git a/test/run.js b/test/run.js
index 8c7649a17dad40bea4f8b52912dc4430b2137227..5588d6f3883a49ab854a0e0fd92da5ec60f2e594 100755
--- a/test/run.js
+++ b/test/run.js
@@ -4,6 +4,7 @@ var lint = require("./lint/lint");
lint.checkDir("mode");
lint.checkDir("lib");
+lint.checkDir("addon");
var ok = lint.success();