Bump version number post-4.5.0

Bound retry count in measureCharInner hack for wrapping characters
Work around odd safari behavior in bad bidi rect feature detection
Issue #2780
codemirror · marijnh · marijnh · marijnh · nickjs · marijnh
diff --git a/AUTHORS b/AUTHORS
@@ -33,6 +33,7 @@ Anders Nawroth
 Anderson Mesquita
 Andreas Reischuck
 Andre von Houck
+Andrey Fedorov
 Andrey Lushnikov
 Andy Joslin
 Andy Kimball
@@ -84,6 +85,7 @@ dagsta
 daines
 Dan Heberden
 Daniel, Dao Quang Minh
+Daniele Di Sarli
 Daniel Faust
 Daniel Huigens
 Daniel KJ
@@ -145,6 +147,7 @@ Hakan Tunc
 Hans Engel
 Hardest
 Hasan Karahan
+Hiroyuki Makino
 hitsthings
 Hocdoc
 Ian Beck
@@ -215,6 +218,7 @@ Leonid Khachaturov
 Leonya Khachaturov
 Liam Newman
 LM
+lochel
 Lorenzo Stoakes
 Luciano Longo
 lynschinzer
@@ -223,6 +227,7 @@ Maksym Taran
 Malay Majithia
 Manuel Rego Casasnovas
 Marat Dreizin
+Marcel Gerber
 Marco Aurélio
 Marco Munizaga
 Marcus Bointon
@@ -316,6 +321,7 @@ Sascha Peilicke
 satchmorun
 sathyamoorthi
 SCLINIC\jdecker
+Scott Aikin
 Sebastian Zaha
 shaund
 shaun gilchrist
@@ -324,6 +330,7 @@ sheopory
 Shiv Deepak
 Shmuel Englard
 Shubham Jain
+snasa
 soliton4
 sonson
 spastorelli
diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
@@ -129,8 +129,8 @@
   CodeMirror.defineExtension("openNotification", function(template, options) {
     closeNotification(this, close);
     var dialog = dialogDiv(this, template, options && options.bottom);
-    var duration = options && (options.duration === undefined ? 5000 : options.duration);
     var closed = false, doneTimer;
+    var duration = options && typeof options.duration !== "undefined" ? options.duration : 5000;
 
     function close() {
       if (closed) return;
@@ -143,7 +143,10 @@
       CodeMirror.e_preventDefault(e);
       close();
     });
+
     if (duration)
-      doneTimer = setTimeout(close, options.duration);
+      doneTimer = setTimeout(close, duration);
+
+    return close;
   });
 });
diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
@@ -102,11 +102,25 @@
       var pos = ranges[i].head, tok = cm.getTokenAt(pos);
       var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
       if (tok.type == "string" || tok.string.charAt(0) != "<" ||
-          tok.start != pos.ch - 1 || inner.mode.name != "xml" ||
-          !state.context || !state.context.tagName ||
-          closingTagExists(cm, state.context.tagName, pos, state))
+          tok.start != pos.ch - 1)
         return CodeMirror.Pass;
-      replacements[i] = "/" + state.context.tagName + ">";
+      // Kludge to get around the fact that we are not in XML mode
+      // when completing in JS/CSS snippet in htmlmixed mode. Does not
+      // work for other XML embedded languages (there is no general
+      // way to go from a mixed mode to its current XML state).
+      if (inner.mode.name != "xml") {
+        if (cm.getMode().name == "htmlmixed" && inner.mode.name == "javascript")
+          replacements[i] = "/script>";
+        else if (cm.getMode().name == "htmlmixed" && inner.mode.name == "css")
+          replacements[i] = "/style>";
+        else
+          return CodeMirror.Pass;
+      } else {
+        if (!state.context || !state.context.tagName ||
+            closingTagExists(cm, state.context.tagName, pos, state))
+          return CodeMirror.Pass;
+        replacements[i] = "/" + state.context.tagName + ">";
+      }
     }
     cm.replaceSelections(replacements);
     ranges = cm.listSelections();
diff --git a/addon/hint/html-hint.js b/addon/hint/html-hint.js
@@ -3,9 +3,9 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror", "./xml-hint"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror", "./xml-hint"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
diff --git a/addon/hint/show-hint.css b/addon/hint/show-hint.css
@@ -32,7 +32,7 @@
   cursor: pointer;
 }
 
-.CodeMirror-hint-active {
+li.CodeMirror-hint-active {
   background: #08f;
   color: white;
 }
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
@@ -1,17 +1,17 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
+// declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
+
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror"), require("diff_match_patch"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror", "diff_match_patch"], mod);
   else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
+    mod(CodeMirror, diff_match_patch);
+})(function(CodeMirror, diff_match_patch) {
   "use strict";
-  // declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
-
   var Pos = CodeMirror.Pos;
   var svgNS = "http://www.w3.org/2000/svg";
 
diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
@@ -8,12 +8,15 @@
 // document.
 //
 // The option can be set to true to simply enable it, or to a
-// {minChars, style, showToken} object to explicitly configure it.
-// minChars is the minimum amount of characters that should be
+// {minChars, style, wordsOnly, showToken, delay} object to explicitly
+// configure it. minChars is the minimum amount of characters that should be
 // selected for the behavior to occur, and style is the token style to
 // apply to the matches. This will be prefixed by "cm-" to create an
-// actual CSS class name. showToken, when enabled, will cause the
-// current token to be highlighted when nothing is selected.
+// actual CSS class name. If wordsOnly is enabled, the matches will be
+// highlighted only if the selected text is a word. showToken, when enabled,
+// will cause the current token to be highlighted when nothing is selected.
+// delay is used to specify how much time to wait, in milliseconds, before
+// highlighting the matches.
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -28,17 +31,20 @@
   var DEFAULT_MIN_CHARS = 2;
   var DEFAULT_TOKEN_STYLE = "matchhighlight";
   var DEFAULT_DELAY = 100;
+  var DEFAULT_WORDS_ONLY = false;
 
   function State(options) {
     if (typeof options == "object") {
       this.minChars = options.minChars;
       this.style = options.style;
       this.showToken = options.showToken;
       this.delay = options.delay;
+      this.wordsOnly = options.wordsOnly;
     }
     if (this.style == null) this.style = DEFAULT_TOKEN_STYLE;
     if (this.minChars == null) this.minChars = DEFAULT_MIN_CHARS;
     if (this.delay == null) this.delay = DEFAULT_DELAY;
+    if (this.wordsOnly == null) this.wordsOnly = DEFAULT_WORDS_ONLY;
     this.overlay = this.timeout = null;
   }
 
@@ -81,12 +87,30 @@
       }
       var from = cm.getCursor("from"), to = cm.getCursor("to");
       if (from.line != to.line) return;
+      if (state.wordsOnly && !isWord(cm, from, to)) return;
       var selection = cm.getRange(from, to).replace(/^\s+|\s+$/g, "");
       if (selection.length >= state.minChars)
         cm.addOverlay(state.overlay = makeOverlay(selection, false, state.style));
     });
   }
 
+  function isWord(cm, from, to) {
+    var str = cm.getRange(from, to);
+    if (str.match(/^\w+$/) !== null) {
+        if (from.ch > 0) {
+            var pos = {line: from.line, ch: from.ch - 1};
+            var chr = cm.getRange(pos, from);
+            if (chr.match(/\W/) === null) return false;
+        }
+        if (to.ch < cm.getLine(from.line).length) {
+            var pos = {line: to.line, ch: to.ch + 1};
+            var chr = cm.getRange(to, pos);
+            if (chr.match(/\W/) === null) return false;
+        }
+        return true;
+    } else return false;
+  }
+
   function boundariesAround(stream, re) {
     return (!stream.start || !re.test(stream.string.charAt(stream.start - 1))) &&
       (stream.pos == stream.string.length || !re.test(stream.string.charAt(stream.pos)));
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.5.0",
+  "version":"4.6.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/demo/markselection.html b/demo/markselection.html
@@ -12,6 +12,7 @@
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       .CodeMirror-selected  { background-color: blue !important; }
       .CodeMirror-selectedtext { color: white; }
+      .styled-background { background-color: #ff7; }
     </style>
 <div id=nav>
   <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
@@ -28,18 +29,24 @@
 
 <article>
 <h2>Selection Marking Demo</h2>
-<form><textarea id="code" name="code">Select something from here.
-You'll see that the selection's foreground color changes to white!
-Since, by default, CodeMirror only puts an independent "marker" layer
-behind the text, you'll need something like this to change its colour.</textarea></form>
+<form><textarea id="code" name="code">
+Select something from here. You'll see that the selection's foreground
+color changes to white! Since, by default, CodeMirror only puts an
+independent "marker" layer behind the text, you'll need something like
+this to change its colour.
+
+Also notice that turning this addon on (with the default style) allows
+you to safely give text a background color without screwing up the
+visibility of the selection.</textarea></form>
 
     <script>
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
   lineNumbers: true,
   styleSelectedText: true
 });
+editor.markText({line: 6, ch: 26}, {line: 6, ch: 42}, {className: "styled-background"});
 </script>
 
-    <p>Simple addon to easily mark (and style) selected text.</p>
+    <p>Simple addon to easily mark (and style) selected text. <a href="../doc/manual.html#addon_mark-selection">Docs</a>.</p>
 
   </article>
diff --git a/demo/requirejs.html b/demo/requirejs.html
@@ -0,0 +1,52 @@
+<!doctype html>
+
+<head>
+  <title>CodeMirror: HTML completion demo</title>
+  <meta charset="utf-8"/>
+  <link rel=stylesheet href="../doc/docs.css">
+
+  <link rel="stylesheet" href="../lib/codemirror.css">
+  <link rel="stylesheet" href="../addon/hint/show-hint.css">
+  <script src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.14/require.min.js"></script>
+  <style type="text/css">
+    .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
+  </style>
+</head>
+
+<body>
+  <div id=nav>
+    <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+    <ul>
+      <li><a href="../index.html">Home</a>
+      <li><a href="../doc/manual.html">Manual</a>
+      <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    </ul>
+    <ul>
+      <li><a class=active href="#">HTML completion</a>
+    </ul>
+  </div>
+
+  <article>
+    <h2>RequireJS module loading demo</h2>
+
+    <p>This demo does the same thing as
+    the <a href="html5complete.html">HTML5 completion demo</a>, but
+    loads its dependencies
+    with <a href="http://requirejs.org/">Require.js</a>, rather than
+    explicitly. Press <strong>ctrl-space</strong> to activate
+    completion.</p>
+
+    <div id="code"></div>
+
+    <script type="text/javascript">
+      require(["../lib/codemirror", "../mode/htmlmixed/htmlmixed",
+               "../addon/hint/show-hint", "../addon/hint/html-hint"], function(CodeMirror) {
+        editor = CodeMirror(document.getElementById("code"), {
+          mode: "text/html",
+          extraKeys: {"Ctrl-Space": "autocomplete"},
+          value: document.documentElement.innerHTML
+        });
+      });
+    </script>
+  </article>
+</body>
diff --git a/doc/compress.html b/doc/compress.html
@@ -36,6 +36,7 @@
       <input type="hidden" id="download" name="download" value="codemirror-compressed.js"/>
       <p>Version: <select id="version" onchange="setVersion(this);" style="padding: 1px;">
         <option value="http://codemirror.net/">HEAD</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.6.0;f=">4.6</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.5.0;f=">4.5</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.4.0;f=">4.4</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.3.0;f=">4.3</option>
@@ -131,6 +132,7 @@
           <option value="http://codemirror.net/mode/markdown/markdown.js">markdown.js</option>
           <option value="http://codemirror.net/mode/mirc/mirc.js">mirc.js</option>
           <option value="http://codemirror.net/mode/mllike/mllike.js">mllike.js</option>
+          <option value="http://codemirror.net/mode/modelica/modelica.js">modelica.js</option>
           <option value="http://codemirror.net/mode/nginx/nginx.js">nginx.js</option>
           <option value="http://codemirror.net/mode/ntriples/ntriples.js">ntriples.js</option>
           <option value="http://codemirror.net/mode/octave/octave.js">octave.js</option>