<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[188325] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/188325">188325</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2015-08-11 22:40:27 -0700 (Tue, 11 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Update to CodeMirror 5.5 or later
https://bugs.webkit.org/show_bug.cgi?id=147109
Reviewed by Timothy Hatcher.
Updated CodeMirror to version 5.5, as well as the extension files for CodeMirror
that are currently used in WebInspector.
* Localizations/en.lproj/localizedStrings.js:
* Tools/PrettyPrinting/FormatterDebug.js:
Added WebInspector namespace for formatters.
* Tools/PrettyPrinting/index.html:
Added WebInspector namespace for formatters.
* UserInterface/External/CodeMirror/LICENSE:
* UserInterface/External/CodeMirror/clojure.js:
* UserInterface/External/CodeMirror/closebrackets.js:
* UserInterface/External/CodeMirror/codemirror.css:
* UserInterface/External/CodeMirror/codemirror.js:
* UserInterface/External/CodeMirror/coffeescript.js:
* UserInterface/External/CodeMirror/comment.js:
* UserInterface/External/CodeMirror/css.js:
* UserInterface/External/CodeMirror/htmlmixed.js:
* UserInterface/External/CodeMirror/javascript.js:
* UserInterface/External/CodeMirror/livescript.js:
* UserInterface/External/CodeMirror/matchbrackets.js:
* UserInterface/External/CodeMirror/overlay.js:
* UserInterface/External/CodeMirror/sass.js:
* UserInterface/External/CodeMirror/searchcursor.js:
* UserInterface/External/CodeMirror/sql.js:
* UserInterface/External/CodeMirror/xml.js:
* UserInterface/Views/CodeMirrorFormatters.js:
Now uses the new token in CodeMirror for media query parenthesis.
* UserInterface/Views/CSSStyleDeclarationTextEditor.css:
(.css-style-text-editor > .CodeMirror pre):
Removed the additional vertical padding.
* UserInterface/Views/CSSStyleDeclarationTextEditor.js:
(WebInspector.CSSStyleDeclarationTextEditor.prototype._handleMouseDown):
(WebInspector.CSSStyleDeclarationTextEditor.prototype._handleMouseUp):
Clicking on the end of a line in a style will now correctly insert a new line.
* UserInterface/Views/ComputedStyleDetailsPanel.css:
(.details-section > .content > .group > .row .CodeMirror-code pre .go-to-arrow):
The go-to arrow now has the proper dimensions.
* UserInterface/Views/HoverMenu.css:
(.hover-menu > img):
* UserInterface/Views/SourceCodeTextEditor.css:
(.hover-menu.color > img):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIToolsPrettyPrintingFormatterDebugjs">trunk/Source/WebInspectorUI/Tools/PrettyPrinting/FormatterDebug.js</a></li>
<li><a href="#trunkSourceWebInspectorUIToolsPrettyPrintingindexhtml">trunk/Source/WebInspectorUI/Tools/PrettyPrinting/index.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorLICENSE">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorclojurejs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/clojure.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorclosebracketsjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/closebrackets.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorcodemirrorcss">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorcodemirrorjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorcoffeescriptjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/coffeescript.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorcommentjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/comment.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorcssjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/css.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorhtmlmixedjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/htmlmixed.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorjavascriptjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/javascript.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorlivescriptjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/livescript.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrormatchbracketsjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/matchbrackets.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirroroverlayjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/overlay.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorplaceholderjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/placeholder.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorrunmodejs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/runmode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorsassjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/sass.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorsearchcursorjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/searchcursor.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorsqljs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/sql.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorxmljs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/xml.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorcss">trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCodeMirrorFormattersjs">trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsComputedStyleDetailsPanelcss">trunk/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsHoverMenucss">trunk/Source/WebInspectorUI/UserInterface/Views/HoverMenu.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorcss">trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.css</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorLICENSE">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorclojurejs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/clojure.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorclosebracketsjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/closebrackets.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorcodemirrorcss">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorcodemirrorjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorcoffeescriptjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/coffeescript.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorcommentjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/comment.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorcssjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/css.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorhtmlmixedjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/htmlmixed.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorjavascriptjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/javascript.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorlivescriptjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/livescript.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrormatchbracketsjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/matchbrackets.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirroroverlayjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/overlay.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorplaceholderjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/placeholder.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorrunmodejs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/runmode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorsassjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/sass.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorsearchcursorjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/searchcursor.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorsqljs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/sql.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorxmljs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/xml.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2015-08-11 Devin Rousso <drousso@apple.com>
+
+ Web Inspector: Update to CodeMirror 5.5 or later
+ https://bugs.webkit.org/show_bug.cgi?id=147109
+
+ Reviewed by Timothy Hatcher.
+
+ Updated CodeMirror to version 5.5, as well as the extension files for CodeMirror
+ that are currently used in WebInspector.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * Tools/PrettyPrinting/FormatterDebug.js:
+ Added WebInspector namespace for formatters.
+
+ * Tools/PrettyPrinting/index.html:
+ Added WebInspector namespace for formatters.
+
+ * UserInterface/External/CodeMirror/LICENSE:
+ * UserInterface/External/CodeMirror/clojure.js:
+ * UserInterface/External/CodeMirror/closebrackets.js:
+ * UserInterface/External/CodeMirror/codemirror.css:
+ * UserInterface/External/CodeMirror/codemirror.js:
+ * UserInterface/External/CodeMirror/coffeescript.js:
+ * UserInterface/External/CodeMirror/comment.js:
+ * UserInterface/External/CodeMirror/css.js:
+ * UserInterface/External/CodeMirror/htmlmixed.js:
+ * UserInterface/External/CodeMirror/javascript.js:
+ * UserInterface/External/CodeMirror/livescript.js:
+ * UserInterface/External/CodeMirror/matchbrackets.js:
+ * UserInterface/External/CodeMirror/overlay.js:
+ * UserInterface/External/CodeMirror/sass.js:
+ * UserInterface/External/CodeMirror/searchcursor.js:
+ * UserInterface/External/CodeMirror/sql.js:
+ * UserInterface/External/CodeMirror/xml.js:
+ * UserInterface/Views/CodeMirrorFormatters.js:
+ Now uses the new token in CodeMirror for media query parenthesis.
+
+ * UserInterface/Views/CSSStyleDeclarationTextEditor.css:
+ (.css-style-text-editor > .CodeMirror pre):
+ Removed the additional vertical padding.
+
+ * UserInterface/Views/CSSStyleDeclarationTextEditor.js:
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._handleMouseDown):
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._handleMouseUp):
+ Clicking on the end of a line in a style will now correctly insert a new line.
+
+ * UserInterface/Views/ComputedStyleDetailsPanel.css:
+ (.details-section > .content > .group > .row .CodeMirror-code pre .go-to-arrow):
+ The go-to arrow now has the proper dimensions.
+
+ * UserInterface/Views/HoverMenu.css:
+ (.hover-menu > img):
+ * UserInterface/Views/SourceCodeTextEditor.css:
+ (.hover-menu.color > img):
+
</ins><span class="cx"> 2015-08-11 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Add the ability to filter out tasks in the Rendering Frames timeline
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -98,10 +98,15 @@
</span><span class="cx"> localizedStrings["Click Listener"] = "Click Listener";
</span><span class="cx"> localizedStrings["Click or press the spacebar to record."] = "Click or press the spacebar to record.";
</span><span class="cx"> localizedStrings["Click or press the spacebar to stop recording."] = "Click or press the spacebar to stop recording.";
</span><ins>+localizedStrings["Click to add a new rule."] = "Click to add a new rule.";
</ins><span class="cx"> localizedStrings["Click to close this tab"] = "Click to close this tab";
</span><del>-localizedStrings["Click to open a colorpicker. Shift-click to change color format."] = "Click to open a colorpicker. Shift-click to change color format.";
</del><ins>+localizedStrings["Click to disable the selected rule"] = "Click to disable the selected rule";
+localizedStrings["Click to enable the selected rule"] = "Click to enable the selected rule";
+localizedStrings["Click to link property values"] = "Click to link property values";
</ins><span class="cx"> localizedStrings["Click to open a cubic-bezier editor"] = "Click to open a cubic-bezier editor";
</span><ins>+localizedStrings["Click to remove link"] = "Click to remove link";
</ins><span class="cx"> localizedStrings["Click to restart the animation"] = "Click to restart the animation";
</span><ins>+localizedStrings["Click to select a color. Shift-click to switch color formats."] = "Click to select a color. Shift-click to switch color formats.";
</ins><span class="cx"> localizedStrings["Clickable"] = "Clickable";
</span><span class="cx"> localizedStrings["Close"] = "Close";
</span><span class="cx"> localizedStrings["Close %s timeline view"] = "Close %s timeline view";
</span><span class="lines">@@ -215,6 +220,8 @@
</span><span class="cx"> localizedStrings["Encoded"] = "Encoded";
</span><span class="cx"> localizedStrings["Encoding"] = "Encoding";
</span><span class="cx"> localizedStrings["End Capturing"] = "End Capturing";
</span><ins>+localizedStrings["Enter a URL"] = "Enter a URL";
+localizedStrings["Enter a name."] = "Enter a name.";
</ins><span class="cx"> localizedStrings["Error: "] = "Error: ";
</span><span class="cx"> localizedStrings["Errors"] = "Errors";
</span><span class="cx"> localizedStrings["Evaluate JavaScript"] = "Evaluate JavaScript";
</span><span class="lines">@@ -281,6 +288,7 @@
</span><span class="cx"> localizedStrings["Indexed Databases"] = "Indexed Databases";
</span><span class="cx"> localizedStrings["Info: "] = "Info: ";
</span><span class="cx"> localizedStrings["Inherited From: "] = "Inherited From: ";
</span><ins>+localizedStrings["Inherited from %s"] = "Inherited from %s";
</ins><span class="cx"> localizedStrings["Initiator"] = "Initiator";
</span><span class="cx"> localizedStrings["Input: "] = "Input: ";
</span><span class="cx"> localizedStrings["Invalid"] = "Invalid";
</span><span class="lines">@@ -350,12 +358,15 @@
</span><span class="cx"> localizedStrings["No Response Headers"] = "No Response Headers";
</span><span class="cx"> localizedStrings["No Results Found"] = "No Results Found";
</span><span class="cx"> localizedStrings["No Search Results"] = "No Search Results";
</span><ins>+localizedStrings["No Units"] = "No Units";
</ins><span class="cx"> localizedStrings["No exact ARIA role match."] = "No exact ARIA role match.";
</span><span class="cx"> localizedStrings["No message"] = "No message";
</span><span class="cx"> localizedStrings["No properties."] = "No properties.";
</span><span class="cx"> localizedStrings["Node"] = "Node";
</span><span class="cx"> localizedStrings["Not found"] = "Not found";
</span><span class="cx"> localizedStrings["Online"] = "Online";
</span><ins>+localizedStrings["Option-click to show all units"] = "Option-click to show all units";
+localizedStrings["Option-click to show all values"] = "Option-click to show all values";
</ins><span class="cx"> localizedStrings["Options"] = "Options";
</span><span class="cx"> localizedStrings["Original"] = "Original";
</span><span class="cx"> localizedStrings["Original formatting"] = "Original formatting";
</span><span class="lines">@@ -410,6 +421,7 @@
</span><span class="cx"> localizedStrings["Request Data"] = "Request Data";
</span><span class="cx"> localizedStrings["Request Headers"] = "Request Headers";
</span><span class="cx"> localizedStrings["Required"] = "Required";
</span><ins>+localizedStrings["Reset"] = "Reset";
</ins><span class="cx"> localizedStrings["Resource"] = "Resource";
</span><span class="cx"> localizedStrings["Resource Type"] = "Resource Type";
</span><span class="cx"> localizedStrings["Resources"] = "Resources";
</span><span class="lines">@@ -478,11 +490,11 @@
</span><span class="cx"> localizedStrings["Storage"] = "Storage";
</span><span class="cx"> localizedStrings["Style"] = "Style";
</span><span class="cx"> localizedStrings["Style Attribute"] = "Style Attribute";
</span><ins>+localizedStrings["Style Rules"] = "Style Rules";
</ins><span class="cx"> localizedStrings["Styles"] = "Styles";
</span><span class="cx"> localizedStrings["Styles Invalidated"] = "Styles Invalidated";
</span><span class="cx"> localizedStrings["Styles Recalculated"] = "Styles Recalculated";
</span><span class="cx"> localizedStrings["Styles \u2014 Computed"] = "Styles \u2014 Computed";
</span><del>-localizedStrings["Styles \u2014 Metrics"] = "Styles \u2014 Metrics";
</del><span class="cx"> localizedStrings["Styles \u2014 Rules"] = "Styles \u2014 Rules";
</span><span class="cx"> localizedStrings["Stylesheet"] = "Stylesheet";
</span><span class="cx"> localizedStrings["Stylesheets"] = "Stylesheets";
</span><span class="lines">@@ -496,6 +508,7 @@
</span><span class="cx"> localizedStrings["The value '%s' is not supported for this property.\nClick to delete and open autocomplete."] = "The value '%s' is not supported for this property.\nClick to delete and open autocomplete.";
</span><span class="cx"> localizedStrings["The value '%s' needs units.\nClick to add 'px' to the value."] = "The value '%s' needs units.\nClick to add 'px' to the value.";
</span><span class="cx"> localizedStrings["The %s \ntable is empty."] = "The %s \ntable is empty.";
</span><ins>+localizedStrings["This Element"] = "This Element";
</ins><span class="cx"> localizedStrings["This property needs a value.\nClick to open autocomplete."] = "This property needs a value.\nClick to open autocomplete.";
</span><span class="cx"> localizedStrings["Time until the load event fired, click to show the Network Requests timeline"] = "Time until the load event fired, click to show the Network Requests timeline";
</span><span class="cx"> localizedStrings["Timeline Events"] = "Timeline Events";
</span><span class="lines">@@ -516,6 +529,7 @@
</span><span class="cx"> localizedStrings["Type Issue"] = "Type Issue";
</span><span class="cx"> localizedStrings["Type information for variable: %s"] = "Type information for variable: %s";
</span><span class="cx"> localizedStrings["Unable to determine path to property from root"] = "Unable to determine path to property from root";
</span><ins>+localizedStrings["Unchanged"] = "Unchanged";
</ins><span class="cx"> localizedStrings["Uncomment All Properties"] = "Uncomment All Properties";
</span><span class="cx"> localizedStrings["Unknown node"] = "Unknown node";
</span><span class="cx"> localizedStrings["Untitled"] = "Untitled";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIToolsPrettyPrintingFormatterDebugjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Tools/PrettyPrinting/FormatterDebug.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Tools/PrettyPrinting/FormatterDebug.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/Tools/PrettyPrinting/FormatterDebug.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-Formatter.prototype.debug = function(from, to)
</del><ins>+WebInspector.Formatter.prototype.debug = function(from, to)
</ins><span class="cx"> {
</span><span class="cx"> var debug = "";
</span><span class="cx"> var outerMode = this._codeMirror.getMode();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIToolsPrettyPrintingindexhtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Tools/PrettyPrinting/index.html (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Tools/PrettyPrinting/index.html 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/Tools/PrettyPrinting/index.html 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -210,8 +210,8 @@
</span><span class="cx"> var originalLineEndings = [];
</span><span class="cx"> var formattedLineEndings = [];
</span><span class="cx"> var mapping = {original: [0], formatted: [0]};
</span><del>- var builder = new FormatterContentBuilder(mapping, originalLineEndings, formattedLineEndings, 0, 0, indentString);
- var formatter = new Formatter(cm, builder);
</del><ins>+ var builder = new WebInspector.FormatterContentBuilder(mapping, originalLineEndings, formattedLineEndings, 0, 0, indentString);
+ var formatter = new WebInspector.Formatter(cm, builder);
</ins><span class="cx">
</span><span class="cx"> // Time the formatter.
</span><span class="cx"> var startTime = Date.now();
</span><span class="lines">@@ -332,8 +332,8 @@
</span><span class="cx"> var originalLineEndings = [];
</span><span class="cx"> var formattedLineEndings = [];
</span><span class="cx"> var mapping = {original: [0], formatted: [0]};
</span><del>- var builder = new FormatterContentBuilder(mapping, originalLineEndings, formattedLineEndings, 0, 0, indentString);
- var formatter = new Formatter(editor, builder);
</del><ins>+ var builder = new WebInspector.FormatterContentBuilder(mapping, originalLineEndings, formattedLineEndings, 0, 0, indentString);
+ var formatter = new WebInspector.Formatter(editor, builder);
</ins><span class="cx"> formatter.format(start, end);
</span><span class="cx">
</span><span class="cx"> // Compare results.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorLICENSE"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-Copyright (C) 2013 by Marijn Haverbeke <marijnh@gmail.com>
</del><ins>+Copyright (C) 2015 by Marijn Haverbeke <marijnh@gmail.com> and others
</ins><span class="cx">
</span><span class="cx"> Permission is hereby granted, free of charge, to any person obtaining a copy
</span><span class="cx"> of this software and associated documentation files (the "Software"), to deal
</span><span class="lines">@@ -17,7 +17,3 @@
</span><span class="cx"> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
</span><span class="cx"> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
</span><span class="cx"> THE SOFTWARE.
</span><del>-
-Please note that some subdirectories of the CodeMirror distribution
-include their own LICENSE files, and are released under different
-licences.
</del><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorclojurejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/clojure.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/clojure.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/clojure.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">
</span><span class="cx"> CodeMirror.defineMode("clojure", function (options) {
</span><span class="cx"> var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", CHARACTER = "string-2",
</span><del>- ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword";
</del><ins>+ ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword", VAR = "variable";
</ins><span class="cx"> var INDENT_WORD_SKIP = options.indentUnit || 2;
</span><span class="cx"> var NORMAL_INDENT_UNIT = options.indentUnit || 2;
</span><span class="cx">
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> sign: /[+-]/,
</span><span class="cx"> exponent: /e/i,
</span><span class="cx"> keyword_char: /[^\s\(\[\;\)\]]/,
</span><del>- symbol: /[\w*+!\-\._?:<>\/]/
</del><ins>+ symbol: /[\w*+!\-\._?:<>\/\xa1-\uffff]/
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function stateStack(indent, type, prev) { // represents a state stack object
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> var first = stream.next();
</span><span class="cx"> // Read special literals: backspace, newline, space, return.
</span><span class="cx"> // Just read all lowercase letters.
</span><del>- if (first.match(/[a-z]/) && stream.match(/[a-z]+/, true)) {
</del><ins>+ if (first && first.match(/[a-z]/) && stream.match(/[a-z]+/, true)) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> // Read unicode character: \u1000 \uA0a1
</span><span class="lines">@@ -220,7 +220,9 @@
</span><span class="cx"> returnType = BUILTIN;
</span><span class="cx"> } else if (atoms && atoms.propertyIsEnumerable(stream.current())) {
</span><span class="cx"> returnType = ATOM;
</span><del>- } else returnType = null;
</del><ins>+ } else {
+ returnType = VAR;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -232,6 +234,7 @@
</span><span class="cx"> return state.indentStack.indent;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ closeBrackets: {pairs: "()[]{}\"\""},
</ins><span class="cx"> lineComment: ";;"
</span><span class="cx"> };
</span><span class="cx"> });
</span><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/clojure.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorclosebracketsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/closebrackets.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/closebrackets.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/closebrackets.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -9,135 +9,177 @@
</span><span class="cx"> else // Plain browser env
</span><span class="cx"> mod(CodeMirror);
</span><span class="cx"> })(function(CodeMirror) {
</span><del>- var DEFAULT_BRACKETS = "()[]{}''\"\"";
- var DEFAULT_EXPLODE_ON_ENTER = "[]{}";
- var SPACE_CHAR_REGEX = /\s/;
</del><ins>+ var defaults = {
+ pairs: "()[]{}''\"\"",
+ triples: "",
+ explode: "[]{}"
+ };
</ins><span class="cx">
</span><span class="cx"> var Pos = CodeMirror.Pos;
</span><span class="cx">
</span><span class="cx"> CodeMirror.defineOption("autoCloseBrackets", false, function(cm, val, old) {
</span><del>- if (old != CodeMirror.Init && old)
- cm.removeKeyMap("autoCloseBrackets");
- if (!val) return;
- var pairs = DEFAULT_BRACKETS, explode = DEFAULT_EXPLODE_ON_ENTER;
- if (typeof val == "string") pairs = val;
- else if (typeof val == "object") {
- if (val.pairs != null) pairs = val.pairs;
- if (val.explode != null) explode = val.explode;
</del><ins>+ if (old && old != CodeMirror.Init) {
+ cm.removeKeyMap(keyMap);
+ cm.state.closeBrackets = null;
</ins><span class="cx"> }
</span><del>- var map = buildKeymap(pairs);
- if (explode) map.Enter = buildExplodeHandler(explode);
- cm.addKeyMap(map);
</del><ins>+ if (val) {
+ cm.state.closeBrackets = val;
+ cm.addKeyMap(keyMap);
+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- function charsAround(cm, pos) {
- var str = cm.getRange(Pos(pos.line, pos.ch - 1),
- Pos(pos.line, pos.ch + 1));
- return str.length == 2 ? str : null;
</del><ins>+ function getOption(conf, name) {
+ if (name == "pairs" && typeof conf == "string") return conf;
+ if (typeof conf == "object" && conf[name] != null) return conf[name];
+ return defaults[name];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function buildKeymap(pairs) {
- var map = {
- name : "autoCloseBrackets",
- Backspace: function(cm) {
- if (cm.getOption("disableInput")) return CodeMirror.Pass;
- var ranges = cm.listSelections();
- for (var i = 0; i < ranges.length; i++) {
- if (!ranges[i].empty()) return CodeMirror.Pass;
- var around = charsAround(cm, ranges[i].head);
- if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
- }
- for (var i = ranges.length - 1; i >= 0; i--) {
- var cur = ranges[i].head;
- cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1));
- }
- }
- };
- var closingBrackets = "";
- for (var i = 0; i < pairs.length; i += 2) (function(left, right) {
- if (left != right) closingBrackets += right;
- map["'" + left + "'"] = function(cm) {
- if (cm.getOption("disableInput")) return CodeMirror.Pass;
- var ranges = cm.listSelections(), type, next;
- for (var i = 0; i < ranges.length; i++) {
- var range = ranges[i], cur = range.head, curType;
- if (left == "'" && cm.getTokenTypeAt(cur) == "comment")
- return CodeMirror.Pass;
- var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
- if (!range.empty())
- curType = "surround";
- else if (left == right && next == right) {
- if (cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == left + left + left)
- curType = "skipThree";
- else
- curType = "skip";
- } else if (left == right && cur.ch > 1 &&
- cm.getRange(Pos(cur.line, cur.ch - 2), cur) == left + left &&
- (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != left))
- curType = "addFour";
- else if (left == right && CodeMirror.isWordChar(next))
- return CodeMirror.Pass;
- else if (cm.getLine(cur.line).length == cur.ch || closingBrackets.indexOf(next) >= 0 || SPACE_CHAR_REGEX.test(next))
- curType = "both";
- else
- return CodeMirror.Pass;
- if (!type) type = curType;
- else if (type != curType) return CodeMirror.Pass;
- }
</del><ins>+ var bind = defaults.pairs + "`";
+ var keyMap = {Backspace: handleBackspace, Enter: handleEnter};
+ for (var i = 0; i < bind.length; i++)
+ keyMap["'" + bind.charAt(i) + "'"] = handler(bind.charAt(i));
</ins><span class="cx">
</span><del>- cm.operation(function() {
- if (type == "skip") {
- cm.execCommand("goCharRight");
- } else if (type == "skipThree") {
- for (var i = 0; i < 3; i++)
- cm.execCommand("goCharRight");
- } else if (type == "surround") {
- var sels = cm.getSelections();
- for (var i = 0; i < sels.length; i++)
- sels[i] = left + sels[i] + right;
- cm.replaceSelections(sels, "around");
- } else if (type == "both") {
- cm.replaceSelection(left + right, null);
- cm.execCommand("goCharLeft");
- } else if (type == "addFour") {
- cm.replaceSelection(left + left + left + left, "before");
- cm.execCommand("goCharRight");
- }
- });
- };
- if (left != right) map["'" + right + "'"] = function(cm) {
- var ranges = cm.listSelections();
- for (var i = 0; i < ranges.length; i++) {
- var range = ranges[i];
- if (!range.empty() ||
- cm.getRange(range.head, Pos(range.head.line, range.head.ch + 1)) != right)
- return CodeMirror.Pass;
- }
- cm.execCommand("goCharRight");
- };
- })(pairs.charAt(i), pairs.charAt(i + 1));
- return map;
</del><ins>+ function handler(ch) {
+ return function(cm) { return handleChar(cm, ch); };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function buildExplodeHandler(pairs) {
- return function(cm) {
- if (cm.getOption("disableInput")) return CodeMirror.Pass;
- var ranges = cm.listSelections();
</del><ins>+ function getConfig(cm) {
+ var deflt = cm.state.closeBrackets;
+ if (!deflt) return null;
+ var mode = cm.getModeAt(cm.getCursor());
+ return mode.closeBrackets || deflt;
+ }
+
+ function handleBackspace(cm) {
+ var conf = getConfig(cm);
+ if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+ var pairs = getOption(conf, "pairs");
+ var ranges = cm.listSelections();
+ for (var i = 0; i < ranges.length; i++) {
+ if (!ranges[i].empty()) return CodeMirror.Pass;
+ var around = charsAround(cm, ranges[i].head);
+ if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+ }
+ for (var i = ranges.length - 1; i >= 0; i--) {
+ var cur = ranges[i].head;
+ cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1));
+ }
+ }
+
+ function handleEnter(cm) {
+ var conf = getConfig(cm);
+ var explode = conf && getOption(conf, "explode");
+ if (!explode || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+ var ranges = cm.listSelections();
+ for (var i = 0; i < ranges.length; i++) {
+ if (!ranges[i].empty()) return CodeMirror.Pass;
+ var around = charsAround(cm, ranges[i].head);
+ if (!around || explode.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+ }
+ cm.operation(function() {
+ cm.replaceSelection("\n\n", null);
+ cm.execCommand("goCharLeft");
+ ranges = cm.listSelections();
</ins><span class="cx"> for (var i = 0; i < ranges.length; i++) {
</span><del>- if (!ranges[i].empty()) return CodeMirror.Pass;
- var around = charsAround(cm, ranges[i].head);
- if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
</del><ins>+ var line = ranges[i].head.line;
+ cm.indentLine(line, null, true);
+ cm.indentLine(line + 1, null, true);
</ins><span class="cx"> }
</span><del>- cm.operation(function() {
- cm.replaceSelection("\n\n", null);
</del><ins>+ });
+ }
+
+ function handleChar(cm, ch) {
+ var conf = getConfig(cm);
+ if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+ var pairs = getOption(conf, "pairs");
+ var pos = pairs.indexOf(ch);
+ if (pos == -1) return CodeMirror.Pass;
+ var triples = getOption(conf, "triples");
+
+ var identical = pairs.charAt(pos + 1) == ch;
+ var ranges = cm.listSelections();
+ var opening = pos % 2 == 0;
+
+ var type, next;
+ for (var i = 0; i < ranges.length; i++) {
+ var range = ranges[i], cur = range.head, curType;
+ var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
+ if (opening && !range.empty()) {
+ curType = "surround";
+ } else if ((identical || !opening) && next == ch) {
+ if (triples.indexOf(ch) >= 0 && cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == ch + ch + ch)
+ curType = "skipThree";
+ else
+ curType = "skip";
+ } else if (identical && cur.ch > 1 && triples.indexOf(ch) >= 0 &&
+ cm.getRange(Pos(cur.line, cur.ch - 2), cur) == ch + ch &&
+ (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != ch)) {
+ curType = "addFour";
+ } else if (identical) {
+ if (!CodeMirror.isWordChar(next) && enteringString(cm, cur, ch)) curType = "both";
+ else return CodeMirror.Pass;
+ } else if (opening && (cm.getLine(cur.line).length == cur.ch ||
+ isClosingBracket(next, pairs) ||
+ /\s/.test(next))) {
+ curType = "both";
+ } else {
+ return CodeMirror.Pass;
+ }
+ if (!type) type = curType;
+ else if (type != curType) return CodeMirror.Pass;
+ }
+
+ var left = pos % 2 ? pairs.charAt(pos - 1) : ch;
+ var right = pos % 2 ? ch : pairs.charAt(pos + 1);
+ cm.operation(function() {
+ if (type == "skip") {
+ cm.execCommand("goCharRight");
+ } else if (type == "skipThree") {
+ for (var i = 0; i < 3; i++)
+ cm.execCommand("goCharRight");
+ } else if (type == "surround") {
+ var sels = cm.getSelections();
+ for (var i = 0; i < sels.length; i++)
+ sels[i] = left + sels[i] + right;
+ cm.replaceSelections(sels, "around");
+ } else if (type == "both") {
+ cm.replaceSelection(left + right, null);
+ cm.triggerElectric(left + right);
</ins><span class="cx"> cm.execCommand("goCharLeft");
</span><del>- ranges = cm.listSelections();
- for (var i = 0; i < ranges.length; i++) {
- var line = ranges[i].head.line;
- cm.indentLine(line, null, true);
- cm.indentLine(line + 1, null, true);
- }
- });
- };
</del><ins>+ } else if (type == "addFour") {
+ cm.replaceSelection(left + left + left + left, "before");
+ cm.execCommand("goCharRight");
+ }
+ });
</ins><span class="cx"> }
</span><ins>+
+ function isClosingBracket(ch, pairs) {
+ var pos = pairs.lastIndexOf(ch);
+ return pos > -1 && pos % 2 == 1;
+ }
+
+ function charsAround(cm, pos) {
+ var str = cm.getRange(Pos(pos.line, pos.ch - 1),
+ Pos(pos.line, pos.ch + 1));
+ return str.length == 2 ? str : null;
+ }
+
+ // Project the token type that will exists after the given char is
+ // typed, and use it to determine whether it would cause the start
+ // of a string token.
+ function enteringString(cm, pos, ch) {
+ var line = cm.getLine(pos.line);
+ var token = cm.getTokenAt(pos);
+ if (/\bstring2?\b/.test(token.type)) return false;
+ var stream = new CodeMirror.StringStream(line.slice(0, pos.ch) + ch + line.slice(pos.ch), 4);
+ stream.pos = stream.start = token.start;
+ for (;;) {
+ var type1 = cm.getMode().token(stream, token.state);
+ if (stream.pos >= pos.ch + 1) return /\bstring2?\b/.test(type1);
+ stream.start = stream.pos;
+ }
+ }
</ins><span class="cx"> });
</span><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/closebrackets.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorcodemirrorcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.css (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.css 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.css 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -4,11 +4,8 @@
</span><span class="cx"> /* Set height, width, borders, and global font properties here */
</span><span class="cx"> font-family: monospace;
</span><span class="cx"> height: 300px;
</span><ins>+ color: black;
</ins><span class="cx"> }
</span><del>-.CodeMirror-scroll {
- /* Set scrolling behaviour here */
- overflow: auto;
-}
</del><span class="cx">
</span><span class="cx"> /* PADDING */
</span><span class="cx">
</span><span class="lines">@@ -36,28 +33,60 @@
</span><span class="cx"> min-width: 20px;
</span><span class="cx"> text-align: right;
</span><span class="cx"> color: #999;
</span><del>- -moz-box-sizing: content-box;
- box-sizing: content-box;
</del><ins>+ white-space: nowrap;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.CodeMirror-guttermarker { color: black; }
+.CodeMirror-guttermarker-subtle { color: #999; }
+
</ins><span class="cx"> /* CURSOR */
</span><span class="cx">
</span><del>-.CodeMirror div.CodeMirror-cursor {
</del><ins>+.CodeMirror-cursor {
</ins><span class="cx"> border-left: 1px solid black;
</span><ins>+ border-right: none;
+ width: 0;
</ins><span class="cx"> }
</span><span class="cx"> /* Shown when moving in bi-directional text */
</span><span class="cx"> .CodeMirror div.CodeMirror-secondarycursor {
</span><span class="cx"> border-left: 1px solid silver;
</span><span class="cx"> }
</span><del>-.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
</del><ins>+.cm-fat-cursor .CodeMirror-cursor {
</ins><span class="cx"> width: auto;
</span><span class="cx"> border: 0;
</span><span class="cx"> background: #7e7;
</span><span class="cx"> }
</span><ins>+.cm-fat-cursor div.CodeMirror-cursors {
+ z-index: 1;
+}
+
+.cm-animate-fat-cursor {
+ width: auto;
+ border: 0;
+ -webkit-animation: blink 1.06s steps(1) infinite;
+ -moz-animation: blink 1.06s steps(1) infinite;
+ animation: blink 1.06s steps(1) infinite;
+ background-color: #7e7;
+}
+@-moz-keyframes blink {
+ 0% {}
+ 50% { background-color: transparent; }
+ 100% {}
+}
+@-webkit-keyframes blink {
+ 0% {}
+ 50% { background-color: transparent; }
+ 100% {}
+}
+@keyframes blink {
+ 0% {}
+ 50% { background-color: transparent; }
+ 100% {}
+}
+
</ins><span class="cx"> /* Can style cursor different in overwrite (non-insert) mode */
</span><del>-div.CodeMirror-overwrite div.CodeMirror-cursor {}
</del><ins>+.CodeMirror-overwrite .CodeMirror-cursor {}
</ins><span class="cx">
</span><del>-.cm-tab { display: inline-block; }
</del><ins>+.cm-tab { display: inline-block; text-decoration: inherit; }
</ins><span class="cx">
</span><span class="cx"> .CodeMirror-ruler {
</span><span class="cx"> border-left: 1px solid #ccc;
</span><span class="lines">@@ -66,6 +95,15 @@
</span><span class="cx">
</span><span class="cx"> /* DEFAULT THEME */
</span><span class="cx">
</span><ins>+.cm-s-default .cm-header {color: blue;}
+.cm-s-default .cm-quote {color: #090;}
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
+
</ins><span class="cx"> .cm-s-default .cm-keyword {color: #708;}
</span><span class="cx"> .cm-s-default .cm-atom {color: #219;}
</span><span class="cx"> .cm-s-default .cm-number {color: #164;}
</span><span class="lines">@@ -85,22 +123,19 @@
</span><span class="cx"> .cm-s-default .cm-bracket {color: #997;}
</span><span class="cx"> .cm-s-default .cm-tag {color: #170;}
</span><span class="cx"> .cm-s-default .cm-attribute {color: #00c;}
</span><del>-.cm-s-default .cm-header {color: blue;}
-.cm-s-default .cm-quote {color: #090;}
</del><span class="cx"> .cm-s-default .cm-hr {color: #999;}
</span><span class="cx"> .cm-s-default .cm-link {color: #00c;}
</span><span class="cx">
</span><del>-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-
</del><span class="cx"> .cm-s-default .cm-error {color: #f00;}
</span><span class="cx"> .cm-invalidchar {color: #f00;}
</span><span class="cx">
</span><ins>+.CodeMirror-composing { border-bottom: 2px solid; }
+
+/* Default styles for common addons */
+
</ins><span class="cx"> div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
</span><span class="cx"> div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
</span><ins>+.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
</ins><span class="cx"> .CodeMirror-activeline-background {background: #e8f2ff;}
</span><span class="cx">
</span><span class="cx"> /* STOP */
</span><span class="lines">@@ -109,14 +144,13 @@
</span><span class="cx"> the editor. You probably shouldn't touch them. */
</span><span class="cx">
</span><span class="cx"> .CodeMirror {
</span><del>- line-height: 1;
</del><span class="cx"> position: relative;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> background: white;
</span><del>- color: black;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .CodeMirror-scroll {
</span><ins>+ overflow: scroll !important; /* Things will break if this is overridden */
</ins><span class="cx"> /* 30px is the magic margin used to hide the element's real scrollbars */
</span><span class="cx"> /* See overflow: hidden in .CodeMirror */
</span><span class="cx"> margin-bottom: -30px; margin-right: -30px;
</span><span class="lines">@@ -124,14 +158,10 @@
</span><span class="cx"> height: 100%;
</span><span class="cx"> outline: none; /* Prevent dragging from highlighting the element */
</span><span class="cx"> position: relative;
</span><del>- -moz-box-sizing: content-box;
- box-sizing: content-box;
</del><span class="cx"> }
</span><span class="cx"> .CodeMirror-sizer {
</span><span class="cx"> position: relative;
</span><span class="cx"> border-right: 30px solid transparent;
</span><del>- -moz-box-sizing: content-box;
- box-sizing: content-box;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* The fake, visible scrollbars. Used to force redraw during scrolling
</span><span class="lines">@@ -161,29 +191,42 @@
</span><span class="cx">
</span><span class="cx"> .CodeMirror-gutters {
</span><span class="cx"> position: absolute; left: 0; top: 0;
</span><del>- padding-bottom: 30px;
</del><span class="cx"> z-index: 3;
</span><span class="cx"> }
</span><span class="cx"> .CodeMirror-gutter {
</span><span class="cx"> white-space: normal;
</span><span class="cx"> height: 100%;
</span><del>- -moz-box-sizing: content-box;
- box-sizing: content-box;
- padding-bottom: 30px;
- margin-bottom: -32px;
</del><span class="cx"> display: inline-block;
</span><ins>+ margin-bottom: -30px;
</ins><span class="cx"> /* Hack to make IE7 behave */
</span><span class="cx"> *zoom:1;
</span><span class="cx"> *display:inline;
</span><span class="cx"> }
</span><ins>+.CodeMirror-gutter-wrapper {
+ position: absolute;
+ z-index: 4;
+ background: none !important;
+ border: none !important;
+}
+.CodeMirror-gutter-background {
+ position: absolute;
+ top: 0; bottom: 0;
+ z-index: 4;
+}
</ins><span class="cx"> .CodeMirror-gutter-elt {
</span><span class="cx"> position: absolute;
</span><span class="cx"> cursor: default;
</span><span class="cx"> z-index: 4;
</span><span class="cx"> }
</span><ins>+.CodeMirror-gutter-wrapper {
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ user-select: none;
+}
</ins><span class="cx">
</span><span class="cx"> .CodeMirror-lines {
</span><span class="cx"> cursor: text;
</span><ins>+ min-height: 1px; /* prevents collapsing before first draw */
</ins><span class="cx"> }
</span><span class="cx"> .CodeMirror pre {
</span><span class="cx"> /* Reset some styles that the rest of the page might have set */
</span><span class="lines">@@ -200,6 +243,7 @@
</span><span class="cx"> z-index: 2;
</span><span class="cx"> position: relative;
</span><span class="cx"> overflow: visible;
</span><ins>+ -webkit-tap-highlight-color: transparent;
</ins><span class="cx"> }
</span><span class="cx"> .CodeMirror-wrap pre {
</span><span class="cx"> word-wrap: break-word;
</span><span class="lines">@@ -221,10 +265,20 @@
</span><span class="cx">
</span><span class="cx"> .CodeMirror-widget {}
</span><span class="cx">
</span><del>-.CodeMirror-wrap .CodeMirror-scroll {
- overflow-x: hidden;
</del><ins>+.CodeMirror-code {
+ outline: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/* Force content-box sizing for the elements where we expect it */
+.CodeMirror-scroll,
+.CodeMirror-sizer,
+.CodeMirror-gutter,
+.CodeMirror-gutters,
+.CodeMirror-linenumber {
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
+}
+
</ins><span class="cx"> .CodeMirror-measure {
</span><span class="cx"> position: absolute;
</span><span class="cx"> width: 100%;
</span><span class="lines">@@ -232,19 +286,19 @@
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> visibility: hidden;
</span><span class="cx"> }
</span><ins>+
+.CodeMirror-cursor { position: absolute; }
</ins><span class="cx"> .CodeMirror-measure pre { position: static; }
</span><span class="cx">
</span><del>-.CodeMirror div.CodeMirror-cursor {
- position: absolute;
- border-right: none;
- width: 0;
-}
-
</del><span class="cx"> div.CodeMirror-cursors {
</span><span class="cx"> visibility: hidden;
</span><span class="cx"> position: relative;
</span><del>- z-index: 1;
</del><ins>+ z-index: 3;
</ins><span class="cx"> }
</span><ins>+div.CodeMirror-dragcursors {
+ visibility: visible;
+}
+
</ins><span class="cx"> .CodeMirror-focused div.CodeMirror-cursors {
</span><span class="cx"> visibility: visible;
</span><span class="cx"> }
</span><span class="lines">@@ -252,6 +306,8 @@
</span><span class="cx"> .CodeMirror-selected { background: #d9d9d9; }
</span><span class="cx"> .CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
</span><span class="cx"> .CodeMirror-crosshair { cursor: crosshair; }
</span><ins>+.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
+.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
</ins><span class="cx">
</span><span class="cx"> .cm-searching {
</span><span class="cx"> background: #ffa;
</span><span class="lines">@@ -270,3 +326,9 @@
</span><span class="cx"> visibility: hidden;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+/* See issue #2901 */
+.cm-tab-wrap-hack:after { content: ''; }
+
+/* Help users use markselection to safely style text background */
+span.CodeMirror-selectedtext { background: none; }
</ins><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.css
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorcodemirrorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -23,19 +23,15 @@
</span><span class="cx"> // detected are enabled based on userAgent etc sniffing.
</span><span class="cx">
</span><span class="cx"> var gecko = /gecko\/\d/i.test(navigator.userAgent);
</span><del>- // ie_uptoN means Internet Explorer version N or lower
</del><span class="cx"> var ie_upto10 = /MSIE \d/.test(navigator.userAgent);
</span><del>- var ie_upto7 = ie_upto10 && (document.documentMode == null || document.documentMode < 8);
- var ie_upto8 = ie_upto10 && (document.documentMode == null || document.documentMode < 9);
- var ie_upto9 = ie_upto10 && (document.documentMode == null || document.documentMode < 10);
- var ie_11up = /Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent);
</del><ins>+ var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(navigator.userAgent);
</ins><span class="cx"> var ie = ie_upto10 || ie_11up;
</span><ins>+ var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1]);
</ins><span class="cx"> var webkit = /WebKit\//.test(navigator.userAgent);
</span><span class="cx"> var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(navigator.userAgent);
</span><span class="cx"> var chrome = /Chrome\//.test(navigator.userAgent);
</span><span class="cx"> var presto = /Opera\//.test(navigator.userAgent);
</span><span class="cx"> var safari = /Apple Computer/.test(navigator.vendor);
</span><del>- var khtml = /KHTML\//.test(navigator.userAgent);
</del><span class="cx"> var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent);
</span><span class="cx"> var phantom = /PhantomJS/.test(navigator.userAgent);
</span><span class="cx">
</span><span class="lines">@@ -50,7 +46,7 @@
</span><span class="cx"> if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
</span><span class="cx"> // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
</span><span class="cx"> var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11));
</span><del>- var captureRightClick = gecko || (ie && !ie_upto8);
</del><ins>+ var captureRightClick = gecko || (ie && ie_version >= 9);
</ins><span class="cx">
</span><span class="cx"> // Optimize some code when these features are not used.
</span><span class="cx"> var sawReadOnlySpans = false, sawCollapsedSpans = false;
</span><span class="lines">@@ -63,55 +59,70 @@
</span><span class="cx"> function CodeMirror(place, options) {
</span><span class="cx"> if (!(this instanceof CodeMirror)) return new CodeMirror(place, options);
</span><span class="cx">
</span><del>- this.options = options = options || {};
</del><ins>+ this.options = options = options ? copyObj(options) : {};
</ins><span class="cx"> // Determine effective options based on given values and defaults.
</span><span class="cx"> copyObj(defaults, options, false);
</span><span class="cx"> setGuttersForLineNumbers(options);
</span><span class="cx">
</span><span class="cx"> var doc = options.value;
</span><del>- if (typeof doc == "string") doc = new Doc(doc, options.mode);
</del><ins>+ if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator);
</ins><span class="cx"> this.doc = doc;
</span><span class="cx">
</span><del>- var display = this.display = new Display(place, doc);
</del><ins>+ var input = new CodeMirror.inputStyles[options.inputStyle](this);
+ var display = this.display = new Display(place, doc, input);
</ins><span class="cx"> display.wrapper.CodeMirror = this;
</span><span class="cx"> updateGutters(this);
</span><span class="cx"> themeChanged(this);
</span><span class="cx"> if (options.lineWrapping)
</span><span class="cx"> this.display.wrapper.className += " CodeMirror-wrap";
</span><del>- if (options.autofocus && !mobile) focusInput(this);
</del><ins>+ if (options.autofocus && !mobile) display.input.focus();
+ initScrollbars(this);
</ins><span class="cx">
</span><span class="cx"> this.state = {
</span><span class="cx"> keyMaps: [], // stores maps added by addKeyMap
</span><span class="cx"> overlays: [], // highlighting overlays, as added by addOverlay
</span><span class="cx"> modeGen: 0, // bumped when mode/overlay changes, used to invalidate highlighting info
</span><del>- overwrite: false, focused: false,
</del><ins>+ overwrite: false,
+ delayingBlurEvent: false,
+ focused: false,
</ins><span class="cx"> suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
</span><del>- pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in readInput
</del><ins>+ pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll
+ selectingText: false,
</ins><span class="cx"> draggingText: false,
</span><del>- highlight: new Delayed() // stores highlight worker timeout
</del><ins>+ highlight: new Delayed(), // stores highlight worker timeout
+ keySeq: null, // Unfinished key sequence
+ specialChars: null
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+ var cm = this;
+
</ins><span class="cx"> // Override magic textarea content restore that IE sometimes does
</span><span class="cx"> // on our hidden textarea on reload
</span><del>- if (ie_upto10) setTimeout(bind(resetInput, this, true), 20);
</del><ins>+ if (ie && ie_version < 11) setTimeout(function() { cm.display.input.reset(true); }, 20);
</ins><span class="cx">
</span><span class="cx"> registerEventHandlers(this);
</span><span class="cx"> ensureGlobalHandlers();
</span><span class="cx">
</span><del>- var cm = this;
- runInOp(this, function() {
- cm.curOp.forceUpdate = true;
- attachDoc(cm, doc);
</del><ins>+ startOperation(this);
+ this.curOp.forceUpdate = true;
+ attachDoc(this, doc);
</ins><span class="cx">
</span><del>- if ((options.autofocus && !mobile) || activeElt() == display.input)
- setTimeout(bind(onFocus, cm), 20);
- else
- onBlur(cm);
</del><ins>+ if ((options.autofocus && !mobile) || cm.hasFocus())
+ setTimeout(bind(onFocus, this), 20);
+ else
+ onBlur(this);
</ins><span class="cx">
</span><del>- for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
- optionHandlers[opt](cm, options[opt], Init);
- for (var i = 0; i < initHooks.length; ++i) initHooks[i](cm);
- });
</del><ins>+ for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
+ optionHandlers[opt](this, options[opt], Init);
+ maybeUpdateLineNumberWidth(this);
+ if (options.finishInit) options.finishInit(this);
+ for (var i = 0; i < initHooks.length; ++i) initHooks[i](this);
+ endOperation(this);
+ // Suppress optimizelegibility in Webkit, since it breaks text
+ // measuring on line wrapping boundaries.
+ if (webkit && options.lineWrapping &&
+ getComputedStyle(display.lineDiv).textRendering == "optimizelegibility")
+ display.lineDiv.style.textRendering = "auto";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // DISPLAY CONSTRUCTOR
</span><span class="lines">@@ -120,32 +131,17 @@
</span><span class="cx"> // and content drawing. It holds references to DOM nodes and
</span><span class="cx"> // display-related state.
</span><span class="cx">
</span><del>- function Display(place, doc) {
</del><ins>+ function Display(place, doc, input) {
</ins><span class="cx"> var d = this;
</span><ins>+ this.input = input;
</ins><span class="cx">
</span><del>- // The semihidden textarea that is focused when the editor is
- // focused, and receives input.
- var input = d.input = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none");
- // The textarea is kept positioned near the cursor to prevent the
- // fact that it'll be scrolled into view on input from scrolling
- // our fake cursor out of view. On webkit, when wrap=off, paste is
- // very slow. So make the area wide instead.
- if (webkit) input.style.width = "1000px";
- else input.setAttribute("wrap", "off");
- // If border: 0; -- iOS fails to open keyboard (issue #1287)
- if (ios) input.style.border = "1px solid black";
- input.setAttribute("autocorrect", "off"); input.setAttribute("autocapitalize", "off"); input.setAttribute("spellcheck", "false");
-
- // Wraps and hides input textarea
- d.inputDiv = elt("div", [input], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
- // The fake scrollbar elements.
- d.scrollbarH = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
- d.scrollbarV = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
</del><span class="cx"> // Covers bottom-right square when both scrollbars are present.
</span><span class="cx"> d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
</span><ins>+ d.scrollbarFiller.setAttribute("cm-not-content", "true");
</ins><span class="cx"> // Covers bottom of gutter when coverGutterNextToScrollbar is on
</span><span class="cx"> // and h scrollbar is present.
</span><span class="cx"> d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
</span><ins>+ d.gutterFiller.setAttribute("cm-not-content", "true");
</ins><span class="cx"> // Will contain the actual code, positioned to cover the viewport.
</span><span class="cx"> d.lineDiv = elt("div", null, "CodeMirror-code");
</span><span class="cx"> // Elements are added to these to represent selection and cursors.
</span><span class="lines">@@ -162,10 +158,11 @@
</span><span class="cx"> d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative");
</span><span class="cx"> // Set to the height of the document, allowing scrolling.
</span><span class="cx"> d.sizer = elt("div", [d.mover], "CodeMirror-sizer");
</span><ins>+ d.sizerWidth = null;
</ins><span class="cx"> // Behavior of elts with overflow: auto and padding is
</span><span class="cx"> // inconsistent across browsers. This is used to ensure the
</span><span class="cx"> // scrollable area is big enough.
</span><del>- d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerCutOff + "px; width: 1px;");
</del><ins>+ d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;");
</ins><span class="cx"> // Will contain the gutters, if any.
</span><span class="cx"> d.gutters = elt("div", null, "CodeMirror-gutters");
</span><span class="cx"> d.lineGutter = null;
</span><span class="lines">@@ -173,56 +170,44 @@
</span><span class="cx"> d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");
</span><span class="cx"> d.scroller.setAttribute("tabIndex", "-1");
</span><span class="cx"> // The element in which the editor lives.
</span><del>- d.wrapper = elt("div", [d.inputDiv, d.scrollbarH, d.scrollbarV,
- d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
</del><ins>+ d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
</ins><span class="cx">
</span><span class="cx"> // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
</span><del>- if (ie_upto7) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
- // Needed to hide big blue blinking cursor on Mobile Safari
- if (ios) input.style.width = "0px";
- if (!webkit) d.scroller.draggable = true;
- // Needed to handle Tab key in KHTML
- if (khtml) { d.inputDiv.style.height = "1px"; d.inputDiv.style.position = "absolute"; }
- // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
- if (ie_upto7) d.scrollbarH.style.minHeight = d.scrollbarV.style.minWidth = "18px";
</del><ins>+ if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
+ if (!webkit && !(gecko && mobile)) d.scroller.draggable = true;
</ins><span class="cx">
</span><del>- if (place.appendChild) place.appendChild(d.wrapper);
- else place(d.wrapper);
</del><ins>+ if (place) {
+ if (place.appendChild) place.appendChild(d.wrapper);
+ else place(d.wrapper);
+ }
</ins><span class="cx">
</span><span class="cx"> // Current rendered range (may be bigger than the view window).
</span><span class="cx"> d.viewFrom = d.viewTo = doc.first;
</span><ins>+ d.reportedViewFrom = d.reportedViewTo = doc.first;
</ins><span class="cx"> // Information about the rendered lines.
</span><span class="cx"> d.view = [];
</span><ins>+ d.renderedView = null;
</ins><span class="cx"> // Holds info about a single rendered line when it was rendered
</span><span class="cx"> // for measurement, while not in view.
</span><span class="cx"> d.externalMeasured = null;
</span><span class="cx"> // Empty space (in pixels) above the view
</span><span class="cx"> d.viewOffset = 0;
</span><del>- d.lastSizeC = 0;
</del><ins>+ d.lastWrapHeight = d.lastWrapWidth = 0;
</ins><span class="cx"> d.updateLineNumbers = null;
</span><span class="cx">
</span><ins>+ d.nativeBarWidth = d.barHeight = d.barWidth = 0;
+ d.scrollbarsClipped = false;
+
</ins><span class="cx"> // Used to only resize the line number gutter when necessary (when
</span><span class="cx"> // the amount of lines crosses a boundary that makes its width change)
</span><span class="cx"> d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
</span><del>- // See readInput and resetInput
- d.prevInput = "";
</del><span class="cx"> // Set to true when a non-horizontal-scrolling line widget is
</span><span class="cx"> // added. As an optimization, line widget aligning is skipped when
</span><span class="cx"> // this is false.
</span><span class="cx"> d.alignWidgets = false;
</span><del>- // Flag that indicates whether we expect input to appear real soon
- // now (after some event like 'keypress' or 'input') and are
- // polling intensively.
- d.pollingFast = false;
- // Self-resetting timeout for the poller
- d.poll = new Delayed();
</del><span class="cx">
</span><span class="cx"> d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
</span><span class="cx">
</span><del>- // Tracks when resetInput has punted to just putting a short
- // string into the textarea instead of the full selection.
- d.inaccurateSelection = false;
-
</del><span class="cx"> // Tracks the maximum line length so that the horizontal scrollbar
</span><span class="cx"> // can be kept static when scrolling.
</span><span class="cx"> d.maxLine = null;
</span><span class="lines">@@ -238,6 +223,10 @@
</span><span class="cx"> // Used to track whether anything happened since the context menu
</span><span class="cx"> // was opened.
</span><span class="cx"> d.selForContextMenu = null;
</span><ins>+
+ d.activeTouch = null;
+
+ input.init(d);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // STATE UPDATES
</span><span class="lines">@@ -264,6 +253,7 @@
</span><span class="cx"> if (cm.options.lineWrapping) {
</span><span class="cx"> addClass(cm.display.wrapper, "CodeMirror-wrap");
</span><span class="cx"> cm.display.sizer.style.minWidth = "";
</span><ins>+ cm.display.sizerWidth = null;
</ins><span class="cx"> } else {
</span><span class="cx"> rmClass(cm.display.wrapper, "CodeMirror-wrap");
</span><span class="cx"> findMaxLine(cm);
</span><span class="lines">@@ -303,12 +293,6 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function keyMapChanged(cm) {
- var map = keyMap[cm.options.keyMap], style = map.style;
- cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-keymap-\S+/g, "") +
- (style ? " cm-keymap-" + style : "");
- }
-
</del><span class="cx"> function themeChanged(cm) {
</span><span class="cx"> cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
</span><span class="cx"> cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-");
</span><span class="lines">@@ -341,7 +325,6 @@
</span><span class="cx"> function updateGutterSpace(cm) {
</span><span class="cx"> var width = cm.display.gutters.offsetWidth;
</span><span class="cx"> cm.display.sizer.style.marginLeft = width + "px";
</span><del>- cm.display.scrollbarH.style.left = cm.options.fixedGutter ? width + "px" : 0;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Compute the character length of a line, taking into account
</span><span class="lines">@@ -397,87 +380,186 @@
</span><span class="cx"> // Prepare DOM reads needed to update the scrollbars. Done in one
</span><span class="cx"> // shot to minimize update/measure roundtrips.
</span><span class="cx"> function measureForScrollbars(cm) {
</span><del>- var scroll = cm.display.scroller;
</del><ins>+ var d = cm.display, gutterW = d.gutters.offsetWidth;
+ var docH = Math.round(cm.doc.height + paddingVert(cm.display));
</ins><span class="cx"> return {
</span><del>- clientHeight: scroll.clientHeight,
- barHeight: cm.display.scrollbarV.clientHeight,
- scrollWidth: scroll.scrollWidth, clientWidth: scroll.clientWidth,
- barWidth: cm.display.scrollbarH.clientWidth,
- docHeight: Math.round(cm.doc.height + paddingVert(cm.display))
</del><ins>+ clientHeight: d.scroller.clientHeight,
+ viewHeight: d.wrapper.clientHeight,
+ scrollWidth: d.scroller.scrollWidth, clientWidth: d.scroller.clientWidth,
+ viewWidth: d.wrapper.clientWidth,
+ barLeft: cm.options.fixedGutter ? gutterW : 0,
+ docHeight: docH,
+ scrollHeight: docH + scrollGap(cm) + d.barHeight,
+ nativeBarWidth: d.nativeBarWidth,
+ gutterWidth: gutterW
</ins><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function NativeScrollbars(place, scroll, cm) {
+ this.cm = cm;
+ var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
+ var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
+ place(vert); place(horiz);
+
+ on(vert, "scroll", function() {
+ if (vert.clientHeight) scroll(vert.scrollTop, "vertical");
+ });
+ on(horiz, "scroll", function() {
+ if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal");
+ });
+
+ this.checkedOverlay = false;
+ // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
+ if (ie && ie_version < 8) this.horiz.style.minHeight = this.vert.style.minWidth = "18px";
+ }
+
+ NativeScrollbars.prototype = copyObj({
+ update: function(measure) {
+ var needsH = measure.scrollWidth > measure.clientWidth + 1;
+ var needsV = measure.scrollHeight > measure.clientHeight + 1;
+ var sWidth = measure.nativeBarWidth;
+
+ if (needsV) {
+ this.vert.style.display = "block";
+ this.vert.style.bottom = needsH ? sWidth + "px" : "0";
+ var totalHeight = measure.viewHeight - (needsH ? sWidth : 0);
+ // A bug in IE8 can cause this value to be negative, so guard it.
+ this.vert.firstChild.style.height =
+ Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px";
+ } else {
+ this.vert.style.display = "";
+ this.vert.firstChild.style.height = "0";
+ }
+
+ if (needsH) {
+ this.horiz.style.display = "block";
+ this.horiz.style.right = needsV ? sWidth + "px" : "0";
+ this.horiz.style.left = measure.barLeft + "px";
+ var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0);
+ this.horiz.firstChild.style.width =
+ (measure.scrollWidth - measure.clientWidth + totalWidth) + "px";
+ } else {
+ this.horiz.style.display = "";
+ this.horiz.firstChild.style.width = "0";
+ }
+
+ if (!this.checkedOverlay && measure.clientHeight > 0) {
+ if (sWidth == 0) this.overlayHack();
+ this.checkedOverlay = true;
+ }
+
+ return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0};
+ },
+ setScrollLeft: function(pos) {
+ if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos;
+ },
+ setScrollTop: function(pos) {
+ if (this.vert.scrollTop != pos) this.vert.scrollTop = pos;
+ },
+ overlayHack: function() {
+ var w = mac && !mac_geMountainLion ? "12px" : "18px";
+ this.horiz.style.minHeight = this.vert.style.minWidth = w;
+ var self = this;
+ var barMouseDown = function(e) {
+ if (e_target(e) != self.vert && e_target(e) != self.horiz)
+ operation(self.cm, onMouseDown)(e);
+ };
+ on(this.vert, "mousedown", barMouseDown);
+ on(this.horiz, "mousedown", barMouseDown);
+ },
+ clear: function() {
+ var parent = this.horiz.parentNode;
+ parent.removeChild(this.horiz);
+ parent.removeChild(this.vert);
+ }
+ }, NativeScrollbars.prototype);
+
+ function NullScrollbars() {}
+
+ NullScrollbars.prototype = copyObj({
+ update: function() { return {bottom: 0, right: 0}; },
+ setScrollLeft: function() {},
+ setScrollTop: function() {},
+ clear: function() {}
+ }, NullScrollbars.prototype);
+
+ CodeMirror.scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars};
+
+ function initScrollbars(cm) {
+ if (cm.display.scrollbars) {
+ cm.display.scrollbars.clear();
+ if (cm.display.scrollbars.addClass)
+ rmClass(cm.display.wrapper, cm.display.scrollbars.addClass);
+ }
+
+ cm.display.scrollbars = new CodeMirror.scrollbarModel[cm.options.scrollbarStyle](function(node) {
+ cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller);
+ // Prevent clicks in the scrollbars from killing focus
+ on(node, "mousedown", function() {
+ if (cm.state.focused) setTimeout(function() { cm.display.input.focus(); }, 0);
+ });
+ node.setAttribute("cm-not-content", "true");
+ }, function(pos, axis) {
+ if (axis == "horizontal") setScrollLeft(cm, pos);
+ else setScrollTop(cm, pos);
+ }, cm);
+ if (cm.display.scrollbars.addClass)
+ addClass(cm.display.wrapper, cm.display.scrollbars.addClass);
+ }
+
+ function updateScrollbars(cm, measure) {
+ if (!measure) measure = measureForScrollbars(cm);
+ var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight;
+ updateScrollbarsInner(cm, measure);
+ for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) {
+ if (startWidth != cm.display.barWidth && cm.options.lineWrapping)
+ updateHeightsInViewport(cm);
+ updateScrollbarsInner(cm, measureForScrollbars(cm));
+ startWidth = cm.display.barWidth; startHeight = cm.display.barHeight;
+ }
+ }
+
</ins><span class="cx"> // Re-synchronize the fake scrollbars with the actual size of the
</span><span class="cx"> // content.
</span><del>- function updateScrollbars(cm, measure) {
- if (!measure) measure = measureForScrollbars(cm);
</del><ins>+ function updateScrollbarsInner(cm, measure) {
</ins><span class="cx"> var d = cm.display;
</span><del>- var scrollHeight = measure.docHeight + scrollerCutOff;
- var needsH = measure.scrollWidth > measure.clientWidth;
- var needsV = scrollHeight > measure.clientHeight;
- if (needsV) {
- d.scrollbarV.style.display = "block";
- d.scrollbarV.style.bottom = needsH ? scrollbarWidth(d.measure) + "px" : "0";
- // A bug in IE8 can cause this value to be negative, so guard it.
- d.scrollbarV.firstChild.style.height =
- Math.max(0, scrollHeight - measure.clientHeight + (measure.barHeight || d.scrollbarV.clientHeight)) + "px";
- } else {
- d.scrollbarV.style.display = "";
- d.scrollbarV.firstChild.style.height = "0";
- }
- if (needsH) {
- d.scrollbarH.style.display = "block";
- d.scrollbarH.style.right = needsV ? scrollbarWidth(d.measure) + "px" : "0";
- d.scrollbarH.firstChild.style.width =
- (measure.scrollWidth - measure.clientWidth + (measure.barWidth || d.scrollbarH.clientWidth)) + "px";
- } else {
- d.scrollbarH.style.display = "";
- d.scrollbarH.firstChild.style.width = "0";
- }
- if (needsH && needsV) {
</del><ins>+ var sizes = d.scrollbars.update(measure);
+
+ d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px";
+ d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px";
+
+ if (sizes.right && sizes.bottom) {
</ins><span class="cx"> d.scrollbarFiller.style.display = "block";
</span><del>- d.scrollbarFiller.style.height = d.scrollbarFiller.style.width = scrollbarWidth(d.measure) + "px";
</del><ins>+ d.scrollbarFiller.style.height = sizes.bottom + "px";
+ d.scrollbarFiller.style.width = sizes.right + "px";
</ins><span class="cx"> } else d.scrollbarFiller.style.display = "";
</span><del>- if (needsH && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
</del><ins>+ if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
</ins><span class="cx"> d.gutterFiller.style.display = "block";
</span><del>- d.gutterFiller.style.height = scrollbarWidth(d.measure) + "px";
- d.gutterFiller.style.width = d.gutters.offsetWidth + "px";
</del><ins>+ d.gutterFiller.style.height = sizes.bottom + "px";
+ d.gutterFiller.style.width = measure.gutterWidth + "px";
</ins><span class="cx"> } else d.gutterFiller.style.display = "";
</span><del>-
- if (!cm.state.checkedOverlayScrollbar && measure.clientHeight > 0) {
- if (scrollbarWidth(d.measure) === 0) {
- var w = mac && !mac_geMountainLion ? "12px" : "18px";
- d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = w;
- var barMouseDown = function(e) {
- if (e_target(e) != d.scrollbarV && e_target(e) != d.scrollbarH)
- operation(cm, onMouseDown)(e);
- };
- on(d.scrollbarV, "mousedown", barMouseDown);
- on(d.scrollbarH, "mousedown", barMouseDown);
- }
- cm.state.checkedOverlayScrollbar = true;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Compute the lines that are visible in a given viewport (defaults
</span><del>- // the the current scroll position). viewPort may contain top,
</del><ins>+ // the the current scroll position). viewport may contain top,
</ins><span class="cx"> // height, and ensure (see op.scrollToPos) properties.
</span><del>- function visibleLines(display, doc, viewPort) {
- var top = viewPort && viewPort.top != null ? Math.max(0, viewPort.top) : display.scroller.scrollTop;
</del><ins>+ function visibleLines(display, doc, viewport) {
+ var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop;
</ins><span class="cx"> top = Math.floor(top - paddingTop(display));
</span><del>- var bottom = viewPort && viewPort.bottom != null ? viewPort.bottom : top + display.wrapper.clientHeight;
</del><ins>+ var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight;
</ins><span class="cx">
</span><span class="cx"> var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom);
</span><span class="cx"> // Ensure is a {from: {line, ch}, to: {line, ch}} object, and
</span><span class="cx"> // forces those lines into the viewport (if possible).
</span><del>- if (viewPort && viewPort.ensure) {
- var ensureFrom = viewPort.ensure.from.line, ensureTo = viewPort.ensure.to.line;
- if (ensureFrom < from)
- return {from: ensureFrom,
- to: lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight)};
- if (Math.min(ensureTo, doc.lastLine()) >= to)
- return {from: lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight),
- to: ensureTo};
</del><ins>+ if (viewport && viewport.ensure) {
+ var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line;
+ if (ensureFrom < from) {
+ from = ensureFrom;
+ to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight);
+ } else if (Math.min(ensureTo, doc.lastLine()) >= to) {
+ from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight);
+ to = ensureTo;
+ }
</ins><span class="cx"> }
</span><span class="cx"> return {from: from, to: Math.max(to, from + 1)};
</span><span class="cx"> }
</span><span class="lines">@@ -513,7 +595,7 @@
</span><span class="cx"> "CodeMirror-linenumber CodeMirror-gutter-elt"));
</span><span class="cx"> var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;
</span><span class="cx"> display.lineGutter.style.width = "";
</span><del>- display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding);
</del><ins>+ display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1;
</ins><span class="cx"> display.lineNumWidth = display.lineNumInnerWidth + padding;
</span><span class="cx"> display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
</span><span class="cx"> display.lineGutter.style.width = display.lineNumWidth + "px";
</span><span class="lines">@@ -536,78 +618,68 @@
</span><span class="cx">
</span><span class="cx"> // DISPLAY DRAWING
</span><span class="cx">
</span><del>- // Updates the display, selection, and scrollbars, using the
- // information in display.view to find out which nodes are no longer
- // up-to-date. Tries to bail out early when no changes are needed,
- // unless forced is true.
- // Returns true if an actual update happened, false otherwise.
- function updateDisplay(cm, viewPort, forced) {
- var oldFrom = cm.display.viewFrom, oldTo = cm.display.viewTo, updated;
- var visible = visibleLines(cm.display, cm.doc, viewPort);
- for (var first = true;; first = false) {
- var oldWidth = cm.display.scroller.clientWidth;
- if (!updateDisplayInner(cm, visible, forced)) break;
- updated = true;
</del><ins>+ function DisplayUpdate(cm, viewport, force) {
+ var display = cm.display;
</ins><span class="cx">
</span><del>- // If the max line changed since it was last measured, measure it,
- // and ensure the document's width matches it.
- if (cm.display.maxLineChanged && !cm.options.lineWrapping)
- adjustContentWidth(cm);
</del><ins>+ this.viewport = viewport;
+ // Store some values that we'll need later (but don't want to force a relayout for)
+ this.visible = visibleLines(display, cm.doc, viewport);
+ this.editorIsHidden = !display.wrapper.offsetWidth;
+ this.wrapperHeight = display.wrapper.clientHeight;
+ this.wrapperWidth = display.wrapper.clientWidth;
+ this.oldDisplayWidth = displayWidth(cm);
+ this.force = force;
+ this.dims = getDimensions(cm);
+ this.events = [];
+ }
</ins><span class="cx">
</span><del>- var barMeasure = measureForScrollbars(cm);
- updateSelection(cm);
- setDocumentHeight(cm, barMeasure);
- updateScrollbars(cm, barMeasure);
- if (webkit && cm.options.lineWrapping)
- checkForWebkitWidthBug(cm, barMeasure); // (Issue #2420)
- if (first && cm.options.lineWrapping && oldWidth != cm.display.scroller.clientWidth) {
- forced = true;
- continue;
- }
- forced = false;
</del><ins>+ DisplayUpdate.prototype.signal = function(emitter, type) {
+ if (hasHandler(emitter, type))
+ this.events.push(arguments);
+ };
+ DisplayUpdate.prototype.finish = function() {
+ for (var i = 0; i < this.events.length; i++)
+ signal.apply(null, this.events[i]);
+ };
</ins><span class="cx">
</span><del>- // Clip forced viewport to actual scrollable area.
- if (viewPort && viewPort.top != null)
- viewPort = {top: Math.min(barMeasure.docHeight - scrollerCutOff - barMeasure.clientHeight, viewPort.top)};
- // Updated line heights might result in the drawn area not
- // actually covering the viewport. Keep looping until it does.
- visible = visibleLines(cm.display, cm.doc, viewPort);
- if (visible.from >= cm.display.viewFrom && visible.to <= cm.display.viewTo)
- break;
</del><ins>+ function maybeClipScrollbars(cm) {
+ var display = cm.display;
+ if (!display.scrollbarsClipped && display.scroller.offsetWidth) {
+ display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth;
+ display.heightForcer.style.height = scrollGap(cm) + "px";
+ display.sizer.style.marginBottom = -display.nativeBarWidth + "px";
+ display.sizer.style.borderRightWidth = scrollGap(cm) + "px";
+ display.scrollbarsClipped = true;
</ins><span class="cx"> }
</span><del>-
- cm.display.updateLineNumbers = null;
- if (updated) {
- signalLater(cm, "update", cm);
- if (cm.display.viewFrom != oldFrom || cm.display.viewTo != oldTo)
- signalLater(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
- }
- return updated;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Does the actual updating of the line display. Bails out
</span><span class="cx"> // (returning false) when there is nothing to be done and forced is
</span><span class="cx"> // false.
</span><del>- function updateDisplayInner(cm, visible, forced) {
</del><ins>+ function updateDisplayIfNeeded(cm, update) {
</ins><span class="cx"> var display = cm.display, doc = cm.doc;
</span><del>- if (!display.wrapper.offsetWidth) {
</del><ins>+
+ if (update.editorIsHidden) {
</ins><span class="cx"> resetView(cm);
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Bail out if the visible area is already rendered and nothing changed.
</span><del>- if (!forced && visible.from >= display.viewFrom && visible.to <= display.viewTo &&
- countDirtyView(cm) == 0)
- return;
</del><ins>+ if (!update.force &&
+ update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo &&
+ (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) &&
+ display.renderedView == display.view && countDirtyView(cm) == 0)
+ return false;
</ins><span class="cx">
</span><del>- if (maybeUpdateLineNumberWidth(cm))
</del><ins>+ if (maybeUpdateLineNumberWidth(cm)) {
</ins><span class="cx"> resetView(cm);
</span><del>- var dims = getDimensions(cm);
</del><ins>+ update.dims = getDimensions(cm);
+ }
</ins><span class="cx">
</span><span class="cx"> // Compute a suitable new viewport (from & to)
</span><span class="cx"> var end = doc.first + doc.size;
</span><del>- var from = Math.max(visible.from - cm.options.viewportMargin, doc.first);
- var to = Math.min(end, visible.to + cm.options.viewportMargin);
</del><ins>+ var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first);
+ var to = Math.min(end, update.visible.to + cm.options.viewportMargin);
</ins><span class="cx"> if (display.viewFrom < from && from - display.viewFrom < 20) from = Math.max(doc.first, display.viewFrom);
</span><span class="cx"> if (display.viewTo > to && display.viewTo - to < 20) to = Math.min(end, display.viewTo);
</span><span class="cx"> if (sawCollapsedSpans) {
</span><span class="lines">@@ -616,7 +688,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var different = from != display.viewFrom || to != display.viewTo ||
</span><del>- display.lastSizeC != display.wrapper.clientHeight;
</del><ins>+ display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth;
</ins><span class="cx"> adjustView(cm, from, to);
</span><span class="cx">
</span><span class="cx"> display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom));
</span><span class="lines">@@ -624,58 +696,86 @@
</span><span class="cx"> cm.display.mover.style.top = display.viewOffset + "px";
</span><span class="cx">
</span><span class="cx"> var toUpdate = countDirtyView(cm);
</span><del>- if (!different && toUpdate == 0 && !forced) return;
</del><ins>+ if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view &&
+ (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo))
+ return false;
</ins><span class="cx">
</span><span class="cx"> // For big changes, we hide the enclosing element during the
</span><span class="cx"> // update, since that speeds up the operations on most browsers.
</span><span class="cx"> var focused = activeElt();
</span><span class="cx"> if (toUpdate > 4) display.lineDiv.style.display = "none";
</span><del>- patchDisplay(cm, display.updateLineNumbers, dims);
</del><ins>+ patchDisplay(cm, display.updateLineNumbers, update.dims);
</ins><span class="cx"> if (toUpdate > 4) display.lineDiv.style.display = "";
</span><ins>+ display.renderedView = display.view;
</ins><span class="cx"> // There might have been a widget with a focused element that got
</span><span class="cx"> // hidden or updated, if so re-focus it.
</span><span class="cx"> if (focused && activeElt() != focused && focused.offsetHeight) focused.focus();
</span><span class="cx">
</span><span class="cx"> // Prevent selection and cursors from interfering with the scroll
</span><del>- // width.
</del><ins>+ // width and height.
</ins><span class="cx"> removeChildren(display.cursorDiv);
</span><span class="cx"> removeChildren(display.selectionDiv);
</span><ins>+ display.gutters.style.height = display.sizer.style.minHeight = 0;
</ins><span class="cx">
</span><span class="cx"> if (different) {
</span><del>- display.lastSizeC = display.wrapper.clientHeight;
</del><ins>+ display.lastWrapHeight = update.wrapperHeight;
+ display.lastWrapWidth = update.wrapperWidth;
</ins><span class="cx"> startWorker(cm, 400);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateHeightsInViewport(cm);
</del><ins>+ display.updateLineNumbers = null;
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function adjustContentWidth(cm) {
- var display = cm.display;
- var width = measureChar(cm, display.maxLine, display.maxLine.text.length).left;
- display.maxLineChanged = false;
- var minWidth = Math.max(0, width + 3);
- var maxScrollLeft = Math.max(0, display.sizer.offsetLeft + minWidth + scrollerCutOff - display.scroller.clientWidth);
- display.sizer.style.minWidth = minWidth + "px";
- if (maxScrollLeft < cm.doc.scrollLeft)
- setScrollLeft(cm, Math.min(display.scroller.scrollLeft, maxScrollLeft), true);
- }
</del><ins>+ function postUpdateDisplay(cm, update) {
+ var viewport = update.viewport;
+ for (var first = true;; first = false) {
+ if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
+ // Clip forced viewport to actual scrollable area.
+ if (viewport && viewport.top != null)
+ viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)};
+ // Updated line heights might result in the drawn area not
+ // actually covering the viewport. Keep looping until it does.
+ update.visible = visibleLines(cm.display, cm.doc, viewport);
+ if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
+ break;
+ }
+ if (!updateDisplayIfNeeded(cm, update)) break;
+ updateHeightsInViewport(cm);
+ var barMeasure = measureForScrollbars(cm);
+ updateSelection(cm);
+ setDocumentHeight(cm, barMeasure);
+ updateScrollbars(cm, barMeasure);
+ }
</ins><span class="cx">
</span><del>- function setDocumentHeight(cm, measure) {
- cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top = measure.docHeight + "px";
- cm.display.gutters.style.height = Math.max(measure.docHeight, measure.clientHeight - scrollerCutOff) + "px";
</del><ins>+ update.signal(cm, "update", cm);
+ if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
+ update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
+ cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function checkForWebkitWidthBug(cm, measure) {
- // Work around Webkit bug where it sometimes reserves space for a
- // non-existing phantom scrollbar in the scroller (Issue #2420)
- if (cm.display.sizer.offsetWidth + cm.display.gutters.offsetWidth < cm.display.scroller.clientWidth - 1) {
- cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top = "0px";
- cm.display.gutters.style.height = measure.docHeight + "px";
</del><ins>+ function updateDisplaySimple(cm, viewport) {
+ var update = new DisplayUpdate(cm, viewport);
+ if (updateDisplayIfNeeded(cm, update)) {
+ updateHeightsInViewport(cm);
+ postUpdateDisplay(cm, update);
+ var barMeasure = measureForScrollbars(cm);
+ updateSelection(cm);
+ setDocumentHeight(cm, barMeasure);
+ updateScrollbars(cm, barMeasure);
+ update.finish();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function setDocumentHeight(cm, measure) {
+ cm.display.sizer.style.minHeight = measure.docHeight + "px";
+ var total = measure.docHeight + cm.display.barHeight;
+ cm.display.heightForcer.style.top = total + "px";
+ cm.display.gutters.style.height = Math.max(total + scrollGap(cm), measure.clientHeight) + "px";
+ }
+
</ins><span class="cx"> // Read the actual heights of the rendered lines, and update their
</span><span class="cx"> // stored heights to match.
</span><span class="cx"> function updateHeightsInViewport(cm) {
</span><span class="lines">@@ -684,7 +784,7 @@
</span><span class="cx"> for (var i = 0; i < display.view.length; i++) {
</span><span class="cx"> var cur = display.view[i], height;
</span><span class="cx"> if (cur.hidden) continue;
</span><del>- if (ie_upto7) {
</del><ins>+ if (ie && ie_version < 8) {
</ins><span class="cx"> var bot = cur.node.offsetTop + cur.node.offsetHeight;
</span><span class="cx"> height = bot - prevBottom;
</span><span class="cx"> prevBottom = bot;
</span><span class="lines">@@ -714,9 +814,10 @@
</span><span class="cx"> // view, so that we don't interleave reading and writing to the DOM.
</span><span class="cx"> function getDimensions(cm) {
</span><span class="cx"> var d = cm.display, left = {}, width = {};
</span><ins>+ var gutterLeft = d.gutters.clientLeft;
</ins><span class="cx"> for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
</span><del>- left[cm.options.gutters[i]] = n.offsetLeft;
- width[cm.options.gutters[i]] = n.offsetWidth;
</del><ins>+ left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft;
+ width[cm.options.gutters[i]] = n.clientWidth;
</ins><span class="cx"> }
</span><span class="cx"> return {fixedPos: compensateForHScroll(d),
</span><span class="cx"> gutterTotalWidth: d.gutters.offsetWidth,
</span><span class="lines">@@ -749,7 +850,7 @@
</span><span class="cx"> for (var i = 0; i < view.length; i++) {
</span><span class="cx"> var lineView = view[i];
</span><span class="cx"> if (lineView.hidden) {
</span><del>- } else if (!lineView.node) { // Not drawn yet
</del><ins>+ } else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet
</ins><span class="cx"> var node = buildLineElement(cm, lineView, lineN, dims);
</span><span class="cx"> container.insertBefore(node, cur);
</span><span class="cx"> } else { // Already drawn
</span><span class="lines">@@ -780,7 +881,7 @@
</span><span class="cx"> if (type == "text") updateLineText(cm, lineView);
</span><span class="cx"> else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims);
</span><span class="cx"> else if (type == "class") updateLineClasses(lineView);
</span><del>- else if (type == "widget") updateLineWidgets(lineView, dims);
</del><ins>+ else if (type == "widget") updateLineWidgets(cm, lineView, dims);
</ins><span class="cx"> }
</span><span class="cx"> lineView.changes = null;
</span><span class="cx"> }
</span><span class="lines">@@ -793,7 +894,7 @@
</span><span class="cx"> if (lineView.text.parentNode)
</span><span class="cx"> lineView.text.parentNode.replaceChild(lineView.node, lineView.text);
</span><span class="cx"> lineView.node.appendChild(lineView.text);
</span><del>- if (ie_upto7) lineView.node.style.zIndex = 2;
</del><ins>+ if (ie && ie_version < 8) lineView.node.style.zIndex = 2;
</ins><span class="cx"> }
</span><span class="cx"> return lineView.node;
</span><span class="cx"> }
</span><span class="lines">@@ -855,13 +956,26 @@
</span><span class="cx"> lineView.node.removeChild(lineView.gutter);
</span><span class="cx"> lineView.gutter = null;
</span><span class="cx"> }
</span><ins>+ if (lineView.gutterBackground) {
+ lineView.node.removeChild(lineView.gutterBackground);
+ lineView.gutterBackground = null;
+ }
+ if (lineView.line.gutterClass) {
+ var wrap = ensureLineWrapped(lineView);
+ lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
+ "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
+ "px; width: " + dims.gutterTotalWidth + "px");
+ wrap.insertBefore(lineView.gutterBackground, lineView.text);
+ }
</ins><span class="cx"> var markers = lineView.line.gutterMarkers;
</span><span class="cx"> if (cm.options.lineNumbers || markers) {
</span><span class="cx"> var wrap = ensureLineWrapped(lineView);
</span><del>- var gutterWrap = lineView.gutter =
- wrap.insertBefore(elt("div", null, "CodeMirror-gutter-wrapper", "position: absolute; left: " +
- (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"),
- lineView.text);
</del><ins>+ var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
+ (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px");
+ cm.display.input.setUneditable(gutterWrap);
+ wrap.insertBefore(gutterWrap, lineView.text);
+ if (lineView.line.gutterClass)
+ gutterWrap.className += " " + lineView.line.gutterClass;
</ins><span class="cx"> if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
</span><span class="cx"> lineView.lineNumber = gutterWrap.appendChild(
</span><span class="cx"> elt("div", lineNumberFor(cm.options, lineN),
</span><span class="lines">@@ -877,14 +991,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function updateLineWidgets(lineView, dims) {
</del><ins>+ function updateLineWidgets(cm, lineView, dims) {
</ins><span class="cx"> if (lineView.alignable) lineView.alignable = null;
</span><span class="cx"> for (var node = lineView.node.firstChild, next; node; node = next) {
</span><span class="cx"> var next = node.nextSibling;
</span><span class="cx"> if (node.className == "CodeMirror-linewidget")
</span><span class="cx"> lineView.node.removeChild(node);
</span><span class="cx"> }
</span><del>- insertLineWidgets(lineView, dims);
</del><ins>+ insertLineWidgets(cm, lineView, dims);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Build a line's DOM representation from scratch
</span><span class="lines">@@ -896,25 +1010,26 @@
</span><span class="cx">
</span><span class="cx"> updateLineClasses(lineView);
</span><span class="cx"> updateLineGutter(cm, lineView, lineN, dims);
</span><del>- insertLineWidgets(lineView, dims);
</del><ins>+ insertLineWidgets(cm, lineView, dims);
</ins><span class="cx"> return lineView.node;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // A lineView may contain multiple logical lines (when merged by
</span><span class="cx"> // collapsed spans). The widgets for all of them need to be drawn.
</span><del>- function insertLineWidgets(lineView, dims) {
- insertLineWidgetsFor(lineView.line, lineView, dims, true);
</del><ins>+ function insertLineWidgets(cm, lineView, dims) {
+ insertLineWidgetsFor(cm, lineView.line, lineView, dims, true);
</ins><span class="cx"> if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
</span><del>- insertLineWidgetsFor(lineView.rest[i], lineView, dims, false);
</del><ins>+ insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function insertLineWidgetsFor(line, lineView, dims, allowAbove) {
</del><ins>+ function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
</ins><span class="cx"> if (!line.widgets) return;
</span><span class="cx"> var wrap = ensureLineWrapped(lineView);
</span><span class="cx"> for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
</span><span class="cx"> var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
</span><del>- if (!widget.handleMouseEvents) node.ignoreEvents = true;
</del><ins>+ if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true");
</ins><span class="cx"> positionLineWidget(widget, node, lineView, dims);
</span><ins>+ cm.display.input.setUneditable(node);
</ins><span class="cx"> if (allowAbove && widget.above)
</span><span class="cx"> wrap.insertBefore(node, lineView.gutter || lineView.text);
</span><span class="cx"> else
</span><span class="lines">@@ -957,6 +1072,905 @@
</span><span class="cx"> function maxPos(a, b) { return cmp(a, b) < 0 ? b : a; }
</span><span class="cx"> function minPos(a, b) { return cmp(a, b) < 0 ? a : b; }
</span><span class="cx">
</span><ins>+ // INPUT HANDLING
+
+ function ensureFocus(cm) {
+ if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }
+ }
+
+ function isReadOnly(cm) {
+ return cm.options.readOnly || cm.doc.cantEdit;
+ }
+
+ // This will be set to an array of strings when copying, so that,
+ // when pasting, we know what kind of selections the copied text
+ // was made out of.
+ var lastCopied = null;
+
+ function applyTextInput(cm, inserted, deleted, sel, origin) {
+ var doc = cm.doc;
+ cm.display.shift = false;
+ if (!sel) sel = doc.sel;
+
+ var paste = cm.state.pasteIncoming || origin == "paste";
+ var textLines = doc.splitLines(inserted), multiPaste = null;
+ // When pasing N lines into N selections, insert one line per selection
+ if (paste && sel.ranges.length > 1) {
+ if (lastCopied && lastCopied.join("\n") == inserted) {
+ if (sel.ranges.length % lastCopied.length == 0) {
+ multiPaste = [];
+ for (var i = 0; i < lastCopied.length; i++)
+ multiPaste.push(doc.splitLines(lastCopied[i]));
+ }
+ } else if (textLines.length == sel.ranges.length) {
+ multiPaste = map(textLines, function(l) { return [l]; });
+ }
+ }
+
+ // Normal behavior is to insert the new text into every selection
+ for (var i = sel.ranges.length - 1; i >= 0; i--) {
+ var range = sel.ranges[i];
+ var from = range.from(), to = range.to();
+ if (range.empty()) {
+ if (deleted && deleted > 0) // Handle deletion
+ from = Pos(from.line, from.ch - deleted);
+ else if (cm.state.overwrite && !paste) // Handle overwrite
+ to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
+ }
+ var updateInput = cm.curOp.updateInput;
+ var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
+ origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")};
+ makeChange(cm.doc, changeEvent);
+ signalLater(cm, "inputRead", cm, changeEvent);
+ }
+ if (inserted && !paste)
+ triggerElectric(cm, inserted);
+
+ ensureCursorVisible(cm);
+ cm.curOp.updateInput = updateInput;
+ cm.curOp.typing = true;
+ cm.state.pasteIncoming = cm.state.cutIncoming = false;
+ }
+
+ function handlePaste(e, cm) {
+ var pasted = e.clipboardData && e.clipboardData.getData("text/plain");
+ if (pasted) {
+ e.preventDefault();
+ if (!isReadOnly(cm) && !cm.options.disableInput)
+ runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); });
+ return true;
+ }
+ }
+
+ function triggerElectric(cm, inserted) {
+ // When an 'electric' character is inserted, immediately trigger a reindent
+ if (!cm.options.electricChars || !cm.options.smartIndent) return;
+ var sel = cm.doc.sel;
+
+ for (var i = sel.ranges.length - 1; i >= 0; i--) {
+ var range = sel.ranges[i];
+ if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) continue;
+ var mode = cm.getModeAt(range.head);
+ var indented = false;
+ if (mode.electricChars) {
+ for (var j = 0; j < mode.electricChars.length; j++)
+ if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
+ indented = indentLine(cm, range.head.line, "smart");
+ break;
+ }
+ } else if (mode.electricInput) {
+ if (mode.electricInput.test(getLine(cm.doc, range.head.line).text.slice(0, range.head.ch)))
+ indented = indentLine(cm, range.head.line, "smart");
+ }
+ if (indented) signalLater(cm, "electricInput", cm, range.head.line);
+ }
+ }
+
+ function copyableRanges(cm) {
+ var text = [], ranges = [];
+ for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
+ var line = cm.doc.sel.ranges[i].head.line;
+ var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
+ ranges.push(lineRange);
+ text.push(cm.getRange(lineRange.anchor, lineRange.head));
+ }
+ return {text: text, ranges: ranges};
+ }
+
+ function disableBrowserMagic(field) {
+ field.setAttribute("autocorrect", "off");
+ field.setAttribute("autocapitalize", "off");
+ field.setAttribute("spellcheck", "false");
+ }
+
+ // TEXTAREA INPUT STYLE
+
+ function TextareaInput(cm) {
+ this.cm = cm;
+ // See input.poll and input.reset
+ this.prevInput = "";
+
+ // Flag that indicates whether we expect input to appear real soon
+ // now (after some event like 'keypress' or 'input') and are
+ // polling intensively.
+ this.pollingFast = false;
+ // Self-resetting timeout for the poller
+ this.polling = new Delayed();
+ // Tracks when input.reset has punted to just putting a short
+ // string into the textarea instead of the full selection.
+ this.inaccurateSelection = false;
+ // Used to work around IE issue with selection being forgotten when focus moves away from textarea
+ this.hasSelection = false;
+ this.composing = null;
+ };
+
+ function hiddenTextarea() {
+ var te = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none");
+ var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
+ // The textarea is kept positioned near the cursor to prevent the
+ // fact that it'll be scrolled into view on input from scrolling
+ // our fake cursor out of view. On webkit, when wrap=off, paste is
+ // very slow. So make the area wide instead.
+ if (webkit) te.style.width = "1000px";
+ else te.setAttribute("wrap", "off");
+ // If border: 0; -- iOS fails to open keyboard (issue #1287)
+ if (ios) te.style.border = "1px solid black";
+ disableBrowserMagic(te);
+ return div;
+ }
+
+ TextareaInput.prototype = copyObj({
+ init: function(display) {
+ var input = this, cm = this.cm;
+
+ // Wraps and hides input textarea
+ var div = this.wrapper = hiddenTextarea();
+ // The semihidden textarea that is focused when the editor is
+ // focused, and receives input.
+ var te = this.textarea = div.firstChild;
+ display.wrapper.insertBefore(div, display.wrapper.firstChild);
+
+ // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
+ if (ios) te.style.width = "0px";
+
+ on(te, "input", function() {
+ if (ie && ie_version >= 9 && input.hasSelection) input.hasSelection = null;
+ input.poll();
+ });
+
+ on(te, "paste", function(e) {
+ if (handlePaste(e, cm)) return true;
+
+ cm.state.pasteIncoming = true;
+ input.fastPoll();
+ });
+
+ function prepareCopyCut(e) {
+ if (cm.somethingSelected()) {
+ lastCopied = cm.getSelections();
+ if (input.inaccurateSelection) {
+ input.prevInput = "";
+ input.inaccurateSelection = false;
+ te.value = lastCopied.join("\n");
+ selectInput(te);
+ }
+ } else if (!cm.options.lineWiseCopyCut) {
+ return;
+ } else {
+ var ranges = copyableRanges(cm);
+ lastCopied = ranges.text;
+ if (e.type == "cut") {
+ cm.setSelections(ranges.ranges, null, sel_dontScroll);
+ } else {
+ input.prevInput = "";
+ te.value = ranges.text.join("\n");
+ selectInput(te);
+ }
+ }
+ if (e.type == "cut") cm.state.cutIncoming = true;
+ }
+ on(te, "cut", prepareCopyCut);
+ on(te, "copy", prepareCopyCut);
+
+ on(display.scroller, "paste", function(e) {
+ if (eventInWidget(display, e)) return;
+ cm.state.pasteIncoming = true;
+ input.focus();
+ });
+
+ // Prevent normal selection in the editor (we handle our own)
+ on(display.lineSpace, "selectstart", function(e) {
+ if (!eventInWidget(display, e)) e_preventDefault(e);
+ });
+
+ on(te, "compositionstart", function() {
+ var start = cm.getCursor("from");
+ input.composing = {
+ start: start,
+ range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
+ };
+ });
+ on(te, "compositionend", function() {
+ if (input.composing) {
+ input.poll();
+ input.composing.range.clear();
+ input.composing = null;
+ }
+ });
+ },
+
+ prepareSelection: function() {
+ // Redraw the selection and/or cursor
+ var cm = this.cm, display = cm.display, doc = cm.doc;
+ var result = prepareSelection(cm);
+
+ // Move the hidden textarea near the cursor to prevent scrolling artifacts
+ if (cm.options.moveInputWithCursor) {
+ var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
+ var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
+ result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
+ headPos.top + lineOff.top - wrapOff.top));
+ result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
+ headPos.left + lineOff.left - wrapOff.left));
+ }
+
+ return result;
+ },
+
+ showSelection: function(drawn) {
+ var cm = this.cm, display = cm.display;
+ removeChildrenAndAdd(display.cursorDiv, drawn.cursors);
+ removeChildrenAndAdd(display.selectionDiv, drawn.selection);
+ if (drawn.teTop != null) {
+ this.wrapper.style.top = drawn.teTop + "px";
+ this.wrapper.style.left = drawn.teLeft + "px";
+ }
+ },
+
+ // Reset the input to correspond to the selection (or to be empty,
+ // when not typing and nothing is selected)
+ reset: function(typing) {
+ if (this.contextMenuPending) return;
+ var minimal, selected, cm = this.cm, doc = cm.doc;
+ if (cm.somethingSelected()) {
+ this.prevInput = "";
+ var range = doc.sel.primary();
+ minimal = hasCopyEvent &&
+ (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
+ var content = minimal ? "-" : selected || cm.getSelection();
+ this.textarea.value = content;
+ if (cm.state.focused) selectInput(this.textarea);
+ if (ie && ie_version >= 9) this.hasSelection = content;
+ } else if (!typing) {
+ this.prevInput = this.textarea.value = "";
+ if (ie && ie_version >= 9) this.hasSelection = null;
+ }
+ this.inaccurateSelection = minimal;
+ },
+
+ getField: function() { return this.textarea; },
+
+ supportsTouch: function() { return false; },
+
+ focus: function() {
+ if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
+ try { this.textarea.focus(); }
+ catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
+ }
+ },
+
+ blur: function() { this.textarea.blur(); },
+
+ resetPosition: function() {
+ this.wrapper.style.top = this.wrapper.style.left = 0;
+ },
+
+ receivedFocus: function() { this.slowPoll(); },
+
+ // Poll for input changes, using the normal rate of polling. This
+ // runs as long as the editor is focused.
+ slowPoll: function() {
+ var input = this;
+ if (input.pollingFast) return;
+ input.polling.set(this.cm.options.pollInterval, function() {
+ input.poll();
+ if (input.cm.state.focused) input.slowPoll();
+ });
+ },
+
+ // When an event has just come in that is likely to add or change
+ // something in the input textarea, we poll faster, to ensure that
+ // the change appears on the screen quickly.
+ fastPoll: function() {
+ var missed = false, input = this;
+ input.pollingFast = true;
+ function p() {
+ var changed = input.poll();
+ if (!changed && !missed) {missed = true; input.polling.set(60, p);}
+ else {input.pollingFast = false; input.slowPoll();}
+ }
+ input.polling.set(20, p);
+ },
+
+ // Read input from the textarea, and update the document to match.
+ // When something is selected, it is present in the textarea, and
+ // selected (unless it is huge, in which case a placeholder is
+ // used). When nothing is selected, the cursor sits after previously
+ // seen text (can be empty), which is stored in prevInput (we must
+ // not reset the textarea when typing, because that breaks IME).
+ poll: function() {
+ var cm = this.cm, input = this.textarea, prevInput = this.prevInput;
+ // Since this is called a *lot*, try to bail out as cheaply as
+ // possible when it is clear that nothing happened. hasSelection
+ // will be the case when there is a lot of text in the textarea,
+ // in which case reading its value would be expensive.
+ if (this.contextMenuPending || !cm.state.focused ||
+ (hasSelection(input) && !prevInput && !this.composing) ||
+ isReadOnly(cm) || cm.options.disableInput || cm.state.keySeq)
+ return false;
+
+ var text = input.value;
+ // If nothing changed, bail.
+ if (text == prevInput && !cm.somethingSelected()) return false;
+ // Work around nonsensical selection resetting in IE9/10, and
+ // inexplicable appearance of private area unicode characters on
+ // some key combos in Mac (#2689).
+ if (ie && ie_version >= 9 && this.hasSelection === text ||
+ mac && /[\uf700-\uf7ff]/.test(text)) {
+ cm.display.input.reset();
+ return false;
+ }
+
+ if (cm.doc.sel == cm.display.selForContextMenu) {
+ var first = text.charCodeAt(0);
+ if (first == 0x200b && !prevInput) prevInput = "\u200b";
+ if (first == 0x21da) { this.reset(); return this.cm.execCommand("undo"); }
+ }
+ // Find the part of the input that is actually new
+ var same = 0, l = Math.min(prevInput.length, text.length);
+ while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
+
+ var self = this;
+ runInOp(cm, function() {
+ applyTextInput(cm, text.slice(same), prevInput.length - same,
+ null, self.composing ? "*compose" : null);
+
+ // Don't leave long text in the textarea, since it makes further polling slow
+ if (text.length > 1000 || text.indexOf("\n") > -1) input.value = self.prevInput = "";
+ else self.prevInput = text;
+
+ if (self.composing) {
+ self.composing.range.clear();
+ self.composing.range = cm.markText(self.composing.start, cm.getCursor("to"),
+ {className: "CodeMirror-composing"});
+ }
+ });
+ return true;
+ },
+
+ ensurePolled: function() {
+ if (this.pollingFast && this.poll()) this.pollingFast = false;
+ },
+
+ onKeyPress: function() {
+ if (ie && ie_version >= 9) this.hasSelection = null;
+ this.fastPoll();
+ },
+
+ onContextMenu: function(e) {
+ var input = this, cm = input.cm, display = cm.display, te = input.textarea;
+ var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
+ if (!pos || presto) return; // Opera is difficult.
+
+ // Reset the current text selection only if the click is done outside of the selection
+ // and 'resetSelectionOnContextMenu' option is true.
+ var reset = cm.options.resetSelectionOnContextMenu;
+ if (reset && cm.doc.sel.contains(pos) == -1)
+ operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll);
+
+ var oldCSS = te.style.cssText;
+ input.wrapper.style.position = "absolute";
+ te.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
+ "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: " +
+ (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
+ "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
+ if (webkit) var oldScrollY = window.scrollY; // Work around Chrome issue (#2712)
+ display.input.focus();
+ if (webkit) window.scrollTo(null, oldScrollY);
+ display.input.reset();
+ // Adds "Select all" to context menu in FF
+ if (!cm.somethingSelected()) te.value = input.prevInput = " ";
+ input.contextMenuPending = true;
+ display.selForContextMenu = cm.doc.sel;
+ clearTimeout(display.detectingSelectAll);
+
+ // Select-all will be greyed out if there's nothing to select, so
+ // this adds a zero-width space so that we can later check whether
+ // it got selected.
+ function prepareSelectAllHack() {
+ if (te.selectionStart != null) {
+ var selected = cm.somethingSelected();
+ var extval = "\u200b" + (selected ? te.value : "");
+ te.value = "\u21da"; // Used to catch context-menu undo
+ te.value = extval;
+ input.prevInput = selected ? "" : "\u200b";
+ te.selectionStart = 1; te.selectionEnd = extval.length;
+ // Re-set this, in case some other handler touched the
+ // selection in the meantime.
+ display.selForContextMenu = cm.doc.sel;
+ }
+ }
+ function rehide() {
+ input.contextMenuPending = false;
+ input.wrapper.style.position = "relative";
+ te.style.cssText = oldCSS;
+ if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);
+
+ // Try to detect the user choosing select-all
+ if (te.selectionStart != null) {
+ if (!ie || (ie && ie_version < 9)) prepareSelectAllHack();
+ var i = 0, poll = function() {
+ if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 &&
+ te.selectionEnd > 0 && input.prevInput == "\u200b")
+ operation(cm, commands.selectAll)(cm);
+ else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500);
+ else display.input.reset();
+ };
+ display.detectingSelectAll = setTimeout(poll, 200);
+ }
+ }
+
+ if (ie && ie_version >= 9) prepareSelectAllHack();
+ if (captureRightClick) {
+ e_stop(e);
+ var mouseup = function() {
+ off(window, "mouseup", mouseup);
+ setTimeout(rehide, 20);
+ };
+ on(window, "mouseup", mouseup);
+ } else {
+ setTimeout(rehide, 50);
+ }
+ },
+
+ setUneditable: nothing,
+
+ needsContentAttribute: false
+ }, TextareaInput.prototype);
+
+ // CONTENTEDITABLE INPUT STYLE
+
+ function ContentEditableInput(cm) {
+ this.cm = cm;
+ this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null;
+ this.polling = new Delayed();
+ this.gracePeriod = false;
+ }
+
+ ContentEditableInput.prototype = copyObj({
+ init: function(display) {
+ var input = this, cm = input.cm;
+ var div = input.div = display.lineDiv;
+ div.contentEditable = "true";
+ disableBrowserMagic(div);
+
+ on(div, "paste", function(e) { handlePaste(e, cm); })
+
+ on(div, "compositionstart", function(e) {
+ var data = e.data;
+ input.composing = {sel: cm.doc.sel, data: data, startData: data};
+ if (!data) return;
+ var prim = cm.doc.sel.primary();
+ var line = cm.getLine(prim.head.line);
+ var found = line.indexOf(data, Math.max(0, prim.head.ch - data.length));
+ if (found > -1 && found <= prim.head.ch)
+ input.composing.sel = simpleSelection(Pos(prim.head.line, found),
+ Pos(prim.head.line, found + data.length));
+ });
+ on(div, "compositionupdate", function(e) {
+ input.composing.data = e.data;
+ });
+ on(div, "compositionend", function(e) {
+ var ours = input.composing;
+ if (!ours) return;
+ if (e.data != ours.startData && !/\u200b/.test(e.data))
+ ours.data = e.data;
+ // Need a small delay to prevent other code (input event,
+ // selection polling) from doing damage when fired right after
+ // compositionend.
+ setTimeout(function() {
+ if (!ours.handled)
+ input.applyComposition(ours);
+ if (input.composing == ours)
+ input.composing = null;
+ }, 50);
+ });
+
+ on(div, "touchstart", function() {
+ input.forceCompositionEnd();
+ });
+
+ on(div, "input", function() {
+ if (input.composing) return;
+ if (!input.pollContent())
+ runInOp(input.cm, function() {regChange(cm);});
+ });
+
+ function onCopyCut(e) {
+ if (cm.somethingSelected()) {
+ lastCopied = cm.getSelections();
+ if (e.type == "cut") cm.replaceSelection("", null, "cut");
+ } else if (!cm.options.lineWiseCopyCut) {
+ return;
+ } else {
+ var ranges = copyableRanges(cm);
+ lastCopied = ranges.text;
+ if (e.type == "cut") {
+ cm.operation(function() {
+ cm.setSelections(ranges.ranges, 0, sel_dontScroll);
+ cm.replaceSelection("", null, "cut");
+ });
+ }
+ }
+ // iOS exposes the clipboard API, but seems to discard content inserted into it
+ if (e.clipboardData && !ios) {
+ e.preventDefault();
+ e.clipboardData.clearData();
+ e.clipboardData.setData("text/plain", lastCopied.join("\n"));
+ } else {
+ // Old-fashioned briefly-focus-a-textarea hack
+ var kludge = hiddenTextarea(), te = kludge.firstChild;
+ cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);
+ te.value = lastCopied.join("\n");
+ var hadFocus = document.activeElement;
+ selectInput(te);
+ setTimeout(function() {
+ cm.display.lineSpace.removeChild(kludge);
+ hadFocus.focus();
+ }, 50);
+ }
+ }
+ on(div, "copy", onCopyCut);
+ on(div, "cut", onCopyCut);
+ },
+
+ prepareSelection: function() {
+ var result = prepareSelection(this.cm, false);
+ result.focus = this.cm.state.focused;
+ return result;
+ },
+
+ showSelection: function(info) {
+ if (!info || !this.cm.display.view.length) return;
+ if (info.focus) this.showPrimarySelection();
+ this.showMultipleSelections(info);
+ },
+
+ showPrimarySelection: function() {
+ var sel = window.getSelection(), prim = this.cm.doc.sel.primary();
+ var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset);
+ var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset);
+ if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
+ cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
+ cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
+ return;
+
+ var start = posToDOM(this.cm, prim.from());
+ var end = posToDOM(this.cm, prim.to());
+ if (!start && !end) return;
+
+ var view = this.cm.display.view;
+ var old = sel.rangeCount && sel.getRangeAt(0);
+ if (!start) {
+ start = {node: view[0].measure.map[2], offset: 0};
+ } else if (!end) { // FIXME dangerously hacky
+ var measure = view[view.length - 1].measure;
+ var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;
+ end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]};
+ }
+
+ try { var rng = range(start.node, start.offset, end.offset, end.node); }
+ catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
+ if (rng) {
+ sel.removeAllRanges();
+ sel.addRange(rng);
+ if (old && sel.anchorNode == null) sel.addRange(old);
+ else if (gecko) this.startGracePeriod();
+ }
+ this.rememberSelection();
+ },
+
+ startGracePeriod: function() {
+ var input = this;
+ clearTimeout(this.gracePeriod);
+ this.gracePeriod = setTimeout(function() {
+ input.gracePeriod = false;
+ if (input.selectionChanged())
+ input.cm.operation(function() { input.cm.curOp.selectionChanged = true; });
+ }, 20);
+ },
+
+ showMultipleSelections: function(info) {
+ removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors);
+ removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection);
+ },
+
+ rememberSelection: function() {
+ var sel = window.getSelection();
+ this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
+ this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset;
+ },
+
+ selectionInEditor: function() {
+ var sel = window.getSelection();
+ if (!sel.rangeCount) return false;
+ var node = sel.getRangeAt(0).commonAncestorContainer;
+ return contains(this.div, node);
+ },
+
+ focus: function() {
+ if (this.cm.options.readOnly != "nocursor") this.div.focus();
+ },
+ blur: function() { this.div.blur(); },
+ getField: function() { return this.div; },
+
+ supportsTouch: function() { return true; },
+
+ receivedFocus: function() {
+ var input = this;
+ if (this.selectionInEditor())
+ this.pollSelection();
+ else
+ runInOp(this.cm, function() { input.cm.curOp.selectionChanged = true; });
+
+ function poll() {
+ if (input.cm.state.focused) {
+ input.pollSelection();
+ input.polling.set(input.cm.options.pollInterval, poll);
+ }
+ }
+ this.polling.set(this.cm.options.pollInterval, poll);
+ },
+
+ selectionChanged: function() {
+ var sel = window.getSelection();
+ return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
+ sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset;
+ },
+
+ pollSelection: function() {
+ if (!this.composing && !this.gracePeriod && this.selectionChanged()) {
+ var sel = window.getSelection(), cm = this.cm;
+ this.rememberSelection();
+ var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset);
+ var head = domToPos(cm, sel.focusNode, sel.focusOffset);
+ if (anchor && head) runInOp(cm, function() {
+ setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll);
+ if (anchor.bad || head.bad) cm.curOp.selectionChanged = true;
+ });
+ }
+ },
+
+ pollContent: function() {
+ var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary();
+ var from = sel.from(), to = sel.to();
+ if (from.line < display.viewFrom || to.line > display.viewTo - 1) return false;
+
+ var fromIndex;
+ if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) {
+ var fromLine = lineNo(display.view[0].line);
+ var fromNode = display.view[0].node;
+ } else {
+ var fromLine = lineNo(display.view[fromIndex].line);
+ var fromNode = display.view[fromIndex - 1].node.nextSibling;
+ }
+ var toIndex = findViewIndex(cm, to.line);
+ if (toIndex == display.view.length - 1) {
+ var toLine = display.viewTo - 1;
+ var toNode = display.lineDiv.lastChild;
+ } else {
+ var toLine = lineNo(display.view[toIndex + 1].line) - 1;
+ var toNode = display.view[toIndex + 1].node.previousSibling;
+ }
+
+ var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine));
+ var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length));
+ while (newText.length > 1 && oldText.length > 1) {
+ if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; }
+ else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++; }
+ else break;
+ }
+
+ var cutFront = 0, cutEnd = 0;
+ var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length);
+ while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
+ ++cutFront;
+ var newBot = lst(newText), oldBot = lst(oldText);
+ var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0),
+ oldBot.length - (oldText.length == 1 ? cutFront : 0));
+ while (cutEnd < maxCutEnd &&
+ newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
+ ++cutEnd;
+
+ newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd);
+ newText[0] = newText[0].slice(cutFront);
+
+ var chFrom = Pos(fromLine, cutFront);
+ var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0);
+ if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) {
+ replaceRange(cm.doc, newText, chFrom, chTo, "+input");
+ return true;
+ }
+ },
+
+ ensurePolled: function() {
+ this.forceCompositionEnd();
+ },
+ reset: function() {
+ this.forceCompositionEnd();
+ },
+ forceCompositionEnd: function() {
+ if (!this.composing || this.composing.handled) return;
+ this.applyComposition(this.composing);
+ this.composing.handled = true;
+ this.div.blur();
+ this.div.focus();
+ },
+ applyComposition: function(composing) {
+ if (composing.data && composing.data != composing.startData)
+ operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel);
+ },
+
+ setUneditable: function(node) {
+ node.setAttribute("contenteditable", "false");
+ },
+
+ onKeyPress: function(e) {
+ e.preventDefault();
+ operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
+ },
+
+ onContextMenu: nothing,
+ resetPosition: nothing,
+
+ needsContentAttribute: true
+ }, ContentEditableInput.prototype);
+
+ function posToDOM(cm, pos) {
+ var view = findViewForLine(cm, pos.line);
+ if (!view || view.hidden) return null;
+ var line = getLine(cm.doc, pos.line);
+ var info = mapFromLineView(view, line, pos.line);
+
+ var order = getOrder(line), side = "left";
+ if (order) {
+ var partPos = getBidiPartAt(order, pos.ch);
+ side = partPos % 2 ? "right" : "left";
+ }
+ var result = nodeAndOffsetInLineMap(info.map, pos.ch, side);
+ result.offset = result.collapse == "right" ? result.end : result.start;
+ return result;
+ }
+
+ function badPos(pos, bad) { if (bad) pos.bad = true; return pos; }
+
+ function domToPos(cm, node, offset) {
+ var lineNode;
+ if (node == cm.display.lineDiv) {
+ lineNode = cm.display.lineDiv.childNodes[offset];
+ if (!lineNode) return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true);
+ node = null; offset = 0;
+ } else {
+ for (lineNode = node;; lineNode = lineNode.parentNode) {
+ if (!lineNode || lineNode == cm.display.lineDiv) return null;
+ if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break;
+ }
+ }
+ for (var i = 0; i < cm.display.view.length; i++) {
+ var lineView = cm.display.view[i];
+ if (lineView.node == lineNode)
+ return locateNodeInLineView(lineView, node, offset);
+ }
+ }
+
+ function locateNodeInLineView(lineView, node, offset) {
+ var wrapper = lineView.text.firstChild, bad = false;
+ if (!node || !contains(wrapper, node)) return badPos(Pos(lineNo(lineView.line), 0), true);
+ if (node == wrapper) {
+ bad = true;
+ node = wrapper.childNodes[offset];
+ offset = 0;
+ if (!node) {
+ var line = lineView.rest ? lst(lineView.rest) : lineView.line;
+ return badPos(Pos(lineNo(line), line.text.length), bad);
+ }
+ }
+
+ var textNode = node.nodeType == 3 ? node : null, topNode = node;
+ if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) {
+ textNode = node.firstChild;
+ if (offset) offset = textNode.nodeValue.length;
+ }
+ while (topNode.parentNode != wrapper) topNode = topNode.parentNode;
+ var measure = lineView.measure, maps = measure.maps;
+
+ function find(textNode, topNode, offset) {
+ for (var i = -1; i < (maps ? maps.length : 0); i++) {
+ var map = i < 0 ? measure.map : maps[i];
+ for (var j = 0; j < map.length; j += 3) {
+ var curNode = map[j + 2];
+ if (curNode == textNode || curNode == topNode) {
+ var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]);
+ var ch = map[j] + offset;
+ if (offset < 0 || curNode != textNode) ch = map[j + (offset ? 1 : 0)];
+ return Pos(line, ch);
+ }
+ }
+ }
+ }
+ var found = find(textNode, topNode, offset);
+ if (found) return badPos(found, bad);
+
+ // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems
+ for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
+ found = find(after, after.firstChild, 0);
+ if (found)
+ return badPos(Pos(found.line, found.ch - dist), bad);
+ else
+ dist += after.textContent.length;
+ }
+ for (var before = topNode.previousSibling, dist = offset; before; before = before.previousSibling) {
+ found = find(before, before.firstChild, -1);
+ if (found)
+ return badPos(Pos(found.line, found.ch + dist), bad);
+ else
+ dist += after.textContent.length;
+ }
+ }
+
+ function domTextBetween(cm, from, to, fromLine, toLine) {
+ var text = "", closing = false, lineSep = cm.doc.lineSeparator();
+ function recognizeMarker(id) { return function(marker) { return marker.id == id; }; }
+ function walk(node) {
+ if (node.nodeType == 1) {
+ var cmText = node.getAttribute("cm-text");
+ if (cmText != null) {
+ if (cmText == "") cmText = node.textContent.replace(/\u200b/g, "");
+ text += cmText;
+ return;
+ }
+ var markerID = node.getAttribute("cm-marker"), range;
+ if (markerID) {
+ var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID));
+ if (found.length && (range = found[0].find()))
+ text += getBetween(cm.doc, range.from, range.to).join(lineSep);
+ return;
+ }
+ if (node.getAttribute("contenteditable") == "false") return;
+ for (var i = 0; i < node.childNodes.length; i++)
+ walk(node.childNodes[i]);
+ if (/^(pre|div|p)$/i.test(node.nodeName))
+ closing = true;
+ } else if (node.nodeType == 3) {
+ var val = node.nodeValue;
+ if (!val) return;
+ if (closing) {
+ text += lineSep;
+ closing = false;
+ }
+ text += val;
+ }
+ }
+ for (;;) {
+ walk(from);
+ if (from == to) break;
+ from = from.nextSibling;
+ }
+ return text;
+ }
+
+ CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};
+
</ins><span class="cx"> // SELECTION / CURSOR
</span><span class="cx">
</span><span class="cx"> // Selection objects are immutable. A new one is created every time
</span><span class="lines">@@ -1244,40 +2258,30 @@
</span><span class="cx">
</span><span class="cx"> // SELECTION DRAWING
</span><span class="cx">
</span><del>- // Redraw the selection and/or cursor
</del><span class="cx"> function updateSelection(cm) {
</span><del>- var display = cm.display, doc = cm.doc;
- var curFragment = document.createDocumentFragment();
- var selFragment = document.createDocumentFragment();
</del><ins>+ cm.display.input.showSelection(cm.display.input.prepareSelection());
+ }
</ins><span class="cx">
</span><ins>+ function prepareSelection(cm, primary) {
+ var doc = cm.doc, result = {};
+ var curFragment = result.cursors = document.createDocumentFragment();
+ var selFragment = result.selection = document.createDocumentFragment();
+
</ins><span class="cx"> for (var i = 0; i < doc.sel.ranges.length; i++) {
</span><ins>+ if (primary === false && i == doc.sel.primIndex) continue;
</ins><span class="cx"> var range = doc.sel.ranges[i];
</span><span class="cx"> var collapsed = range.empty();
</span><span class="cx"> if (collapsed || cm.options.showCursorWhenSelecting)
</span><del>- drawSelectionCursor(cm, range, curFragment);
</del><ins>+ drawSelectionCursor(cm, range.head, curFragment);
</ins><span class="cx"> if (!collapsed)
</span><span class="cx"> drawSelectionRange(cm, range, selFragment);
</span><span class="cx"> }
</span><del>-
- // Move the hidden textarea near the cursor to prevent scrolling artifacts
- if (cm.options.moveInputWithCursor) {
- var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
- var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
- var top = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
- headPos.top + lineOff.top - wrapOff.top));
- var left = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
- headPos.left + lineOff.left - wrapOff.left));
- display.inputDiv.style.top = top + "px";
- display.inputDiv.style.left = left + "px";
- }
-
- removeChildrenAndAdd(display.cursorDiv, curFragment);
- removeChildrenAndAdd(display.selectionDiv, selFragment);
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Draws a cursor for the given range
</span><del>- function drawSelectionCursor(cm, range, output) {
- var pos = cursorCoords(cm, range.head, "div");
</del><ins>+ function drawSelectionCursor(cm, head, output) {
+ var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine);
</ins><span class="cx">
</span><span class="cx"> var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
</span><span class="cx"> cursor.style.left = pos.left + "px";
</span><span class="lines">@@ -1298,7 +2302,8 @@
</span><span class="cx"> function drawSelectionRange(cm, range, output) {
</span><span class="cx"> var display = cm.display, doc = cm.doc;
</span><span class="cx"> var fragment = document.createDocumentFragment();
</span><del>- var padding = paddingH(cm.display), leftSide = padding.left, rightSide = display.lineSpace.offsetWidth - padding.right;
</del><ins>+ var padding = paddingH(cm.display), leftSide = padding.left;
+ var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right;
</ins><span class="cx">
</span><span class="cx"> function add(left, top, width, bottom) {
</span><span class="cx"> if (top < 0) top = 0;
</span><span class="lines">@@ -1379,6 +2384,8 @@
</span><span class="cx"> display.blinker = setInterval(function() {
</span><span class="cx"> display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden";
</span><span class="cx"> }, cm.options.cursorBlinkRate);
</span><ins>+ else if (cm.options.cursorBlinkRate < 0)
+ display.cursorDiv.style.visibility = "hidden";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // HIGHLIGHT WORKER
</span><span class="lines">@@ -1394,18 +2401,20 @@
</span><span class="cx"> if (doc.frontier >= cm.display.viewTo) return;
</span><span class="cx"> var end = +new Date + cm.options.workTime;
</span><span class="cx"> var state = copyState(doc.mode, getStateBefore(cm, doc.frontier));
</span><ins>+ var changedLines = [];
</ins><span class="cx">
</span><del>- runInOp(cm, function() {
</del><span class="cx"> doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
</span><span class="cx"> if (doc.frontier >= cm.display.viewFrom) { // Visible
</span><span class="cx"> var oldStyles = line.styles;
</span><span class="cx"> var highlighted = highlightLine(cm, line, state, true);
</span><span class="cx"> line.styles = highlighted.styles;
</span><del>- if (highlighted.classes) line.styleClasses = highlighted.classes;
- else if (line.styleClasses) line.styleClasses = null;
- var ischange = !oldStyles || oldStyles.length != line.styles.length;
</del><ins>+ var oldCls = line.styleClasses, newCls = highlighted.classes;
+ if (newCls) line.styleClasses = newCls;
+ else if (oldCls) line.styleClasses = null;
+ var ischange = !oldStyles || oldStyles.length != line.styles.length ||
+ oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass);
</ins><span class="cx"> for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];
</span><del>- if (ischange) regLineChange(cm, doc.frontier, "text");
</del><ins>+ if (ischange) changedLines.push(doc.frontier);
</ins><span class="cx"> line.stateAfter = copyState(doc.mode, state);
</span><span class="cx"> } else {
</span><span class="cx"> processLine(cm, line.text, state);
</span><span class="lines">@@ -1417,6 +2426,9 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> });
</span><ins>+ if (changedLines.length) runInOp(cm, function() {
+ for (var i = 0; i < changedLines.length; i++)
+ regLineChange(cm, changedLines[i], "text");
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1470,13 +2482,21 @@
</span><span class="cx"> return data;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth; }
+ function displayWidth(cm) {
+ return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth;
+ }
+ function displayHeight(cm) {
+ return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight;
+ }
+
</ins><span class="cx"> // Ensure the lineView.wrapping.heights array is populated. This is
</span><span class="cx"> // an array of bottom offsets for the lines that make up a drawn
</span><span class="cx"> // line. When lineWrapping is on, there might be more than one
</span><span class="cx"> // height.
</span><span class="cx"> function ensureLineHeights(cm, lineView, rect) {
</span><span class="cx"> var wrapping = cm.options.lineWrapping;
</span><del>- var curWidth = wrapping && cm.display.scroller.clientWidth;
</del><ins>+ var curWidth = wrapping && displayWidth(cm);
</ins><span class="cx"> if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) {
</span><span class="cx"> var heights = lineView.measure.heights = [];
</span><span class="cx"> if (wrapping) {
</span><span class="lines">@@ -1542,10 +2562,12 @@
</span><span class="cx"> function prepareMeasureForLine(cm, line) {
</span><span class="cx"> var lineN = lineNo(line);
</span><span class="cx"> var view = findViewForLine(cm, lineN);
</span><del>- if (view && !view.text)
</del><ins>+ if (view && !view.text) {
</ins><span class="cx"> view = null;
</span><del>- else if (view && view.changes)
</del><ins>+ } else if (view && view.changes) {
</ins><span class="cx"> updateLineForChanges(cm, view, lineN, getDimensions(cm));
</span><ins>+ cm.curOp.forceUpdate = true;
+ }
</ins><span class="cx"> if (!view)
</span><span class="cx"> view = updateExternalMeasurement(cm, line);
</span><span class="cx">
</span><span class="lines">@@ -1559,7 +2581,7 @@
</span><span class="cx">
</span><span class="cx"> // Given a prepared measurement object, measures the position of an
</span><span class="cx"> // actual character (or fetches it from the cache).
</span><del>- function measureCharPrepared(cm, prepared, ch, bias) {
</del><ins>+ function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
</ins><span class="cx"> if (prepared.before) ch = -1;
</span><span class="cx"> var key = ch + (bias || ""), found;
</span><span class="cx"> if (prepared.cache.hasOwnProperty(key)) {
</span><span class="lines">@@ -1574,14 +2596,14 @@
</span><span class="cx"> found = measureCharInner(cm, prepared, ch, bias);
</span><span class="cx"> if (!found.bogus) prepared.cache[key] = found;
</span><span class="cx"> }
</span><del>- return {left: found.left, right: found.right, top: found.top, bottom: found.bottom};
</del><ins>+ return {left: found.left, right: found.right,
+ top: varHeight ? found.rtop : found.top,
+ bottom: varHeight ? found.rbottom : found.bottom};
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var nullRect = {left: 0, right: 0, top: 0, bottom: 0};
</span><span class="cx">
</span><del>- function measureCharInner(cm, prepared, ch, bias) {
- var map = prepared.map;
-
</del><ins>+ function nodeAndOffsetInLineMap(map, ch, bias) {
</ins><span class="cx"> var node, start, end, collapse;
</span><span class="cx"> // First, search the line map for the text node corresponding to,
</span><span class="cx"> // or closest to, the target character.
</span><span class="lines">@@ -1615,22 +2637,35 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd};
+ }
</ins><span class="cx">
</span><ins>+ function measureCharInner(cm, prepared, ch, bias) {
+ var place = nodeAndOffsetInLineMap(prepared.map, ch, bias);
+ var node = place.node, start = place.start, end = place.end, collapse = place.collapse;
+
</ins><span class="cx"> var rect;
</span><span class="cx"> if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
</span><del>- while (start && isExtendingChar(prepared.line.text.charAt(mStart + start))) --start;
- while (mStart + end < mEnd && isExtendingChar(prepared.line.text.charAt(mStart + end))) ++end;
- if (ie_upto8 && start == 0 && end == mEnd - mStart) {
- rect = node.parentNode.getBoundingClientRect();
- } else if (ie && cm.options.lineWrapping) {
- var rects = range(node, start, end).getClientRects();
- if (rects.length)
- rect = rects[bias == "right" ? rects.length - 1 : 0];
- else
- rect = nullRect;
- } else {
- rect = range(node, start, end).getBoundingClientRect() || nullRect;
</del><ins>+ for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned
+ while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) --start;
+ while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) ++end;
+ if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart) {
+ rect = node.parentNode.getBoundingClientRect();
+ } else if (ie && cm.options.lineWrapping) {
+ var rects = range(node, start, end).getClientRects();
+ if (rects.length)
+ rect = rects[bias == "right" ? rects.length - 1 : 0];
+ else
+ rect = nullRect;
+ } else {
+ rect = range(node, start, end).getBoundingClientRect() || nullRect;
+ }
+ if (rect.left || rect.right || start == 0) break;
+ end = start;
+ start = start - 1;
+ collapse = "right";
</ins><span class="cx"> }
</span><ins>+ if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect);
</ins><span class="cx"> } else { // If it is a widget, simply get the box for the whole widget.
</span><span class="cx"> if (start > 0) collapse = bias = "right";
</span><span class="cx"> var rects;
</span><span class="lines">@@ -1639,7 +2674,7 @@
</span><span class="cx"> else
</span><span class="cx"> rect = node.getBoundingClientRect();
</span><span class="cx"> }
</span><del>- if (ie_upto8 && !start && (!rect || !rect.left && !rect.right)) {
</del><ins>+ if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) {
</ins><span class="cx"> var rSpan = node.parentNode.getClientRects()[0];
</span><span class="cx"> if (rSpan)
</span><span class="cx"> rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom};
</span><span class="lines">@@ -1647,18 +2682,33 @@
</span><span class="cx"> rect = nullRect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var top, bot = (rect.bottom + rect.top) / 2 - prepared.rect.top;
</del><ins>+ var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top;
+ var mid = (rtop + rbot) / 2;
</ins><span class="cx"> var heights = prepared.view.measure.heights;
</span><span class="cx"> for (var i = 0; i < heights.length - 1; i++)
</span><del>- if (bot < heights[i]) break;
- top = i ? heights[i - 1] : 0; bot = heights[i];
</del><ins>+ if (mid < heights[i]) break;
+ var top = i ? heights[i - 1] : 0, bot = heights[i];
</ins><span class="cx"> var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
</span><span class="cx"> right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
</span><span class="cx"> top: top, bottom: bot};
</span><span class="cx"> if (!rect.left && !rect.right) result.bogus = true;
</span><ins>+ if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot; }
+
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Work around problem with bounding client rects on ranges being
+ // returned incorrectly when zoomed on IE10 and below.
+ function maybeUpdateRectForZooming(measure, rect) {
+ if (!window.screen || screen.logicalXDPI == null ||
+ screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure))
+ return rect;
+ var scaleX = screen.logicalXDPI / screen.deviceXDPI;
+ var scaleY = screen.logicalYDPI / screen.deviceYDPI;
+ return {left: rect.left * scaleX, right: rect.right * scaleX,
+ top: rect.top * scaleY, bottom: rect.bottom * scaleY};
+ }
+
</ins><span class="cx"> function clearLineMeasurementCacheFor(lineView) {
</span><span class="cx"> if (lineView.measure) {
</span><span class="cx"> lineView.measure.cache = {};
</span><span class="lines">@@ -1687,7 +2737,8 @@
</span><span class="cx">
</span><span class="cx"> // Converts a {top, bottom, left, right} box from line-local
</span><span class="cx"> // coordinates into another coordinate system. Context may be one of
</span><del>- // "line", "div" (display.lineDiv), "local"/null (editor), or "page".
</del><ins>+ // "line", "div" (display.lineDiv), "local"/null (editor), "window",
+ // or "page".
</ins><span class="cx"> function intoCoordSystem(cm, lineObj, rect, context) {
</span><span class="cx"> if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
</span><span class="cx"> var size = widgetHeight(lineObj.widgets[i]);
</span><span class="lines">@@ -1735,11 +2786,11 @@
</span><span class="cx"> // Returns a box for a given cursor position, which may have an
</span><span class="cx"> // 'other' property containing the position of the secondary cursor
</span><span class="cx"> // on a bidi boundary.
</span><del>- function cursorCoords(cm, pos, context, lineObj, preparedMeasure) {
</del><ins>+ function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) {
</ins><span class="cx"> lineObj = lineObj || getLine(cm.doc, pos.line);
</span><span class="cx"> if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj);
</span><span class="cx"> function get(ch, right) {
</span><del>- var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left");
</del><ins>+ var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight);
</ins><span class="cx"> if (right) m.left = m.right; else m.right = m.left;
</span><span class="cx"> return intoCoordSystem(cm, lineObj, m, context);
</span><span class="cx"> }
</span><span class="lines">@@ -1891,10 +2942,13 @@
</span><span class="cx"> // error-prone). Instead, display updates are batched and then all
</span><span class="cx"> // combined and executed at once.
</span><span class="cx">
</span><ins>+ var operationGroup = null;
+
</ins><span class="cx"> var nextOpId = 0;
</span><span class="cx"> // Start a new operation.
</span><span class="cx"> function startOperation(cm) {
</span><span class="cx"> cm.curOp = {
</span><ins>+ cm: cm,
</ins><span class="cx"> viewChanged: false, // Flag that indicates that lines might need to be redrawn
</span><span class="cx"> startHeight: cm.doc.height, // Used to detect need to update scrollbar
</span><span class="cx"> forceUpdate: false, // Used to force a redraw
</span><span class="lines">@@ -1902,60 +2956,160 @@
</span><span class="cx"> typing: false, // Whether this reset should be careful to leave existing text (for compositing)
</span><span class="cx"> changeObjs: null, // Accumulated changes, for firing change events
</span><span class="cx"> cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on
</span><ins>+ cursorActivityCalled: 0, // Tracks which cursorActivity handlers have been called already
</ins><span class="cx"> selectionChanged: false, // Whether the selection needs to be redrawn
</span><span class="cx"> updateMaxLine: false, // Set when the widest line needs to be determined anew
</span><span class="cx"> scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet
</span><span class="cx"> scrollToPos: null, // Used to scroll to a specific position
</span><ins>+ focus: false,
</ins><span class="cx"> id: ++nextOpId // Unique ID
</span><span class="cx"> };
</span><del>- if (!delayedCallbackDepth++) delayedCallbacks = [];
</del><ins>+ if (operationGroup) {
+ operationGroup.ops.push(cm.curOp);
+ } else {
+ cm.curOp.ownsGroup = operationGroup = {
+ ops: [cm.curOp],
+ delayedCallbacks: []
+ };
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ function fireCallbacksForOps(group) {
+ // Calls delayed callbacks and cursorActivity handlers until no
+ // new ones appear
+ var callbacks = group.delayedCallbacks, i = 0;
+ do {
+ for (; i < callbacks.length; i++)
+ callbacks[i].call(null);
+ for (var j = 0; j < group.ops.length; j++) {
+ var op = group.ops[j];
+ if (op.cursorActivityHandlers)
+ while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
+ op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm);
+ }
+ } while (i < callbacks.length);
+ }
+
</ins><span class="cx"> // Finish an operation, updating the display and signalling delayed events
</span><span class="cx"> function endOperation(cm) {
</span><del>- var op = cm.curOp, doc = cm.doc, display = cm.display;
- cm.curOp = null;
</del><ins>+ var op = cm.curOp, group = op.ownsGroup;
+ if (!group) return;
</ins><span class="cx">
</span><ins>+ try { fireCallbacksForOps(group); }
+ finally {
+ operationGroup = null;
+ for (var i = 0; i < group.ops.length; i++)
+ group.ops[i].cm.curOp = null;
+ endOperations(group);
+ }
+ }
+
+ // The DOM updates done when an operation finishes are batched so
+ // that the minimum number of relayouts are required.
+ function endOperations(group) {
+ var ops = group.ops;
+ for (var i = 0; i < ops.length; i++) // Read DOM
+ endOperation_R1(ops[i]);
+ for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
+ endOperation_W1(ops[i]);
+ for (var i = 0; i < ops.length; i++) // Read DOM
+ endOperation_R2(ops[i]);
+ for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
+ endOperation_W2(ops[i]);
+ for (var i = 0; i < ops.length; i++) // Read DOM
+ endOperation_finish(ops[i]);
+ }
+
+ function endOperation_R1(op) {
+ var cm = op.cm, display = cm.display;
+ maybeClipScrollbars(cm);
</ins><span class="cx"> if (op.updateMaxLine) findMaxLine(cm);
</span><span class="cx">
</span><del>- // If it looks like an update might be needed, call updateDisplay
- if (op.viewChanged || op.forceUpdate || op.scrollTop != null ||
- op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
- op.scrollToPos.to.line >= display.viewTo) ||
- display.maxLineChanged && cm.options.lineWrapping) {
- var updated = updateDisplay(cm, {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
- if (cm.display.scroller.offsetHeight) cm.doc.scrollTop = cm.display.scroller.scrollTop;
</del><ins>+ op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null ||
+ op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
+ op.scrollToPos.to.line >= display.viewTo) ||
+ display.maxLineChanged && cm.options.lineWrapping;
+ op.update = op.mustUpdate &&
+ new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
+ }
+
+ function endOperation_W1(op) {
+ op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update);
+ }
+
+ function endOperation_R2(op) {
+ var cm = op.cm, display = cm.display;
+ if (op.updatedDisplay) updateHeightsInViewport(cm);
+
+ op.barMeasure = measureForScrollbars(cm);
+
+ // If the max line changed since it was last measured, measure it,
+ // and ensure the document's width matches it.
+ // updateDisplay_W2 will use these properties to do the actual resizing
+ if (display.maxLineChanged && !cm.options.lineWrapping) {
+ op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
+ cm.display.sizerWidth = op.adjustWidthTo;
+ op.barMeasure.scrollWidth =
+ Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth);
+ op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm));
</ins><span class="cx"> }
</span><del>- // If no update was run, but the selection changed, redraw that.
- if (!updated && op.selectionChanged) updateSelection(cm);
- if (!updated && op.startHeight != cm.doc.height) updateScrollbars(cm);
</del><span class="cx">
</span><ins>+ if (op.updatedDisplay || op.selectionChanged)
+ op.preparedSelection = display.input.prepareSelection();
+ }
+
+ function endOperation_W2(op) {
+ var cm = op.cm;
+
+ if (op.adjustWidthTo != null) {
+ cm.display.sizer.style.minWidth = op.adjustWidthTo + "px";
+ if (op.maxScrollLeft < cm.doc.scrollLeft)
+ setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true);
+ cm.display.maxLineChanged = false;
+ }
+
+ if (op.preparedSelection)
+ cm.display.input.showSelection(op.preparedSelection);
+ if (op.updatedDisplay)
+ setDocumentHeight(cm, op.barMeasure);
+ if (op.updatedDisplay || op.startHeight != cm.doc.height)
+ updateScrollbars(cm, op.barMeasure);
+
+ if (op.selectionChanged) restartBlink(cm);
+
+ if (cm.state.focused && op.updateInput)
+ cm.display.input.reset(op.typing);
+ if (op.focus && op.focus == activeElt()) ensureFocus(op.cm);
+ }
+
+ function endOperation_finish(op) {
+ var cm = op.cm, display = cm.display, doc = cm.doc;
+
+ if (op.updatedDisplay) postUpdateDisplay(cm, op.update);
+
</ins><span class="cx"> // Abort mouse wheel delta measurement, when scrolling explicitly
</span><span class="cx"> if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
</span><span class="cx"> display.wheelStartX = display.wheelStartY = null;
</span><span class="cx">
</span><span class="cx"> // Propagate the scroll position to the actual DOM scroller
</span><del>- if (op.scrollTop != null && display.scroller.scrollTop != op.scrollTop) {
- var top = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
- display.scroller.scrollTop = display.scrollbarV.scrollTop = doc.scrollTop = top;
</del><ins>+ if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) {
+ doc.scrollTop = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
+ display.scrollbars.setScrollTop(doc.scrollTop);
+ display.scroller.scrollTop = doc.scrollTop;
</ins><span class="cx"> }
</span><del>- if (op.scrollLeft != null && display.scroller.scrollLeft != op.scrollLeft) {
- var left = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft));
- display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = left;
</del><ins>+ if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
+ doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - displayWidth(cm), op.scrollLeft));
+ display.scrollbars.setScrollLeft(doc.scrollLeft);
+ display.scroller.scrollLeft = doc.scrollLeft;
</ins><span class="cx"> alignHorizontally(cm);
</span><span class="cx"> }
</span><span class="cx"> // If we need to scroll a specific position into view, do so.
</span><span class="cx"> if (op.scrollToPos) {
</span><del>- var coords = scrollPosIntoView(cm, clipPos(cm.doc, op.scrollToPos.from),
- clipPos(cm.doc, op.scrollToPos.to), op.scrollToPos.margin);
</del><ins>+ var coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
+ clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin);
</ins><span class="cx"> if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (op.selectionChanged) restartBlink(cm);
-
- if (cm.state.focused && op.updateInput)
- resetInput(cm, op.typing);
-
</del><span class="cx"> // Fire events for markers that are hidden/unidden by editing or
</span><span class="cx"> // undoing
</span><span class="cx"> var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers;
</span><span class="lines">@@ -1964,18 +3118,14 @@
</span><span class="cx"> if (unhidden) for (var i = 0; i < unhidden.length; ++i)
</span><span class="cx"> if (unhidden[i].lines.length) signal(unhidden[i], "unhide");
</span><span class="cx">
</span><del>- var delayed;
- if (!--delayedCallbackDepth) {
- delayed = delayedCallbacks;
- delayedCallbacks = null;
- }
</del><ins>+ if (display.wrapper.offsetHeight)
+ doc.scrollTop = cm.display.scroller.scrollTop;
+
</ins><span class="cx"> // Fire change events, and delayed event handlers
</span><span class="cx"> if (op.changeObjs)
</span><span class="cx"> signal(cm, "changes", cm, op.changeObjs);
</span><del>- if (delayed) for (var i = 0; i < delayed.length; ++i) delayed[i]();
- if (op.cursorActivityHandlers)
- for (var i = 0; i < op.cursorActivityHandlers.length; i++)
- op.cursorActivityHandlers[i](cm);
</del><ins>+ if (op.update)
+ op.update.finish();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Run the given function in an operation
</span><span class="lines">@@ -2201,152 +3351,6 @@
</span><span class="cx"> return dirty;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // INPUT HANDLING
-
- // Poll for input changes, using the normal rate of polling. This
- // runs as long as the editor is focused.
- function slowPoll(cm) {
- if (cm.display.pollingFast) return;
- cm.display.poll.set(cm.options.pollInterval, function() {
- readInput(cm);
- if (cm.state.focused) slowPoll(cm);
- });
- }
-
- // When an event has just come in that is likely to add or change
- // something in the input textarea, we poll faster, to ensure that
- // the change appears on the screen quickly.
- function fastPoll(cm) {
- var missed = false;
- cm.display.pollingFast = true;
- function p() {
- var changed = readInput(cm);
- if (!changed && !missed) {missed = true; cm.display.poll.set(60, p);}
- else {cm.display.pollingFast = false; slowPoll(cm);}
- }
- cm.display.poll.set(20, p);
- }
-
- // Read input from the textarea, and update the document to match.
- // When something is selected, it is present in the textarea, and
- // selected (unless it is huge, in which case a placeholder is
- // used). When nothing is selected, the cursor sits after previously
- // seen text (can be empty), which is stored in prevInput (we must
- // not reset the textarea when typing, because that breaks IME).
- function readInput(cm) {
- var input = cm.display.input, prevInput = cm.display.prevInput, doc = cm.doc;
- // Since this is called a *lot*, try to bail out as cheaply as
- // possible when it is clear that nothing happened. hasSelection
- // will be the case when there is a lot of text in the textarea,
- // in which case reading its value would be expensive.
- if (!cm.state.focused || (hasSelection(input) && !prevInput) || isReadOnly(cm) || cm.options.disableInput)
- return false;
- // See paste handler for more on the fakedLastChar kludge
- if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
- input.value = input.value.substring(0, input.value.length - 1);
- cm.state.fakedLastChar = false;
- }
- var text = input.value;
- // If nothing changed, bail.
- if (text == prevInput && !cm.somethingSelected()) return false;
- // Work around nonsensical selection resetting in IE9/10
- if (ie && !ie_upto8 && cm.display.inputHasSelection === text) {
- resetInput(cm);
- return false;
- }
-
- var withOp = !cm.curOp;
- if (withOp) startOperation(cm);
- cm.display.shift = false;
-
- if (text.charCodeAt(0) == 0x200b && doc.sel == cm.display.selForContextMenu && !prevInput)
- prevInput = "\u200b";
- // Find the part of the input that is actually new
- var same = 0, l = Math.min(prevInput.length, text.length);
- while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
- var inserted = text.slice(same), textLines = splitLines(inserted);
-
- // When pasing N lines into N selections, insert one line per selection
- var multiPaste = cm.state.pasteIncoming && textLines.length > 1 && doc.sel.ranges.length == textLines.length;
-
- // Normal behavior is to insert the new text into every selection
- for (var i = doc.sel.ranges.length - 1; i >= 0; i--) {
- var range = doc.sel.ranges[i];
- var from = range.from(), to = range.to();
- // Handle deletion
- if (same < prevInput.length)
- from = Pos(from.line, from.ch - (prevInput.length - same));
- // Handle overwrite
- else if (cm.state.overwrite && range.empty() && !cm.state.pasteIncoming)
- to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
- var updateInput = cm.curOp.updateInput;
- var changeEvent = {from: from, to: to, text: multiPaste ? [textLines[i]] : textLines,
- origin: cm.state.pasteIncoming ? "paste" : cm.state.cutIncoming ? "cut" : "+input"};
- makeChange(cm.doc, changeEvent);
- signalLater(cm, "inputRead", cm, changeEvent);
- // When an 'electric' character is inserted, immediately trigger a reindent
- if (inserted && !cm.state.pasteIncoming && cm.options.electricChars &&
- cm.options.smartIndent && range.head.ch < 100 &&
- (!i || doc.sel.ranges[i - 1].head.line != range.head.line)) {
- var mode = cm.getModeAt(range.head);
- if (mode.electricChars) {
- for (var j = 0; j < mode.electricChars.length; j++)
- if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
- indentLine(cm, range.head.line, "smart");
- break;
- }
- } else if (mode.electricInput) {
- var end = changeEnd(changeEvent);
- if (mode.electricInput.test(getLine(doc, end.line).text.slice(0, end.ch)))
- indentLine(cm, range.head.line, "smart");
- }
- }
- }
- ensureCursorVisible(cm);
- cm.curOp.updateInput = updateInput;
- cm.curOp.typing = true;
-
- // Don't leave long text in the textarea, since it makes further polling slow
- if (text.length > 1000 || text.indexOf("\n") > -1) input.value = cm.display.prevInput = "";
- else cm.display.prevInput = text;
- if (withOp) endOperation(cm);
- cm.state.pasteIncoming = cm.state.cutIncoming = false;
- return true;
- }
-
- // Reset the input to correspond to the selection (or to be empty,
- // when not typing and nothing is selected)
- function resetInput(cm, typing) {
- var minimal, selected, doc = cm.doc;
- if (cm.somethingSelected()) {
- cm.display.prevInput = "";
- var range = doc.sel.primary();
- minimal = hasCopyEvent &&
- (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
- var content = minimal ? "-" : selected || cm.getSelection();
- cm.display.input.value = content;
- if (cm.state.focused) selectInput(cm.display.input);
- if (ie && !ie_upto8) cm.display.inputHasSelection = content;
- } else if (!typing) {
- cm.display.prevInput = cm.display.input.value = "";
- if (ie && !ie_upto8) cm.display.inputHasSelection = null;
- }
- cm.display.inaccurateSelection = minimal;
- }
-
- function focusInput(cm) {
- if (cm.options.readOnly != "nocursor" && (!mobile || activeElt() != cm.display.input))
- cm.display.input.focus();
- }
-
- function ensureFocus(cm) {
- if (!cm.state.focused) { focusInput(cm); onFocus(cm); }
- }
-
- function isReadOnly(cm) {
- return cm.options.readOnly || cm.doc.cantEdit;
- }
-
</del><span class="cx"> // EVENT HANDLERS
</span><span class="cx">
</span><span class="cx"> // Attach the necessary event handlers when initializing the editor
</span><span class="lines">@@ -2354,26 +3358,75 @@
</span><span class="cx"> var d = cm.display;
</span><span class="cx"> on(d.scroller, "mousedown", operation(cm, onMouseDown));
</span><span class="cx"> // Older IE's will not fire a second mousedown for a double click
</span><del>- if (ie_upto10)
</del><ins>+ if (ie && ie_version < 11)
</ins><span class="cx"> on(d.scroller, "dblclick", operation(cm, function(e) {
</span><span class="cx"> if (signalDOMEvent(cm, e)) return;
</span><span class="cx"> var pos = posFromMouse(cm, e);
</span><span class="cx"> if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return;
</span><span class="cx"> e_preventDefault(e);
</span><del>- var word = findWordAt(cm, pos);
</del><ins>+ var word = cm.findWordAt(pos);
</ins><span class="cx"> extendSelection(cm.doc, word.anchor, word.head);
</span><span class="cx"> }));
</span><span class="cx"> else
</span><span class="cx"> on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e); });
</span><del>- // Prevent normal selection in the editor (we handle our own)
- on(d.lineSpace, "selectstart", function(e) {
- if (!eventInWidget(d, e)) e_preventDefault(e);
- });
</del><span class="cx"> // Some browsers fire contextmenu *after* opening the menu, at
</span><span class="cx"> // which point we can't mess with it anymore. Context menu is
</span><span class="cx"> // handled in onMouseDown for these browsers.
</span><span class="cx"> if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e);});
</span><span class="cx">
</span><ins>+ // Used to suppress mouse event handling when a touch happens
+ var touchFinished, prevTouch = {end: 0};
+ function finishTouch() {
+ if (d.activeTouch) {
+ touchFinished = setTimeout(function() {d.activeTouch = null;}, 1000);
+ prevTouch = d.activeTouch;
+ prevTouch.end = +new Date;
+ }
+ };
+ function isMouseLikeTouchEvent(e) {
+ if (e.touches.length != 1) return false;
+ var touch = e.touches[0];
+ return touch.radiusX <= 1 && touch.radiusY <= 1;
+ }
+ function farAway(touch, other) {
+ if (other.left == null) return true;
+ var dx = other.left - touch.left, dy = other.top - touch.top;
+ return dx * dx + dy * dy > 20 * 20;
+ }
+ on(d.scroller, "touchstart", function(e) {
+ if (!isMouseLikeTouchEvent(e)) {
+ clearTimeout(touchFinished);
+ var now = +new Date;
+ d.activeTouch = {start: now, moved: false,
+ prev: now - prevTouch.end <= 300 ? prevTouch : null};
+ if (e.touches.length == 1) {
+ d.activeTouch.left = e.touches[0].pageX;
+ d.activeTouch.top = e.touches[0].pageY;
+ }
+ }
+ });
+ on(d.scroller, "touchmove", function() {
+ if (d.activeTouch) d.activeTouch.moved = true;
+ });
+ on(d.scroller, "touchend", function(e) {
+ var touch = d.activeTouch;
+ if (touch && !eventInWidget(d, e) && touch.left != null &&
+ !touch.moved && new Date - touch.start < 300) {
+ var pos = cm.coordsChar(d.activeTouch, "page"), range;
+ if (!touch.prev || farAway(touch, touch.prev)) // Single tap
+ range = new Range(pos, pos);
+ else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap
+ range = cm.findWordAt(pos);
+ else // Triple tap
+ range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0)));
+ cm.setSelection(range.anchor, range.head);
+ cm.focus();
+ e_preventDefault(e);
+ }
+ finishTouch();
+ });
+ on(d.scroller, "touchcancel", finishTouch);
+
</ins><span class="cx"> // Sync scrolling between fake scrollbars and real scrollable
</span><span class="cx"> // area, ensure viewport is updated when scrolling.
</span><span class="cx"> on(d.scroller, "scroll", function() {
</span><span class="lines">@@ -2383,105 +3436,51 @@
</span><span class="cx"> signal(cm, "scroll", cm);
</span><span class="cx"> }
</span><span class="cx"> });
</span><del>- on(d.scrollbarV, "scroll", function() {
- if (d.scroller.clientHeight) setScrollTop(cm, d.scrollbarV.scrollTop);
- });
- on(d.scrollbarH, "scroll", function() {
- if (d.scroller.clientHeight) setScrollLeft(cm, d.scrollbarH.scrollLeft);
- });
</del><span class="cx">
</span><span class="cx"> // Listen to wheel events in order to try and update the viewport on time.
</span><span class="cx"> on(d.scroller, "mousewheel", function(e){onScrollWheel(cm, e);});
</span><span class="cx"> on(d.scroller, "DOMMouseScroll", function(e){onScrollWheel(cm, e);});
</span><span class="cx">
</span><del>- // Prevent clicks in the scrollbars from killing focus
- function reFocus() { if (cm.state.focused) setTimeout(bind(focusInput, cm), 0); }
- on(d.scrollbarH, "mousedown", reFocus);
- on(d.scrollbarV, "mousedown", reFocus);
</del><span class="cx"> // Prevent wrapper from ever scrolling
</span><span class="cx"> on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
</span><span class="cx">
</span><del>- on(d.input, "keyup", operation(cm, onKeyUp));
- on(d.input, "input", function() {
- if (ie && !ie_upto8 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
- fastPoll(cm);
- });
- on(d.input, "keydown", operation(cm, onKeyDown));
- on(d.input, "keypress", operation(cm, onKeyPress));
- on(d.input, "focus", bind(onFocus, cm));
- on(d.input, "blur", bind(onBlur, cm));
</del><ins>+ d.dragFunctions = {
+ enter: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e);},
+ over: function(e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e); }},
+ start: function(e){onDragStart(cm, e);},
+ drop: operation(cm, onDrop),
+ leave: function() {clearDragCursor(cm);}
+ };
</ins><span class="cx">
</span><del>- function drag_(e) {
- if (!signalDOMEvent(cm, e)) e_stop(e);
- }
- if (cm.options.dragDrop) {
- on(d.scroller, "dragstart", function(e){onDragStart(cm, e);});
- on(d.scroller, "dragenter", drag_);
- on(d.scroller, "dragover", drag_);
- on(d.scroller, "drop", operation(cm, onDrop));
- }
- on(d.scroller, "paste", function(e) {
- if (eventInWidget(d, e)) return;
- cm.state.pasteIncoming = true;
- focusInput(cm);
- fastPoll(cm);
- });
- on(d.input, "paste", function() {
- // Workaround for webkit bug https://bugs.webkit.org/show_bug.cgi?id=90206
- // Add a char to the end of textarea before paste occur so that
- // selection doesn't span to the end of textarea.
- if (webkit && !cm.state.fakedLastChar && !(new Date - cm.state.lastMiddleDown < 200)) {
- var start = d.input.selectionStart, end = d.input.selectionEnd;
- d.input.value += "$";
- d.input.selectionStart = start;
- d.input.selectionEnd = end;
- cm.state.fakedLastChar = true;
- }
- cm.state.pasteIncoming = true;
- fastPoll(cm);
- });
</del><ins>+ var inp = d.input.getField();
+ on(inp, "keyup", function(e) { onKeyUp.call(cm, e); });
+ on(inp, "keydown", operation(cm, onKeyDown));
+ on(inp, "keypress", operation(cm, onKeyPress));
+ on(inp, "focus", bind(onFocus, cm));
+ on(inp, "blur", bind(onBlur, cm));
+ }
</ins><span class="cx">
</span><del>- function prepareCopyCut(e) {
- if (cm.somethingSelected()) {
- if (d.inaccurateSelection) {
- d.prevInput = "";
- d.inaccurateSelection = false;
- d.input.value = cm.getSelection();
- selectInput(d.input);
- }
- } else {
- var text = "", ranges = [];
- for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
- var line = cm.doc.sel.ranges[i].head.line;
- var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
- ranges.push(lineRange);
- text += cm.getRange(lineRange.anchor, lineRange.head);
- }
- if (e.type == "cut") {
- cm.setSelections(ranges, null, sel_dontScroll);
- } else {
- d.prevInput = "";
- d.input.value = text;
- selectInput(d.input);
- }
- }
- if (e.type == "cut") cm.state.cutIncoming = true;
</del><ins>+ function dragDropChanged(cm, value, old) {
+ var wasOn = old && old != CodeMirror.Init;
+ if (!value != !wasOn) {
+ var funcs = cm.display.dragFunctions;
+ var toggle = value ? on : off;
+ toggle(cm.display.scroller, "dragstart", funcs.start);
+ toggle(cm.display.scroller, "dragenter", funcs.enter);
+ toggle(cm.display.scroller, "dragover", funcs.over);
+ toggle(cm.display.scroller, "dragleave", funcs.leave);
+ toggle(cm.display.scroller, "drop", funcs.drop);
</ins><span class="cx"> }
</span><del>- on(d.input, "cut", prepareCopyCut);
- on(d.input, "copy", prepareCopyCut);
-
- // Needed to handle Tab key in KHTML
- if (khtml) on(d.sizer, "mouseup", function() {
- if (activeElt() == d.input) d.input.blur();
- focusInput(cm);
- });
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Called when the window resizes
</span><span class="cx"> function onResize(cm) {
</span><ins>+ var d = cm.display;
+ if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth)
+ return;
</ins><span class="cx"> // Might be a text scaling operation, clear size caches.
</span><del>- var d = cm.display;
</del><span class="cx"> d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
</span><ins>+ d.scrollbarsClipped = false;
</ins><span class="cx"> cm.setSize();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2490,7 +3489,9 @@
</span><span class="cx"> // Return true when the given mouse event happened in a widget
</span><span class="cx"> function eventInWidget(display, e) {
</span><span class="cx"> for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
</span><del>- if (!n || n.ignoreEvents || n.parentNode == display.sizer && n != display.mover) return true;
</del><ins>+ if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") ||
+ (n.parentNode == display.sizer && n != display.mover))
+ return true;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2501,11 +3502,8 @@
</span><span class="cx"> // coordinates beyond the right of the text.
</span><span class="cx"> function posFromMouse(cm, e, liberal, forRect) {
</span><span class="cx"> var display = cm.display;
</span><del>- if (!liberal) {
- var target = e_target(e);
- if (target == display.scrollbarH || target == display.scrollbarV ||
- target == display.scrollbarFiller || target == display.gutterFiller) return null;
- }
</del><ins>+ if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") return null;
+
</ins><span class="cx"> var x, y, space = display.lineSpace.getBoundingClientRect();
</span><span class="cx"> // Fails unpredictably on IE[67] when mouse is dragged around quickly.
</span><span class="cx"> try { x = e.clientX - space.left; y = e.clientY - space.top; }
</span><span class="lines">@@ -2524,8 +3522,8 @@
</span><span class="cx"> // middle-click-paste. Or it might be a click on something we should
</span><span class="cx"> // not interfere with, such as a scrollbar or widget.
</span><span class="cx"> function onMouseDown(e) {
</span><del>- if (signalDOMEvent(this, e)) return;
</del><span class="cx"> var cm = this, display = cm.display;
</span><ins>+ if (display.activeTouch && display.input.supportsTouch() || signalDOMEvent(cm, e)) return;
</ins><span class="cx"> display.shift = e.shiftKey;
</span><span class="cx">
</span><span class="cx"> if (eventInWidget(display, e)) {
</span><span class="lines">@@ -2543,7 +3541,10 @@
</span><span class="cx">
</span><span class="cx"> switch (e_button(e)) {
</span><span class="cx"> case 1:
</span><del>- if (start)
</del><ins>+ // #3261: make sure, that we're not starting a second selection
+ if (cm.state.selectingText)
+ cm.state.selectingText(e);
+ else if (start)
</ins><span class="cx"> leftButtonDown(cm, e, start);
</span><span class="cx"> else if (e_target(e) == display.scroller)
</span><span class="cx"> e_preventDefault(e);
</span><span class="lines">@@ -2551,18 +3552,20 @@
</span><span class="cx"> case 2:
</span><span class="cx"> if (webkit) cm.state.lastMiddleDown = +new Date;
</span><span class="cx"> if (start) extendSelection(cm.doc, start);
</span><del>- setTimeout(bind(focusInput, cm), 20);
</del><ins>+ setTimeout(function() {display.input.focus();}, 20);
</ins><span class="cx"> e_preventDefault(e);
</span><span class="cx"> break;
</span><span class="cx"> case 3:
</span><span class="cx"> if (captureRightClick) onContextMenu(cm, e);
</span><ins>+ else delayBlurEvent(cm);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var lastClick, lastDoubleClick;
</span><span class="cx"> function leftButtonDown(cm, e, start) {
</span><del>- setTimeout(bind(ensureFocus, cm), 0);
</del><ins>+ if (ie) setTimeout(bind(ensureFocus, cm), 0);
+ else cm.curOp.focus = activeElt();
</ins><span class="cx">
</span><span class="cx"> var now = +new Date, type;
</span><span class="cx"> if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
</span><span class="lines">@@ -2575,9 +3578,11 @@
</span><span class="cx"> lastClick = {time: now, pos: start};
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey;
</del><ins>+ var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained;
</ins><span class="cx"> if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) &&
</span><del>- type == "single" && sel.contains(start) > -1 && sel.somethingSelected())
</del><ins>+ type == "single" && (contained = sel.contains(start)) > -1 &&
+ (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
+ (cmp(contained.to(), start) > 0 || start.xRel < 0))
</ins><span class="cx"> leftButtonStartDrag(cm, e, start, modifier);
</span><span class="cx"> else
</span><span class="cx"> leftButtonSelect(cm, e, start, type, modifier);
</span><span class="lines">@@ -2586,7 +3591,7 @@
</span><span class="cx"> // Start a text drag. When it ends, see if any dragging actually
</span><span class="cx"> // happen, and treat as a click if it didn't.
</span><span class="cx"> function leftButtonStartDrag(cm, e, start, modifier) {
</span><del>- var display = cm.display;
</del><ins>+ var display = cm.display, startTime = +new Date;
</ins><span class="cx"> var dragEnd = operation(cm, function(e2) {
</span><span class="cx"> if (webkit) display.scroller.draggable = false;
</span><span class="cx"> cm.state.draggingText = false;
</span><span class="lines">@@ -2594,12 +3599,13 @@
</span><span class="cx"> off(display.scroller, "drop", dragEnd);
</span><span class="cx"> if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
</span><span class="cx"> e_preventDefault(e2);
</span><del>- if (!modifier)
</del><ins>+ if (!modifier && +new Date - 200 < startTime)
</ins><span class="cx"> extendSelection(cm.doc, start);
</span><del>- focusInput(cm);
- // Work around unexplainable focus problem in IE9 (#2127)
- if (ie_upto10 && !ie_upto8)
- setTimeout(function() {document.body.focus(); focusInput(cm);}, 20);
</del><ins>+ // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
+ if (webkit || ie && ie_version == 9)
+ setTimeout(function() {document.body.focus(); display.input.focus();}, 20);
+ else
+ display.input.focus();
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> // Let the drag handler handle this.
</span><span class="lines">@@ -2616,15 +3622,16 @@
</span><span class="cx"> var display = cm.display, doc = cm.doc;
</span><span class="cx"> e_preventDefault(e);
</span><span class="cx">
</span><del>- var ourRange, ourIndex, startSel = doc.sel;
</del><ins>+ var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges;
</ins><span class="cx"> if (addNew && !e.shiftKey) {
</span><span class="cx"> ourIndex = doc.sel.contains(start);
</span><span class="cx"> if (ourIndex > -1)
</span><del>- ourRange = doc.sel.ranges[ourIndex];
</del><ins>+ ourRange = ranges[ourIndex];
</ins><span class="cx"> else
</span><span class="cx"> ourRange = new Range(start, start);
</span><span class="cx"> } else {
</span><span class="cx"> ourRange = doc.sel.primary();
</span><ins>+ ourIndex = doc.sel.primIndex;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (e.altKey) {
</span><span class="lines">@@ -2633,7 +3640,7 @@
</span><span class="cx"> start = posFromMouse(cm, e, true, true);
</span><span class="cx"> ourIndex = -1;
</span><span class="cx"> } else if (type == "double") {
</span><del>- var word = findWordAt(cm, start);
</del><ins>+ var word = cm.findWordAt(start);
</ins><span class="cx"> if (cm.display.shift || doc.extend)
</span><span class="cx"> ourRange = extendRange(doc, ourRange, word.anchor, word.head);
</span><span class="cx"> else
</span><span class="lines">@@ -2652,12 +3659,15 @@
</span><span class="cx"> ourIndex = 0;
</span><span class="cx"> setSelection(doc, new Selection([ourRange], 0), sel_mouse);
</span><span class="cx"> startSel = doc.sel;
</span><del>- } else if (ourIndex > -1) {
</del><ins>+ } else if (ourIndex == -1) {
+ ourIndex = ranges.length;
+ setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
+ {scroll: false, origin: "*mouse"});
+ } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) {
+ setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0));
+ startSel = doc.sel;
+ } else {
</ins><span class="cx"> replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
</span><del>- } else {
- ourIndex = doc.sel.ranges.length;
- setSelection(doc, normalizeSelection(doc.sel.ranges.concat([ourRange]), ourIndex),
- {scroll: false, origin: "*mouse"});
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var lastPos = start;
</span><span class="lines">@@ -2687,7 +3697,7 @@
</span><span class="cx"> var anchor = oldRange.anchor, head = pos;
</span><span class="cx"> if (type != "single") {
</span><span class="cx"> if (type == "double")
</span><del>- var range = findWordAt(cm, pos);
</del><ins>+ var range = cm.findWordAt(pos);
</ins><span class="cx"> else
</span><span class="cx"> var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)));
</span><span class="cx"> if (cmp(range.anchor, anchor) > 0) {
</span><span class="lines">@@ -2716,7 +3726,7 @@
</span><span class="cx"> var cur = posFromMouse(cm, e, true, type == "rect");
</span><span class="cx"> if (!cur) return;
</span><span class="cx"> if (cmp(cur, lastPos) != 0) {
</span><del>- ensureFocus(cm);
</del><ins>+ cm.curOp.focus = activeElt();
</ins><span class="cx"> extendTo(cur);
</span><span class="cx"> var visible = visibleLines(display, doc);
</span><span class="cx"> if (cur.line >= visible.to || cur.line < visible.from)
</span><span class="lines">@@ -2732,19 +3742,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function done(e) {
</span><ins>+ cm.state.selectingText = false;
</ins><span class="cx"> counter = Infinity;
</span><span class="cx"> e_preventDefault(e);
</span><del>- focusInput(cm);
</del><ins>+ display.input.focus();
</ins><span class="cx"> off(document, "mousemove", move);
</span><span class="cx"> off(document, "mouseup", up);
</span><span class="cx"> doc.history.lastSelOrigin = null;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var move = operation(cm, function(e) {
</span><del>- if ((ie && !ie_upto9) ? !e.buttons : !e_button(e)) done(e);
</del><ins>+ if (!e_button(e)) done(e);
</ins><span class="cx"> else extend(e);
</span><span class="cx"> });
</span><span class="cx"> var up = operation(cm, done);
</span><ins>+ cm.state.selectingText = up;
</ins><span class="cx"> on(document, "mousemove", move);
</span><span class="cx"> on(document, "mouseup", up);
</span><span class="cx"> }
</span><span class="lines">@@ -2784,6 +3796,7 @@
</span><span class="cx">
</span><span class="cx"> function onDrop(e) {
</span><span class="cx"> var cm = this;
</span><ins>+ clearDragCursor(cm);
</ins><span class="cx"> if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
</span><span class="cx"> return;
</span><span class="cx"> e_preventDefault(e);
</span><span class="lines">@@ -2800,7 +3813,9 @@
</span><span class="cx"> text[i] = reader.result;
</span><span class="cx"> if (++read == n) {
</span><span class="cx"> pos = clipPos(cm.doc, pos);
</span><del>- var change = {from: pos, to: pos, text: splitLines(text.join("\n")), origin: "paste"};
</del><ins>+ var change = {from: pos, to: pos,
+ text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
+ origin: "paste"};
</ins><span class="cx"> makeChange(cm.doc, change);
</span><span class="cx"> setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
</span><span class="cx"> }
</span><span class="lines">@@ -2813,19 +3828,19 @@
</span><span class="cx"> if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
</span><span class="cx"> cm.state.draggingText(e);
</span><span class="cx"> // Ensure the editor is re-focused
</span><del>- setTimeout(bind(focusInput, cm), 20);
</del><ins>+ setTimeout(function() {cm.display.input.focus();}, 20);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> try {
</span><span class="cx"> var text = e.dataTransfer.getData("Text");
</span><span class="cx"> if (text) {
</span><del>- if (cm.state.draggingText && !(mac ? e.metaKey : e.ctrlKey))
</del><ins>+ if (cm.state.draggingText && !(mac ? e.altKey : e.ctrlKey))
</ins><span class="cx"> var selected = cm.listSelections();
</span><span class="cx"> setSelectionNoUndo(cm.doc, simpleSelection(pos, pos));
</span><span class="cx"> if (selected) for (var i = 0; i < selected.length; ++i)
</span><span class="cx"> replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag");
</span><span class="cx"> cm.replaceSelection(text, "around", "paste");
</span><del>- focusInput(cm);
</del><ins>+ cm.display.input.focus();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> catch(e){}
</span><span class="lines">@@ -2854,6 +3869,25 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function onDragOver(cm, e) {
+ var pos = posFromMouse(cm, e);
+ if (!pos) return;
+ var frag = document.createDocumentFragment();
+ drawSelectionCursor(cm, pos, frag);
+ if (!cm.display.dragCursor) {
+ cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors");
+ cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv);
+ }
+ removeChildrenAndAdd(cm.display.dragCursor, frag);
+ }
+
+ function clearDragCursor(cm) {
+ if (cm.display.dragCursor) {
+ cm.display.lineSpace.removeChild(cm.display.dragCursor);
+ cm.display.dragCursor = null;
+ }
+ }
+
</ins><span class="cx"> // SCROLL EVENTS
</span><span class="cx">
</span><span class="cx"> // Sync the scrollable area and scrollbars, ensure the viewport
</span><span class="lines">@@ -2861,10 +3895,10 @@
</span><span class="cx"> function setScrollTop(cm, val) {
</span><span class="cx"> if (Math.abs(cm.doc.scrollTop - val) < 2) return;
</span><span class="cx"> cm.doc.scrollTop = val;
</span><del>- if (!gecko) updateDisplay(cm, {top: val});
</del><ins>+ if (!gecko) updateDisplaySimple(cm, {top: val});
</ins><span class="cx"> if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
</span><del>- if (cm.display.scrollbarV.scrollTop != val) cm.display.scrollbarV.scrollTop = val;
- if (gecko) updateDisplay(cm);
</del><ins>+ cm.display.scrollbars.setScrollTop(val);
+ if (gecko) updateDisplaySimple(cm);
</ins><span class="cx"> startWorker(cm, 100);
</span><span class="cx"> }
</span><span class="cx"> // Sync scroller and scrollbar, ensure the gutter elements are
</span><span class="lines">@@ -2875,7 +3909,7 @@
</span><span class="cx"> cm.doc.scrollLeft = val;
</span><span class="cx"> alignHorizontally(cm);
</span><span class="cx"> if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val;
</span><del>- if (cm.display.scrollbarH.scrollLeft != val) cm.display.scrollbarH.scrollLeft = val;
</del><ins>+ cm.display.scrollbars.setScrollLeft(val);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Since the delta values reported on mouse wheel events are
</span><span class="lines">@@ -2899,12 +3933,23 @@
</span><span class="cx"> else if (chrome) wheelPixelsPerUnit = -.7;
</span><span class="cx"> else if (safari) wheelPixelsPerUnit = -1/3;
</span><span class="cx">
</span><del>- function onScrollWheel(cm, e) {
</del><ins>+ var wheelEventDelta = function(e) {
</ins><span class="cx"> var dx = e.wheelDeltaX, dy = e.wheelDeltaY;
</span><span class="cx"> if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) dx = e.detail;
</span><span class="cx"> if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail;
</span><span class="cx"> else if (dy == null) dy = e.wheelDelta;
</span><ins>+ return {x: dx, y: dy};
+ };
+ CodeMirror.wheelEventPixels = function(e) {
+ var delta = wheelEventDelta(e);
+ delta.x *= wheelPixelsPerUnit;
+ delta.y *= wheelPixelsPerUnit;
+ return delta;
+ };
</ins><span class="cx">
</span><ins>+ function onScrollWheel(cm, e) {
+ var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y;
+
</ins><span class="cx"> var display = cm.display, scroll = display.scroller;
</span><span class="cx"> // Quit if there's nothing to scroll here
</span><span class="cx"> if (!(dx && scroll.scrollWidth > scroll.clientWidth ||
</span><span class="lines">@@ -2947,7 +3992,7 @@
</span><span class="cx"> var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
</span><span class="cx"> if (pixels < 0) top = Math.max(0, top + pixels - 50);
</span><span class="cx"> else bot = Math.min(cm.doc.height, bot + pixels + 50);
</span><del>- updateDisplay(cm, {top: top, bottom: bot});
</del><ins>+ updateDisplaySimple(cm, {top: top, bottom: bot});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (wheelSamples < 20) {
</span><span class="lines">@@ -2981,7 +4026,7 @@
</span><span class="cx"> }
</span><span class="cx"> // Ensure previous input has been read, so that the handler sees a
</span><span class="cx"> // consistent view of the document
</span><del>- if (cm.display.pollingFast && readInput(cm)) cm.display.pollingFast = false;
</del><ins>+ cm.display.input.ensurePolled();
</ins><span class="cx"> var prevShift = cm.display.shift, done = false;
</span><span class="cx"> try {
</span><span class="cx"> if (isReadOnly(cm)) cm.state.suppressEdits = true;
</span><span class="lines">@@ -2994,71 +4039,79 @@
</span><span class="cx"> return done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Collect the currently active keymaps.
- function allKeyMaps(cm) {
- var maps = cm.state.keyMaps.slice(0);
- if (cm.options.extraKeys) maps.push(cm.options.extraKeys);
- maps.push(cm.options.keyMap);
- return maps;
</del><ins>+ function lookupKeyForEditor(cm, name, handle) {
+ for (var i = 0; i < cm.state.keyMaps.length; i++) {
+ var result = lookupKey(name, cm.state.keyMaps[i], handle, cm);
+ if (result) return result;
+ }
+ return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm))
+ || lookupKey(name, cm.options.keyMap, handle, cm);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- var maybeTransition;
</del><ins>+ var stopSeq = new Delayed;
+ function dispatchKey(cm, name, e, handle) {
+ var seq = cm.state.keySeq;
+ if (seq) {
+ if (isModifierKey(name)) return "handled";
+ stopSeq.set(50, function() {
+ if (cm.state.keySeq == seq) {
+ cm.state.keySeq = null;
+ cm.display.input.reset();
+ }
+ });
+ name = seq + " " + name;
+ }
+ var result = lookupKeyForEditor(cm, name, handle);
+
+ if (result == "multi")
+ cm.state.keySeq = name;
+ if (result == "handled")
+ signalLater(cm, "keyHandled", cm, name, e);
+
+ if (result == "handled" || result == "multi") {
+ e_preventDefault(e);
+ restartBlink(cm);
+ }
+
+ if (seq && !result && /\'$/.test(name)) {
+ e_preventDefault(e);
+ return true;
+ }
+ return !!result;
+ }
+
</ins><span class="cx"> // Handle a key from the keydown event.
</span><span class="cx"> function handleKeyBinding(cm, e) {
</span><del>- // Handle automatic keymap transitions
- var startMap = getKeyMap(cm.options.keyMap), next = startMap.auto;
- clearTimeout(maybeTransition);
- if (next && !isModifierKey(e)) maybeTransition = setTimeout(function() {
- if (getKeyMap(cm.options.keyMap) == startMap) {
- cm.options.keyMap = (next.call ? next.call(null, cm) : next);
- keyMapChanged(cm);
- }
- }, 50);
-
- var name = keyName(e, true), handled = false;
</del><ins>+ var name = keyName(e, true);
</ins><span class="cx"> if (!name) return false;
</span><del>- var keymaps = allKeyMaps(cm);
</del><span class="cx">
</span><del>- if (e.shiftKey) {
</del><ins>+ if (e.shiftKey && !cm.state.keySeq) {
</ins><span class="cx"> // First try to resolve full name (including 'Shift-'). Failing
</span><span class="cx"> // that, see if there is a cursor-motion command (starting with
</span><span class="cx"> // 'go') bound to the keyname without 'Shift-'.
</span><del>- handled = lookupKey("Shift-" + name, keymaps, function(b) {return doHandleBinding(cm, b, true);})
- || lookupKey(name, keymaps, function(b) {
- if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
- return doHandleBinding(cm, b);
- });
</del><ins>+ return dispatchKey(cm, "Shift-" + name, e, function(b) {return doHandleBinding(cm, b, true);})
+ || dispatchKey(cm, name, e, function(b) {
+ if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
+ return doHandleBinding(cm, b);
+ });
</ins><span class="cx"> } else {
</span><del>- handled = lookupKey(name, keymaps, function(b) { return doHandleBinding(cm, b); });
</del><ins>+ return dispatchKey(cm, name, e, function(b) { return doHandleBinding(cm, b); });
</ins><span class="cx"> }
</span><del>-
- if (handled) {
- e_preventDefault(e);
- restartBlink(cm);
- signalLater(cm, "keyHandled", cm, name, e);
- }
- return handled;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Handle a key from the keypress event
</span><span class="cx"> function handleCharBinding(cm, e, ch) {
</span><del>- var handled = lookupKey("'" + ch + "'", allKeyMaps(cm),
- function(b) { return doHandleBinding(cm, b, true); });
- if (handled) {
- e_preventDefault(e);
- restartBlink(cm);
- signalLater(cm, "keyHandled", cm, "'" + ch + "'", e);
- }
- return handled;
</del><ins>+ return dispatchKey(cm, "'" + ch + "'", e,
+ function(b) { return doHandleBinding(cm, b, true); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var lastStoppedKey = null;
</span><span class="cx"> function onKeyDown(e) {
</span><span class="cx"> var cm = this;
</span><del>- ensureFocus(cm);
</del><ins>+ cm.curOp.focus = activeElt();
</ins><span class="cx"> if (signalDOMEvent(cm, e)) return;
</span><span class="cx"> // IE does strange things with escape.
</span><del>- if (ie_upto10 && e.keyCode == 27) e.returnValue = false;
</del><ins>+ if (ie && ie_version < 11 && e.keyCode == 27) e.returnValue = false;
</ins><span class="cx"> var code = e.keyCode;
</span><span class="cx"> cm.display.shift = code == 16 || e.shiftKey;
</span><span class="cx"> var handled = handleKeyBinding(cm, e);
</span><span class="lines">@@ -3090,42 +4143,55 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onKeyUp(e) {
</span><del>- if (signalDOMEvent(this, e)) return;
</del><span class="cx"> if (e.keyCode == 16) this.doc.sel.shift = false;
</span><ins>+ signalDOMEvent(this, e);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onKeyPress(e) {
</span><span class="cx"> var cm = this;
</span><del>- if (signalDOMEvent(cm, e)) return;
</del><ins>+ if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return;
</ins><span class="cx"> var keyCode = e.keyCode, charCode = e.charCode;
</span><span class="cx"> if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
</span><del>- if (((presto && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return;
</del><ins>+ if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) return;
</ins><span class="cx"> var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
</span><span class="cx"> if (handleCharBinding(cm, e, ch)) return;
</span><del>- if (ie && !ie_upto8) cm.display.inputHasSelection = null;
- fastPoll(cm);
</del><ins>+ cm.display.input.onKeyPress(e);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FOCUS/BLUR EVENTS
</span><span class="cx">
</span><ins>+ function delayBlurEvent(cm) {
+ cm.state.delayingBlurEvent = true;
+ setTimeout(function() {
+ if (cm.state.delayingBlurEvent) {
+ cm.state.delayingBlurEvent = false;
+ onBlur(cm);
+ }
+ }, 100);
+ }
+
</ins><span class="cx"> function onFocus(cm) {
</span><ins>+ if (cm.state.delayingBlurEvent) cm.state.delayingBlurEvent = false;
+
</ins><span class="cx"> if (cm.options.readOnly == "nocursor") return;
</span><span class="cx"> if (!cm.state.focused) {
</span><span class="cx"> signal(cm, "focus", cm);
</span><span class="cx"> cm.state.focused = true;
</span><span class="cx"> addClass(cm.display.wrapper, "CodeMirror-focused");
</span><del>- // The prevInput test prevents this from firing when a context
- // menu is closed (since the resetInput would kill the
</del><ins>+ // This test prevents this from firing when a context
+ // menu is closed (since the input reset would kill the
</ins><span class="cx"> // select-all detection hack)
</span><span class="cx"> if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
</span><del>- resetInput(cm);
- if (webkit) setTimeout(bind(resetInput, cm, true), 0); // Issue #1730
</del><ins>+ cm.display.input.reset();
+ if (webkit) setTimeout(function() { cm.display.input.reset(true); }, 20); // Issue #1730
</ins><span class="cx"> }
</span><ins>+ cm.display.input.receivedFocus();
</ins><span class="cx"> }
</span><del>- slowPoll(cm);
</del><span class="cx"> restartBlink(cm);
</span><span class="cx"> }
</span><span class="cx"> function onBlur(cm) {
</span><ins>+ if (cm.state.delayingBlurEvent) return;
+
</ins><span class="cx"> if (cm.state.focused) {
</span><span class="cx"> signal(cm, "blur", cm);
</span><span class="cx"> cm.state.focused = false;
</span><span class="lines">@@ -3141,76 +4207,8 @@
</span><span class="cx"> // textarea (making it as unobtrusive as possible) to let the
</span><span class="cx"> // right-click take effect on it.
</span><span class="cx"> function onContextMenu(cm, e) {
</span><del>- if (signalDOMEvent(cm, e, "contextmenu")) return;
- var display = cm.display;
- if (eventInWidget(display, e) || contextMenuInGutter(cm, e)) return;
-
- var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
- if (!pos || presto) return; // Opera is difficult.
-
- // Reset the current text selection only if the click is done outside of the selection
- // and 'resetSelectionOnContextMenu' option is true.
- var reset = cm.options.resetSelectionOnContextMenu;
- if (reset && cm.doc.sel.contains(pos) == -1)
- operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll);
-
- var oldCSS = display.input.style.cssText;
- display.inputDiv.style.position = "absolute";
- display.input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
- "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: " +
- (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
- "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
- focusInput(cm);
- resetInput(cm);
- // Adds "Select all" to context menu in FF
- if (!cm.somethingSelected()) display.input.value = display.prevInput = " ";
- display.selForContextMenu = cm.doc.sel;
- clearTimeout(display.detectingSelectAll);
-
- // Select-all will be greyed out if there's nothing to select, so
- // this adds a zero-width space so that we can later check whether
- // it got selected.
- function prepareSelectAllHack() {
- if (display.input.selectionStart != null) {
- var selected = cm.somethingSelected();
- var extval = display.input.value = "\u200b" + (selected ? display.input.value : "");
- display.prevInput = selected ? "" : "\u200b";
- display.input.selectionStart = 1; display.input.selectionEnd = extval.length;
- // Re-set this, in case some other handler touched the
- // selection in the meantime.
- display.selForContextMenu = cm.doc.sel;
- }
- }
- function rehide() {
- display.inputDiv.style.position = "relative";
- display.input.style.cssText = oldCSS;
- if (ie_upto8) display.scrollbarV.scrollTop = display.scroller.scrollTop = scrollPos;
- slowPoll(cm);
-
- // Try to detect the user choosing select-all
- if (display.input.selectionStart != null) {
- if (!ie || ie_upto8) prepareSelectAllHack();
- var i = 0, poll = function() {
- if (display.selForContextMenu == cm.doc.sel && display.input.selectionStart == 0)
- operation(cm, commands.selectAll)(cm);
- else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500);
- else resetInput(cm);
- };
- display.detectingSelectAll = setTimeout(poll, 200);
- }
- }
-
- if (ie && !ie_upto8) prepareSelectAllHack();
- if (captureRightClick) {
- e_stop(e);
- var mouseup = function() {
- off(window, "mouseup", mouseup);
- setTimeout(rehide, 20);
- };
- on(window, "mouseup", mouseup);
- } else {
- setTimeout(rehide, 50);
- }
</del><ins>+ if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return;
+ cm.display.input.onContextMenu(e);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function contextMenuInGutter(cm, e) {
</span><span class="lines">@@ -3390,9 +4388,9 @@
</span><span class="cx">
</span><span class="cx"> antiChanges.push(historyChangeFromChange(doc, change));
</span><span class="cx">
</span><del>- var after = i ? computeSelAfterChange(doc, change, null) : lst(source);
</del><ins>+ var after = i ? computeSelAfterChange(doc, change) : lst(source);
</ins><span class="cx"> makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
</span><del>- if (!i && doc.cm) doc.cm.scrollIntoView(change);
</del><ins>+ if (!i && doc.cm) doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)});
</ins><span class="cx"> var rebased = [];
</span><span class="cx">
</span><span class="cx"> // Propagate to the linked documents
</span><span class="lines">@@ -3449,7 +4447,7 @@
</span><span class="cx">
</span><span class="cx"> change.removed = getBetween(doc, change.from, change.to);
</span><span class="cx">
</span><del>- if (!selAfter) selAfter = computeSelAfterChange(doc, change, null);
</del><ins>+ if (!selAfter) selAfter = computeSelAfterChange(doc, change);
</ins><span class="cx"> if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans);
</span><span class="cx"> else updateDoc(doc, change, spans);
</span><span class="cx"> setSelectionNoUndo(doc, selAfter, sel_dontScroll);
</span><span class="lines">@@ -3495,7 +4493,9 @@
</span><span class="cx">
</span><span class="cx"> var lendiff = change.text.length - (to.line - from.line) - 1;
</span><span class="cx"> // Remember that these lines changed, for updating the display
</span><del>- if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
</del><ins>+ if (change.full)
+ regChange(cm);
+ else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
</ins><span class="cx"> regLineChange(cm, from.line, "text");
</span><span class="cx"> else
</span><span class="cx"> regChange(cm, from.line, to.line + 1, lendiff);
</span><span class="lines">@@ -3517,7 +4517,7 @@
</span><span class="cx"> function replaceRange(doc, code, from, to, origin) {
</span><span class="cx"> if (!to) to = from;
</span><span class="cx"> if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp; }
</span><del>- if (typeof code == "string") code = splitLines(code);
</del><ins>+ if (typeof code == "string") code = doc.splitLines(code);
</ins><span class="cx"> makeChange(doc, {from: from, to: to, text: code, origin: origin});
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3534,7 +4534,7 @@
</span><span class="cx"> if (doScroll != null && !phantom) {
</span><span class="cx"> var scrollNode = elt("div", "\u200b", null, "position: absolute; top: " +
</span><span class="cx"> (coords.top - display.viewOffset - paddingTop(cm.display)) + "px; height: " +
</span><del>- (coords.bottom - coords.top + scrollerCutOff) + "px; left: " +
</del><ins>+ (coords.bottom - coords.top + scrollGap(cm) + display.barHeight) + "px; left: " +
</ins><span class="cx"> coords.left + "px; width: 2px;");
</span><span class="cx"> cm.display.lineSpace.appendChild(scrollNode);
</span><span class="cx"> scrollNode.scrollIntoView(doScroll);
</span><span class="lines">@@ -3547,7 +4547,7 @@
</span><span class="cx"> // measured, the position of something may 'drift' during drawing).
</span><span class="cx"> function scrollPosIntoView(cm, pos, end, margin) {
</span><span class="cx"> if (margin == null) margin = 0;
</span><del>- for (;;) {
</del><ins>+ for (var limit = 0; limit < 5; limit++) {
</ins><span class="cx"> var changed = false, coords = cursorCoords(cm, pos);
</span><span class="cx"> var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
</span><span class="cx"> var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
</span><span class="lines">@@ -3563,8 +4563,9 @@
</span><span class="cx"> setScrollLeft(cm, scrollPos.scrollLeft);
</span><span class="cx"> if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) changed = true;
</span><span class="cx"> }
</span><del>- if (!changed) return coords;
</del><ins>+ if (!changed) break;
</ins><span class="cx"> }
</span><ins>+ return coords;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Scroll a given set of coordinates into view (immediately).
</span><span class="lines">@@ -3582,7 +4583,8 @@
</span><span class="cx"> var display = cm.display, snapMargin = textHeight(cm.display);
</span><span class="cx"> if (y1 < 0) y1 = 0;
</span><span class="cx"> var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop;
</span><del>- var screen = display.scroller.clientHeight - scrollerCutOff, result = {};
</del><ins>+ var screen = displayHeight(cm), result = {};
+ if (y2 - y1 > screen) y2 = y1 + screen;
</ins><span class="cx"> var docBottom = cm.doc.height + paddingVert(display);
</span><span class="cx"> var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin;
</span><span class="cx"> if (y1 < screentop) {
</span><span class="lines">@@ -3593,16 +4595,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
</span><del>- var screenw = display.scroller.clientWidth - scrollerCutOff;
- x1 += display.gutters.offsetWidth; x2 += display.gutters.offsetWidth;
- var gutterw = display.gutters.offsetWidth;
- var atLeft = x1 < gutterw + 10;
- if (x1 < screenleft + gutterw || atLeft) {
- if (atLeft) x1 = 0;
- result.scrollLeft = Math.max(0, x1 - 10 - gutterw);
- } else if (x2 > screenw + screenleft - 3) {
- result.scrollLeft = x2 + 10 - screenw;
- }
</del><ins>+ var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0);
+ var tooWide = x2 - x1 > screenw;
+ if (tooWide) x2 = x1 + screenw;
+ if (x1 < 10)
+ result.scrollLeft = 0;
+ else if (x1 < screenleft)
+ result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10));
+ else if (x2 > screenw + screenleft - 3)
+ result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw;
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3658,7 +4659,7 @@
</span><span class="cx"> if (how == "smart") {
</span><span class="cx"> // Fall back to "prev" when the mode doesn't have an indentation
</span><span class="cx"> // method.
</span><del>- if (!cm.doc.mode.indent) how = "prev";
</del><ins>+ if (!doc.mode.indent) how = "prev";
</ins><span class="cx"> else state = getStateBefore(cm, n);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3670,8 +4671,8 @@
</span><span class="cx"> indentation = 0;
</span><span class="cx"> how = "not";
</span><span class="cx"> } else if (how == "smart") {
</span><del>- indentation = cm.doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
- if (indentation == Pass) {
</del><ins>+ indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
+ if (indentation == Pass || indentation > 150) {
</ins><span class="cx"> if (!aggressive) return;
</span><span class="cx"> how = "prev";
</span><span class="cx"> }
</span><span class="lines">@@ -3694,7 +4695,9 @@
</span><span class="cx"> if (pos < indentation) indentString += spaceStr(indentation - pos);
</span><span class="cx">
</span><span class="cx"> if (indentString != curSpaceString) {
</span><del>- replaceRange(cm.doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
</del><ins>+ replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
+ line.stateAfter = null;
+ return true;
</ins><span class="cx"> } else {
</span><span class="cx"> // Ensure that, if the cursor was in the whitespace at the start
</span><span class="cx"> // of the line, it is moved to the end of that space.
</span><span class="lines">@@ -3707,18 +4710,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- line.stateAfter = null;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Utility for applying a change to a line by handle or number,
</span><span class="cx"> // returning the number and optionally registering the line as
</span><span class="cx"> // changed.
</span><del>- function changeLine(cm, handle, changeType, op) {
- var no = handle, line = handle, doc = cm.doc;
</del><ins>+ function changeLine(doc, handle, changeType, op) {
+ var no = handle, line = handle;
</ins><span class="cx"> if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle));
</span><span class="cx"> else no = lineNo(handle);
</span><span class="cx"> if (no == null) return null;
</span><del>- if (op(line, no)) regLineChange(cm, no, changeType);
</del><ins>+ if (op(line, no) && doc.cm) regLineChange(doc.cm, no, changeType);
</ins><span class="cx"> return line;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3824,24 +4826,6 @@
</span><span class="cx"> return target;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Find the word at the given position (as returned by coordsChar).
- function findWordAt(cm, pos) {
- var doc = cm.doc, line = getLine(doc, pos.line).text;
- var start = pos.ch, end = pos.ch;
- if (line) {
- var helper = cm.getHelper(pos, "wordChars");
- if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
- var startChar = line.charAt(start);
- var check = isWordChar(startChar, helper)
- ? function(ch) { return isWordChar(ch, helper); }
- : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
- : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
- while (start > 0 && check(line.charAt(start - 1))) --start;
- while (end < line.length && check(line.charAt(end))) ++end;
- }
- return new Range(Pos(pos.line, start), Pos(pos.line, end));
- }
-
</del><span class="cx"> // EDITOR METHODS
</span><span class="cx">
</span><span class="cx"> // The publicly visible API. Note that methodOp(f) means
</span><span class="lines">@@ -3854,7 +4838,7 @@
</span><span class="cx">
</span><span class="cx"> CodeMirror.prototype = {
</span><span class="cx"> constructor: CodeMirror,
</span><del>- focus: function(){window.focus(); focusInput(this); fastPoll(this);},
</del><ins>+ focus: function(){window.focus(); this.display.input.focus();},
</ins><span class="cx">
</span><span class="cx"> setOption: function(option, value) {
</span><span class="cx"> var options = this.options, old = options[option];
</span><span class="lines">@@ -3868,12 +4852,12 @@
</span><span class="cx"> getDoc: function() {return this.doc;},
</span><span class="cx">
</span><span class="cx"> addKeyMap: function(map, bottom) {
</span><del>- this.state.keyMaps[bottom ? "push" : "unshift"](map);
</del><ins>+ this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map));
</ins><span class="cx"> },
</span><span class="cx"> removeKeyMap: function(map) {
</span><span class="cx"> var maps = this.state.keyMaps;
</span><span class="cx"> for (var i = 0; i < maps.length; ++i)
</span><del>- if (maps[i] == map || (typeof maps[i] != "string" && maps[i].name == map)) {
</del><ins>+ if (maps[i] == map || maps[i].name == map) {
</ins><span class="cx"> maps.splice(i, 1);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -3911,11 +4895,14 @@
</span><span class="cx"> for (var i = 0; i < ranges.length; i++) {
</span><span class="cx"> var range = ranges[i];
</span><span class="cx"> if (!range.empty()) {
</span><del>- var start = Math.max(end, range.from().line);
- var to = range.to();
</del><ins>+ var from = range.from(), to = range.to();
+ var start = Math.max(end, from.line);
</ins><span class="cx"> end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1;
</span><span class="cx"> for (var j = start; j < end; ++j)
</span><span class="cx"> indentLine(this, j, how);
</span><ins>+ var newRanges = this.doc.sel.ranges;
+ if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)
+ replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll);
</ins><span class="cx"> } else if (range.head.line > end) {
</span><span class="cx"> indentLine(this, range.head.line, how, true);
</span><span class="cx"> end = range.head.line;
</span><span class="lines">@@ -3927,22 +4914,13 @@
</span><span class="cx"> // Fetch the parser token for a given character. Useful for hacks
</span><span class="cx"> // that want to inspect the mode state (say, for completion).
</span><span class="cx"> getTokenAt: function(pos, precise) {
</span><del>- var doc = this.doc;
- pos = clipPos(doc, pos);
- var state = getStateBefore(this, pos.line, precise), mode = this.doc.mode;
- var line = getLine(doc, pos.line);
- var stream = new StringStream(line.text, this.options.tabSize);
- while (stream.pos < pos.ch && !stream.eol()) {
- stream.start = stream.pos;
- var style = readToken(mode, stream, state);
- }
- return {start: stream.start,
- end: stream.pos,
- string: stream.current(),
- type: style || null,
- state: state};
</del><ins>+ return takeToken(this, pos, precise);
</ins><span class="cx"> },
</span><span class="cx">
</span><ins>+ getLineTokens: function(line, precise) {
+ return takeToken(this, Pos(line), precise, true);
+ },
+
</ins><span class="cx"> getTokenTypeAt: function(pos) {
</span><span class="cx"> pos = clipPos(this.doc, pos);
</span><span class="cx"> var styles = getLineStyles(this, getLine(this.doc, pos.line));
</span><span class="lines">@@ -3971,7 +4949,7 @@
</span><span class="cx">
</span><span class="cx"> getHelpers: function(pos, type) {
</span><span class="cx"> var found = [];
</span><del>- if (!helpers.hasOwnProperty(type)) return helpers;
</del><ins>+ if (!helpers.hasOwnProperty(type)) return found;
</ins><span class="cx"> var help = helpers[type], mode = this.getModeAt(pos);
</span><span class="cx"> if (typeof mode[type] == "string") {
</span><span class="cx"> if (help[mode[type]]) found.push(help[mode[type]]);
</span><span class="lines">@@ -4021,10 +4999,15 @@
</span><span class="cx"> return lineAtHeight(this.doc, height + this.display.viewOffset);
</span><span class="cx"> },
</span><span class="cx"> heightAtLine: function(line, mode) {
</span><del>- var end = false, last = this.doc.first + this.doc.size - 1;
- if (line < this.doc.first) line = this.doc.first;
- else if (line > last) { line = last; end = true; }
- var lineObj = getLine(this.doc, line);
</del><ins>+ var end = false, lineObj;
+ if (typeof line == "number") {
+ var last = this.doc.first + this.doc.size - 1;
+ if (line < this.doc.first) line = this.doc.first;
+ else if (line > last) { line = last; end = true; }
+ lineObj = getLine(this.doc, line);
+ } else {
+ lineObj = line;
+ }
</ins><span class="cx"> return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page").top +
</span><span class="cx"> (end ? this.doc.height - heightAtLine(lineObj) : 0);
</span><span class="cx"> },
</span><span class="lines">@@ -4033,7 +5016,7 @@
</span><span class="cx"> defaultCharWidth: function() { return charWidth(this.display); },
</span><span class="cx">
</span><span class="cx"> setGutterMarker: methodOp(function(line, gutterID, value) {
</span><del>- return changeLine(this, line, "gutter", function(line) {
</del><ins>+ return changeLine(this.doc, line, "gutter", function(line) {
</ins><span class="cx"> var markers = line.gutterMarkers || (line.gutterMarkers = {});
</span><span class="cx"> markers[gutterID] = value;
</span><span class="cx"> if (!value && isEmpty(markers)) line.gutterMarkers = null;
</span><span class="lines">@@ -4053,38 +5036,6 @@
</span><span class="cx"> });
</span><span class="cx"> }),
</span><span class="cx">
</span><del>- addLineClass: methodOp(function(handle, where, cls) {
- return changeLine(this, handle, "class", function(line) {
- var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
- if (!line[prop]) line[prop] = cls;
- else if (new RegExp("(?:^|\\s)" + cls + "(?:$|\\s)").test(line[prop])) return false;
- else line[prop] += " " + cls;
- return true;
- });
- }),
-
- removeLineClass: methodOp(function(handle, where, cls) {
- return changeLine(this, handle, "class", function(line) {
- var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
- var cur = line[prop];
- if (!cur) return false;
- else if (cls == null) line[prop] = null;
- else {
- var found = cur.match(new RegExp("(?:^|\\s+)" + cls + "(?:$|\\s+)"));
- if (!found) return false;
- var end = found.index + found[0].length;
- line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
- }
- return true;
- });
- }),
-
- addLineWidget: methodOp(function(handle, node, options) {
- return addLineWidget(this, handle, node, options);
- }),
-
- removeLineWidget: function(widget) { widget.clear(); },
-
</del><span class="cx"> lineInfo: function(line) {
</span><span class="cx"> if (typeof line == "number") {
</span><span class="cx"> if (!isLine(this.doc, line)) return null;
</span><span class="lines">@@ -4107,6 +5058,8 @@
</span><span class="cx"> pos = cursorCoords(this, clipPos(this.doc, pos));
</span><span class="cx"> var top = pos.bottom, left = pos.left;
</span><span class="cx"> node.style.position = "absolute";
</span><ins>+ node.setAttribute("cm-ignore-events", "true");
+ this.display.input.setUneditable(node);
</ins><span class="cx"> display.sizer.appendChild(node);
</span><span class="cx"> if (vert == "over") {
</span><span class="cx"> top = pos.top;
</span><span class="lines">@@ -4137,13 +5090,15 @@
</span><span class="cx">
</span><span class="cx"> triggerOnKeyDown: methodOp(onKeyDown),
</span><span class="cx"> triggerOnKeyPress: methodOp(onKeyPress),
</span><del>- triggerOnKeyUp: methodOp(onKeyUp),
</del><ins>+ triggerOnKeyUp: onKeyUp,
</ins><span class="cx">
</span><span class="cx"> execCommand: function(cmd) {
</span><span class="cx"> if (commands.hasOwnProperty(cmd))
</span><del>- return commands[cmd](this);
</del><ins>+ return commands[cmd].call(null, this);
</ins><span class="cx"> },
</span><span class="cx">
</span><ins>+ triggerElectric: methodOp(function(text) { triggerElectric(this, text); }),
+
</ins><span class="cx"> findPosH: function(from, amount, unit, visually) {
</span><span class="cx"> var dir = 1;
</span><span class="cx"> if (amount < 0) { dir = -1; amount = -amount; }
</span><span class="lines">@@ -4206,6 +5161,24 @@
</span><span class="cx"> doc.sel.ranges[i].goalColumn = goals[i];
</span><span class="cx"> }),
</span><span class="cx">
</span><ins>+ // Find the word at the given position (as returned by coordsChar).
+ findWordAt: function(pos) {
+ var doc = this.doc, line = getLine(doc, pos.line).text;
+ var start = pos.ch, end = pos.ch;
+ if (line) {
+ var helper = this.getHelper(pos, "wordChars");
+ if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
+ var startChar = line.charAt(start);
+ var check = isWordChar(startChar, helper)
+ ? function(ch) { return isWordChar(ch, helper); }
+ : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
+ : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
+ while (start > 0 && check(line.charAt(start - 1))) --start;
+ while (end < line.length && check(line.charAt(end))) ++end;
+ }
+ return new Range(Pos(pos.line, start), Pos(pos.line, end));
+ },
+
</ins><span class="cx"> toggleOverwrite: function(value) {
</span><span class="cx"> if (value != null && value == this.state.overwrite) return;
</span><span class="cx"> if (this.state.overwrite = !this.state.overwrite)
</span><span class="lines">@@ -4215,7 +5188,7 @@
</span><span class="cx">
</span><span class="cx"> signal(this, "overwriteToggle", this, this.state.overwrite);
</span><span class="cx"> },
</span><del>- hasFocus: function() { return activeElt() == this.display.input; },
</del><ins>+ hasFocus: function() { return this.display.input.getField() == activeElt(); },
</ins><span class="cx">
</span><span class="cx"> scrollTo: methodOp(function(x, y) {
</span><span class="cx"> if (x != null || y != null) resolveScrollToPos(this);
</span><span class="lines">@@ -4223,10 +5196,11 @@
</span><span class="cx"> if (y != null) this.curOp.scrollTop = y;
</span><span class="cx"> }),
</span><span class="cx"> getScrollInfo: function() {
</span><del>- var scroller = this.display.scroller, co = scrollerCutOff;
</del><ins>+ var scroller = this.display.scroller;
</ins><span class="cx"> return {left: scroller.scrollLeft, top: scroller.scrollTop,
</span><del>- height: scroller.scrollHeight - co, width: scroller.scrollWidth - co,
- clientHeight: scroller.clientHeight - co, clientWidth: scroller.clientWidth - co};
</del><ins>+ height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight,
+ width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth,
+ clientHeight: displayHeight(this), clientWidth: displayWidth(this)};
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> scrollIntoView: methodOp(function(range, margin) {
</span><span class="lines">@@ -4254,14 +5228,21 @@
</span><span class="cx"> }),
</span><span class="cx">
</span><span class="cx"> setSize: methodOp(function(width, height) {
</span><ins>+ var cm = this;
</ins><span class="cx"> function interpret(val) {
</span><span class="cx"> return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val;
</span><span class="cx"> }
</span><del>- if (width != null) this.display.wrapper.style.width = interpret(width);
- if (height != null) this.display.wrapper.style.height = interpret(height);
- if (this.options.lineWrapping) clearLineMeasurementCache(this);
- this.curOp.forceUpdate = true;
- signal(this, "refresh", this);
</del><ins>+ if (width != null) cm.display.wrapper.style.width = interpret(width);
+ if (height != null) cm.display.wrapper.style.height = interpret(height);
+ if (cm.options.lineWrapping) clearLineMeasurementCache(this);
+ var lineNo = cm.display.viewFrom;
+ cm.doc.iter(lineNo, cm.display.viewTo, function(line) {
+ if (line.widgets) for (var i = 0; i < line.widgets.length; i++)
+ if (line.widgets[i].noHScroll) { regLineChange(cm, lineNo, "widget"); break; }
+ ++lineNo;
+ });
+ cm.curOp.forceUpdate = true;
+ signal(cm, "refresh", this);
</ins><span class="cx"> }),
</span><span class="cx">
</span><span class="cx"> operation: function(f){return runInOp(this, f);},
</span><span class="lines">@@ -4283,13 +5264,14 @@
</span><span class="cx"> old.cm = null;
</span><span class="cx"> attachDoc(this, doc);
</span><span class="cx"> clearCaches(this);
</span><del>- resetInput(this);
</del><ins>+ this.display.input.reset();
</ins><span class="cx"> this.scrollTo(doc.scrollLeft, doc.scrollTop);
</span><ins>+ this.curOp.forceScroll = true;
</ins><span class="cx"> signalLater(this, "swapDoc", this, old);
</span><span class="cx"> return old;
</span><span class="cx"> }),
</span><span class="cx">
</span><del>- getInputField: function(){return this.display.input;},
</del><ins>+ getInputField: function(){return this.display.input.getField();},
</ins><span class="cx"> getWrapperElement: function(){return this.display.wrapper;},
</span><span class="cx"> getScrollerElement: function(){return this.display.scroller;},
</span><span class="cx"> getGutterElement: function(){return this.display.gutters;}
</span><span class="lines">@@ -4330,12 +5312,31 @@
</span><span class="cx"> clearCaches(cm);
</span><span class="cx"> regChange(cm);
</span><span class="cx"> }, true);
</span><del>- option("specialChars", /[\t\u0000-\u0019\u00ad\u200b\u2028\u2029\ufeff]/g, function(cm, val) {
- cm.options.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
- cm.refresh();
- }, true);
</del><ins>+ option("lineSeparator", null, function(cm, val) {
+ cm.doc.lineSep = val;
+ if (!val) return;
+ var newBreaks = [], lineNo = cm.doc.first;
+ cm.doc.iter(function(line) {
+ for (var pos = 0;;) {
+ var found = line.text.indexOf(val, pos);
+ if (found == -1) break;
+ pos = found + val.length;
+ newBreaks.push(Pos(lineNo, found));
+ }
+ lineNo++;
+ });
+ for (var i = newBreaks.length - 1; i >= 0; i--)
+ replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
+ });
+ option("specialChars", /[\t\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) {
+ cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
+ if (old != CodeMirror.Init) cm.refresh();
+ });
</ins><span class="cx"> option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh();}, true);
</span><span class="cx"> option("electricChars", true);
</span><ins>+ option("inputStyle", mobile ? "contenteditable" : "textarea", function() {
+ throw new Error("inputStyle can not (yet) be changed in a running editor"); // FIXME
+ }, true);
</ins><span class="cx"> option("rtlMoveVisually", !windows);
</span><span class="cx"> option("wholeLineUpdateBefore", true);
</span><span class="cx">
</span><span class="lines">@@ -4343,7 +5344,12 @@
</span><span class="cx"> themeChanged(cm);
</span><span class="cx"> guttersChanged(cm);
</span><span class="cx"> }, true);
</span><del>- option("keyMap", "default", keyMapChanged);
</del><ins>+ option("keyMap", "default", function(cm, val, old) {
+ var next = getKeyMap(val);
+ var prev = old != CodeMirror.Init && getKeyMap(old);
+ if (prev && prev.detach) prev.detach(cm, next);
+ if (next.attach) next.attach(cm, prev || null);
+ });
</ins><span class="cx"> option("extraKeys", null);
</span><span class="cx">
</span><span class="cx"> option("lineWrapping", false, wrappingChanged, true);
</span><span class="lines">@@ -4355,7 +5361,13 @@
</span><span class="cx"> cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0";
</span><span class="cx"> cm.refresh();
</span><span class="cx"> }, true);
</span><del>- option("coverGutterNextToScrollbar", false, updateScrollbars, true);
</del><ins>+ option("coverGutterNextToScrollbar", false, function(cm) {updateScrollbars(cm);}, true);
+ option("scrollbarStyle", "native", function(cm) {
+ initScrollbars(cm);
+ updateScrollbars(cm);
+ cm.display.scrollbars.setScrollTop(cm.doc.scrollTop);
+ cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft);
+ }, true);
</ins><span class="cx"> option("lineNumbers", false, function(cm) {
</span><span class="cx"> setGuttersForLineNumbers(cm.options);
</span><span class="cx"> guttersChanged(cm);
</span><span class="lines">@@ -4365,6 +5377,7 @@
</span><span class="cx"> option("showCursorWhenSelecting", false, updateSelection, true);
</span><span class="cx">
</span><span class="cx"> option("resetSelectionOnContextMenu", true);
</span><ins>+ option("lineWiseCopyCut", true);
</ins><span class="cx">
</span><span class="cx"> option("readOnly", false, function(cm, val) {
</span><span class="cx"> if (val == "nocursor") {
</span><span class="lines">@@ -4373,15 +5386,16 @@
</span><span class="cx"> cm.display.disabled = true;
</span><span class="cx"> } else {
</span><span class="cx"> cm.display.disabled = false;
</span><del>- if (!val) resetInput(cm);
</del><ins>+ if (!val) cm.display.input.reset();
</ins><span class="cx"> }
</span><span class="cx"> });
</span><del>- option("disableInput", false, function(cm, val) {if (!val) resetInput(cm);}, true);
- option("dragDrop", true);
</del><ins>+ option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset();}, true);
+ option("dragDrop", true, dragDropChanged);
</ins><span class="cx">
</span><span class="cx"> option("cursorBlinkRate", 530);
</span><span class="cx"> option("cursorScrollMargin", 0);
</span><del>- option("cursorHeight", 1);
</del><ins>+ option("cursorHeight", 1, updateSelection, true);
+ option("singleCursorHeightPerLine", true, updateSelection, true);
</ins><span class="cx"> option("workTime", 100);
</span><span class="cx"> option("workDelay", 100);
</span><span class="cx"> option("flattenSpans", true, resetModeState, true);
</span><span class="lines">@@ -4392,11 +5406,11 @@
</span><span class="cx"> option("viewportMargin", 10, function(cm){cm.refresh();}, true);
</span><span class="cx"> option("maxHighlightLength", 10000, resetModeState, true);
</span><span class="cx"> option("moveInputWithCursor", true, function(cm, val) {
</span><del>- if (!val) cm.display.inputDiv.style.top = cm.display.inputDiv.style.left = 0;
</del><ins>+ if (!val) cm.display.input.resetPosition();
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> option("tabindex", null, function(cm, val) {
</span><del>- cm.display.input.tabIndex = val || "";
</del><ins>+ cm.display.input.getField().tabIndex = val || "";
</ins><span class="cx"> });
</span><span class="cx"> option("autofocus", null);
</span><span class="cx">
</span><span class="lines">@@ -4410,10 +5424,8 @@
</span><span class="cx"> // load a mode. (Preferred mechanism is the require/define calls.)
</span><span class="cx"> CodeMirror.defineMode = function(name, mode) {
</span><span class="cx"> if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name;
</span><del>- if (arguments.length > 2) {
- mode.dependencies = [];
- for (var i = 2; i < arguments.length; ++i) mode.dependencies.push(arguments[i]);
- }
</del><ins>+ if (arguments.length > 2)
+ mode.dependencies = Array.prototype.slice.call(arguments, 2);
</ins><span class="cx"> modes[name] = mode;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -4564,6 +5576,20 @@
</span><span class="cx"> return {from: Pos(range.from().line, 0), to: range.from()};
</span><span class="cx"> });
</span><span class="cx"> },
</span><ins>+ delWrappedLineLeft: function(cm) {
+ deleteNearSelection(cm, function(range) {
+ var top = cm.charCoords(range.head, "div").top + 5;
+ var leftPos = cm.coordsChar({left: 0, top: top}, "div");
+ return {from: leftPos, to: range.from()};
+ });
+ },
+ delWrappedLineRight: function(cm) {
+ deleteNearSelection(cm, function(range) {
+ var top = cm.charCoords(range.head, "div").top + 5;
+ var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
+ return {from: range.from(), to: rightPos };
+ });
+ },
</ins><span class="cx"> undo: function(cm) {cm.undo();},
</span><span class="cx"> redo: function(cm) {cm.redo();},
</span><span class="cx"> undoSelection: function(cm) {cm.undoSelection();},
</span><span class="lines">@@ -4571,23 +5597,17 @@
</span><span class="cx"> goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));},
</span><span class="cx"> goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()));},
</span><span class="cx"> goLineStart: function(cm) {
</span><del>- cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); }, sel_move);
</del><ins>+ cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); },
+ {origin: "+move", bias: 1});
</ins><span class="cx"> },
</span><span class="cx"> goLineStartSmart: function(cm) {
</span><span class="cx"> cm.extendSelectionsBy(function(range) {
</span><del>- var start = lineStart(cm, range.head.line);
- var line = cm.getLineHandle(start.line);
- var order = getOrder(line);
- if (!order || order[0].level == 0) {
- var firstNonWS = Math.max(0, line.text.search(/\S/));
- var inWS = range.head.line == start.line && range.head.ch <= firstNonWS && range.head.ch;
- return Pos(start.line, inWS ? 0 : firstNonWS);
- }
- return start;
- }, sel_move);
</del><ins>+ return lineStartSmart(cm, range.head);
+ }, {origin: "+move", bias: 1});
</ins><span class="cx"> },
</span><span class="cx"> goLineEnd: function(cm) {
</span><del>- cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); }, sel_move);
</del><ins>+ cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); },
+ {origin: "+move", bias: -1});
</ins><span class="cx"> },
</span><span class="cx"> goLineRight: function(cm) {
</span><span class="cx"> cm.extendSelectionsBy(function(range) {
</span><span class="lines">@@ -4601,6 +5621,14 @@
</span><span class="cx"> return cm.coordsChar({left: 0, top: top}, "div");
</span><span class="cx"> }, sel_move);
</span><span class="cx"> },
</span><ins>+ goLineLeftSmart: function(cm) {
+ cm.extendSelectionsBy(function(range) {
+ var top = cm.charCoords(range.head, "div").top + 5;
+ var pos = cm.coordsChar({left: 0, top: top}, "div");
+ if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head);
+ return pos;
+ }, sel_move);
+ },
</ins><span class="cx"> goLineUp: function(cm) {cm.moveV(-1, "line");},
</span><span class="cx"> goLineDown: function(cm) {cm.moveV(1, "line");},
</span><span class="cx"> goPageUp: function(cm) {cm.moveV(-1, "page");},
</span><span class="lines">@@ -4650,7 +5678,8 @@
</span><span class="cx"> } else if (cur.line > cm.doc.first) {
</span><span class="cx"> var prev = getLine(cm.doc, cur.line - 1).text;
</span><span class="cx"> if (prev)
</span><del>- cm.replaceRange(line.charAt(0) + "\n" + prev.charAt(prev.length - 1),
</del><ins>+ cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
+ prev.charAt(prev.length - 1),
</ins><span class="cx"> Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose");
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -4664,7 +5693,7 @@
</span><span class="cx"> var len = cm.listSelections().length;
</span><span class="cx"> for (var i = 0; i < len; i++) {
</span><span class="cx"> var range = cm.listSelections()[i];
</span><del>- cm.replaceRange("\n", range.anchor, range.head, "+input");
</del><ins>+ cm.replaceRange(cm.doc.lineSeparator(), range.anchor, range.head, "+input");
</ins><span class="cx"> cm.indentLine(range.from().line + 1, null, true);
</span><span class="cx"> ensureCursorVisible(cm);
</span><span class="cx"> }
</span><span class="lines">@@ -4673,9 +5702,11 @@
</span><span class="cx"> toggleOverwrite: function(cm) {cm.toggleOverwrite();}
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> // STANDARD KEYMAPS
</span><span class="cx">
</span><span class="cx"> var keyMap = CodeMirror.keyMap = {};
</span><ins>+
</ins><span class="cx"> keyMap.basic = {
</span><span class="cx"> "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
</span><span class="cx"> "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
</span><span class="lines">@@ -4689,7 +5720,7 @@
</span><span class="cx"> // are simply ignored.
</span><span class="cx"> keyMap.pcDefault = {
</span><span class="cx"> "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
</span><del>- "Ctrl-Home": "goDocStart", "Ctrl-Up": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Down": "goDocEnd",
</del><ins>+ "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown",
</ins><span class="cx"> "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
</span><span class="cx"> "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
</span><span class="cx"> "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
</span><span class="lines">@@ -4697,16 +5728,6 @@
</span><span class="cx"> "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
</span><span class="cx"> fallthrough: "basic"
</span><span class="cx"> };
</span><del>- keyMap.macDefault = {
- "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
- "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
- "Alt-Right": "goGroupRight", "Cmd-Left": "goLineStart", "Cmd-Right": "goLineEnd", "Alt-Backspace": "delGroupBefore",
- "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
- "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
- "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delLineLeft",
- "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection",
- fallthrough: ["basic", "emacsy"]
- };
</del><span class="cx"> // Very basic readline/emacs-style bindings, which are standard on Mac.
</span><span class="cx"> keyMap.emacsy = {
</span><span class="cx"> "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
</span><span class="lines">@@ -4714,70 +5735,117 @@
</span><span class="cx"> "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
</span><span class="cx"> "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars"
</span><span class="cx"> };
</span><ins>+ keyMap.macDefault = {
+ "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
+ "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
+ "Alt-Right": "goGroupRight", "Cmd-Left": "goLineLeft", "Cmd-Right": "goLineRight", "Alt-Backspace": "delGroupBefore",
+ "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
+ "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
+ "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
+ "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
+ fallthrough: ["basic", "emacsy"]
+ };
</ins><span class="cx"> keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
</span><span class="cx">
</span><span class="cx"> // KEYMAP DISPATCH
</span><span class="cx">
</span><del>- function getKeyMap(val) {
- if (typeof val == "string") return keyMap[val];
- else return val;
</del><ins>+ function normalizeKeyName(name) {
+ var parts = name.split(/-(?!$)/), name = parts[parts.length - 1];
+ var alt, ctrl, shift, cmd;
+ for (var i = 0; i < parts.length - 1; i++) {
+ var mod = parts[i];
+ if (/^(cmd|meta|m)$/i.test(mod)) cmd = true;
+ else if (/^a(lt)?$/i.test(mod)) alt = true;
+ else if (/^(c|ctrl|control)$/i.test(mod)) ctrl = true;
+ else if (/^s(hift)$/i.test(mod)) shift = true;
+ else throw new Error("Unrecognized modifier name: " + mod);
+ }
+ if (alt) name = "Alt-" + name;
+ if (ctrl) name = "Ctrl-" + name;
+ if (cmd) name = "Cmd-" + name;
+ if (shift) name = "Shift-" + name;
+ return name;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // Given an array of keymaps and a key name, call handle on any
- // bindings found, until that returns a truthy value, at which point
- // we consider the key handled. Implements things like binding a key
- // to false stopping further handling and keymap fallthrough.
- var lookupKey = CodeMirror.lookupKey = function(name, maps, handle) {
- function lookup(map) {
- map = getKeyMap(map);
- var found = map[name];
- if (found === false) return "stop";
- if (found != null && handle(found)) return true;
- if (map.nofallthrough) return "stop";
</del><ins>+ // This is a kludge to keep keymaps mostly working as raw objects
+ // (backwards compatibility) while at the same time support features
+ // like normalization and multi-stroke key bindings. It compiles a
+ // new normalized keymap, and then updates the old object to reflect
+ // this.
+ CodeMirror.normalizeKeyMap = function(keymap) {
+ var copy = {};
+ for (var keyname in keymap) if (keymap.hasOwnProperty(keyname)) {
+ var value = keymap[keyname];
+ if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) continue;
+ if (value == "...") { delete keymap[keyname]; continue; }
</ins><span class="cx">
</span><del>- var fallthrough = map.fallthrough;
- if (fallthrough == null) return false;
- if (Object.prototype.toString.call(fallthrough) != "[object Array]")
- return lookup(fallthrough);
- for (var i = 0; i < fallthrough.length; ++i) {
- var done = lookup(fallthrough[i]);
- if (done) return done;
</del><ins>+ var keys = map(keyname.split(" "), normalizeKeyName);
+ for (var i = 0; i < keys.length; i++) {
+ var val, name;
+ if (i == keys.length - 1) {
+ name = keys.join(" ");
+ val = value;
+ } else {
+ name = keys.slice(0, i + 1).join(" ");
+ val = "...";
+ }
+ var prev = copy[name];
+ if (!prev) copy[name] = val;
+ else if (prev != val) throw new Error("Inconsistent bindings for " + name);
</ins><span class="cx"> }
</span><del>- return false;
</del><ins>+ delete keymap[keyname];
</ins><span class="cx"> }
</span><ins>+ for (var prop in copy) keymap[prop] = copy[prop];
+ return keymap;
+ };
</ins><span class="cx">
</span><del>- for (var i = 0; i < maps.length; ++i) {
- var done = lookup(maps[i]);
- if (done) return done != "stop";
</del><ins>+ var lookupKey = CodeMirror.lookupKey = function(key, map, handle, context) {
+ map = getKeyMap(map);
+ var found = map.call ? map.call(key, context) : map[key];
+ if (found === false) return "nothing";
+ if (found === "...") return "multi";
+ if (found != null && handle(found)) return "handled";
+
+ if (map.fallthrough) {
+ if (Object.prototype.toString.call(map.fallthrough) != "[object Array]")
+ return lookupKey(key, map.fallthrough, handle, context);
+ for (var i = 0; i < map.fallthrough.length; i++) {
+ var result = lookupKey(key, map.fallthrough[i], handle, context);
+ if (result) return result;
+ }
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Modifier key presses don't count as 'real' key presses for the
</span><span class="cx"> // purpose of keymap fallthrough.
</span><del>- var isModifierKey = CodeMirror.isModifierKey = function(event) {
- var name = keyNames[event.keyCode];
</del><ins>+ var isModifierKey = CodeMirror.isModifierKey = function(value) {
+ var name = typeof value == "string" ? value : keyNames[value.keyCode];
</ins><span class="cx"> return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Look up the name of a key as indicated by an event object.
</span><span class="cx"> var keyName = CodeMirror.keyName = function(event, noShift) {
</span><span class="cx"> if (presto && event.keyCode == 34 && event["char"]) return false;
</span><del>- var name = keyNames[event.keyCode];
</del><ins>+ var base = keyNames[event.keyCode], name = base;
</ins><span class="cx"> if (name == null || event.altGraphKey) return false;
</span><del>- if (event.altKey) name = "Alt-" + name;
- if (flipCtrlCmd ? event.metaKey : event.ctrlKey) name = "Ctrl-" + name;
- if (flipCtrlCmd ? event.ctrlKey : event.metaKey) name = "Cmd-" + name;
- if (!noShift && event.shiftKey) name = "Shift-" + name;
</del><ins>+ if (event.altKey && base != "Alt") name = "Alt-" + name;
+ if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name;
+ if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") name = "Cmd-" + name;
+ if (!noShift && event.shiftKey && base != "Shift") name = "Shift-" + name;
</ins><span class="cx"> return name;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ function getKeyMap(val) {
+ return typeof val == "string" ? keyMap[val] : val;
+ }
+
</ins><span class="cx"> // FROMTEXTAREA
</span><span class="cx">
</span><span class="cx"> CodeMirror.fromTextArea = function(textarea, options) {
</span><del>- if (!options) options = {};
</del><ins>+ options = options ? copyObj(options) : {};
</ins><span class="cx"> options.value = textarea.value;
</span><del>- if (!options.tabindex && textarea.tabindex)
- options.tabindex = textarea.tabindex;
</del><ins>+ if (!options.tabindex && textarea.tabIndex)
+ options.tabindex = textarea.tabIndex;
</ins><span class="cx"> if (!options.placeholder && textarea.placeholder)
</span><span class="cx"> options.placeholder = textarea.placeholder;
</span><span class="cx"> // Set autofocus to true if this textarea is focused, or if it has
</span><span class="lines">@@ -4805,22 +5873,26 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ options.finishInit = function(cm) {
+ cm.save = save;
+ cm.getTextArea = function() { return textarea; };
+ cm.toTextArea = function() {
+ cm.toTextArea = isNaN; // Prevent this from being ran twice
+ save();
+ textarea.parentNode.removeChild(cm.getWrapperElement());
+ textarea.style.display = "";
+ if (textarea.form) {
+ off(textarea.form, "submit", save);
+ if (typeof textarea.form.submit == "function")
+ textarea.form.submit = realSubmit;
+ }
+ };
+ };
+
</ins><span class="cx"> textarea.style.display = "none";
</span><span class="cx"> var cm = CodeMirror(function(node) {
</span><span class="cx"> textarea.parentNode.insertBefore(node, textarea.nextSibling);
</span><span class="cx"> }, options);
</span><del>- cm.save = save;
- cm.getTextArea = function() { return textarea; };
- cm.toTextArea = function() {
- save();
- textarea.parentNode.removeChild(cm.getWrapperElement());
- textarea.style.display = "";
- if (textarea.form) {
- off(textarea.form, "submit", save);
- if (typeof textarea.form.submit == "function")
- textarea.form.submit = realSubmit;
- }
- };
</del><span class="cx"> return cm;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -4913,10 +5985,13 @@
</span><span class="cx"> // marker continues beyond the start/end of the line. Markers have
</span><span class="cx"> // links back to the lines they currently touch.
</span><span class="cx">
</span><ins>+ var nextMarkerId = 0;
+
</ins><span class="cx"> var TextMarker = CodeMirror.TextMarker = function(doc, type) {
</span><span class="cx"> this.lines = [];
</span><span class="cx"> this.type = type;
</span><span class="cx"> this.doc = doc;
</span><ins>+ this.id = ++nextMarkerId;
</ins><span class="cx"> };
</span><span class="cx"> eventMixin(TextMarker);
</span><span class="cx">
</span><span class="lines">@@ -5048,7 +6123,7 @@
</span><span class="cx"> // Showing up as a widget implies collapsed (widget replaces text)
</span><span class="cx"> marker.collapsed = true;
</span><span class="cx"> marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget");
</span><del>- if (!options.handleMouseEvents) marker.widgetNode.ignoreEvents = true;
</del><ins>+ if (!options.handleMouseEvents) marker.widgetNode.setAttribute("cm-ignore-events", "true");
</ins><span class="cx"> if (options.insertLeft) marker.widgetNode.insertLeft = true;
</span><span class="cx"> }
</span><span class="cx"> if (marker.collapsed) {
</span><span class="lines">@@ -5092,7 +6167,7 @@
</span><span class="cx"> if (updateMaxLine) cm.curOp.updateMaxLine = true;
</span><span class="cx"> if (marker.collapsed)
</span><span class="cx"> regChange(cm, from.line, to.line + 1);
</span><del>- else if (marker.className || marker.title || marker.startStyle || marker.endStyle)
</del><ins>+ else if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.css)
</ins><span class="cx"> for (var i = from.line; i <= to.line; i++) regLineChange(cm, i, "text");
</span><span class="cx"> if (marker.atomic) reCheckSelection(cm.doc);
</span><span class="cx"> signalLater(cm, "markerAdded", cm, marker);
</span><span class="lines">@@ -5232,6 +6307,7 @@
</span><span class="cx"> // spans partially within the change. Returns an array of span
</span><span class="cx"> // arrays with one element for each line in (after) the change.
</span><span class="cx"> function stretchSpansOverChange(doc, change) {
</span><ins>+ if (change.full) return null;
</ins><span class="cx"> var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans;
</span><span class="cx"> var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;
</span><span class="cx"> if (!oldFirst && !oldLast) return null;
</span><span class="lines">@@ -5419,8 +6495,8 @@
</span><span class="cx"> var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);
</span><span class="cx"> var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);
</span><span class="cx"> if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue;
</span><del>- if (fromCmp <= 0 && (cmp(found.to, from) || extraRight(sp.marker) - extraLeft(marker)) > 0 ||
- fromCmp >= 0 && (cmp(found.from, to) || extraLeft(sp.marker) - extraRight(marker)) < 0)
</del><ins>+ if (fromCmp <= 0 && (cmp(found.to, from) > 0 || (sp.marker.inclusiveRight && marker.inclusiveLeft)) ||
+ fromCmp >= 0 && (cmp(found.from, to) < 0 || (sp.marker.inclusiveLeft && marker.inclusiveRight)))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -5499,10 +6575,10 @@
</span><span class="cx">
</span><span class="cx"> // Line widgets are block elements displayed above or below a line.
</span><span class="cx">
</span><del>- var LineWidget = CodeMirror.LineWidget = function(cm, node, options) {
</del><ins>+ var LineWidget = CodeMirror.LineWidget = function(doc, node, options) {
</ins><span class="cx"> if (options) for (var opt in options) if (options.hasOwnProperty(opt))
</span><span class="cx"> this[opt] = options[opt];
</span><del>- this.cm = cm;
</del><ins>+ this.doc = doc;
</ins><span class="cx"> this.node = node;
</span><span class="cx"> };
</span><span class="cx"> eventMixin(LineWidget);
</span><span class="lines">@@ -5513,46 +6589,55 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LineWidget.prototype.clear = function() {
</span><del>- var cm = this.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);
</del><ins>+ var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);
</ins><span class="cx"> if (no == null || !ws) return;
</span><span class="cx"> for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);
</span><span class="cx"> if (!ws.length) line.widgets = null;
</span><span class="cx"> var height = widgetHeight(this);
</span><del>- runInOp(cm, function() {
</del><ins>+ updateLineHeight(line, Math.max(0, line.height - height));
+ if (cm) runInOp(cm, function() {
</ins><span class="cx"> adjustScrollWhenAboveVisible(cm, line, -height);
</span><span class="cx"> regLineChange(cm, no, "widget");
</span><del>- updateLineHeight(line, Math.max(0, line.height - height));
</del><span class="cx"> });
</span><span class="cx"> };
</span><span class="cx"> LineWidget.prototype.changed = function() {
</span><del>- var oldH = this.height, cm = this.cm, line = this.line;
</del><ins>+ var oldH = this.height, cm = this.doc.cm, line = this.line;
</ins><span class="cx"> this.height = null;
</span><span class="cx"> var diff = widgetHeight(this) - oldH;
</span><span class="cx"> if (!diff) return;
</span><del>- runInOp(cm, function() {
</del><ins>+ updateLineHeight(line, line.height + diff);
+ if (cm) runInOp(cm, function() {
</ins><span class="cx"> cm.curOp.forceUpdate = true;
</span><span class="cx"> adjustScrollWhenAboveVisible(cm, line, diff);
</span><del>- updateLineHeight(line, line.height + diff);
</del><span class="cx"> });
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function widgetHeight(widget) {
</span><span class="cx"> if (widget.height != null) return widget.height;
</span><del>- if (!contains(document.body, widget.node))
- removeChildrenAndAdd(widget.cm.display.measure, elt("div", [widget.node], null, "position: relative"));
</del><ins>+ var cm = widget.doc.cm;
+ if (!cm) return 0;
+ if (!contains(document.body, widget.node)) {
+ var parentStyle = "position: relative;";
+ if (widget.coverGutter)
+ parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;";
+ if (widget.noHScroll)
+ parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;";
+ removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle));
+ }
</ins><span class="cx"> return widget.height = widget.node.offsetHeight;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function addLineWidget(cm, handle, node, options) {
- var widget = new LineWidget(cm, node, options);
- if (widget.noHScroll) cm.display.alignWidgets = true;
- changeLine(cm, handle, "widget", function(line) {
</del><ins>+ function addLineWidget(doc, handle, node, options) {
+ var widget = new LineWidget(doc, node, options);
+ var cm = doc.cm;
+ if (cm && widget.noHScroll) cm.display.alignWidgets = true;
+ changeLine(doc, handle, "widget", function(line) {
</ins><span class="cx"> var widgets = line.widgets || (line.widgets = []);
</span><span class="cx"> if (widget.insertAt == null) widgets.push(widget);
</span><span class="cx"> else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
</span><span class="cx"> widget.line = line;
</span><del>- if (!lineIsHidden(cm.doc, line)) {
- var aboveVisible = heightAtLine(line) < cm.doc.scrollTop;
</del><ins>+ if (cm && !lineIsHidden(doc, line)) {
+ var aboveVisible = heightAtLine(line) < doc.scrollTop;
</ins><span class="cx"> updateLineHeight(line, line.height + widgetHeight(widget));
</span><span class="cx"> if (aboveVisible) addToScrollPos(cm, null, widget.height);
</span><span class="cx"> cm.curOp.forceUpdate = true;
</span><span class="lines">@@ -5615,20 +6700,44 @@
</span><span class="cx"> if (inner.mode.blankLine) return inner.mode.blankLine(inner.state);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function readToken(mode, stream, state) {
</del><ins>+ function readToken(mode, stream, state, inner) {
</ins><span class="cx"> for (var i = 0; i < 10; i++) {
</span><ins>+ if (inner) inner[0] = CodeMirror.innerMode(mode, state).mode;
</ins><span class="cx"> var style = mode.token(stream, state);
</span><span class="cx"> if (stream.pos > stream.start) return style;
</span><span class="cx"> }
</span><span class="cx"> throw new Error("Mode " + mode.name + " failed to advance stream.");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Utility for getTokenAt and getLineTokens
+ function takeToken(cm, pos, precise, asArray) {
+ function getObj(copy) {
+ return {start: stream.start, end: stream.pos,
+ string: stream.current(),
+ type: style || null,
+ state: copy ? copyState(doc.mode, state) : state};
+ }
+
+ var doc = cm.doc, mode = doc.mode, style;
+ pos = clipPos(doc, pos);
+ var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise);
+ var stream = new StringStream(line.text, cm.options.tabSize), tokens;
+ if (asArray) tokens = [];
+ while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
+ stream.start = stream.pos;
+ style = readToken(mode, stream, state);
+ if (asArray) tokens.push(getObj(true));
+ }
+ return asArray ? tokens : getObj();
+ }
+
</ins><span class="cx"> // Run the given mode's parser over a line, calling f for each token.
</span><span class="cx"> function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
</span><span class="cx"> var flattenSpans = mode.flattenSpans;
</span><span class="cx"> if (flattenSpans == null) flattenSpans = cm.options.flattenSpans;
</span><span class="cx"> var curStart = 0, curStyle = null;
</span><span class="cx"> var stream = new StringStream(text, cm.options.tabSize), style;
</span><ins>+ var inner = cm.options.addModeClass && [null];
</ins><span class="cx"> if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses);
</span><span class="cx"> while (!stream.eol()) {
</span><span class="cx"> if (stream.pos > cm.options.maxHighlightLength) {
</span><span class="lines">@@ -5637,15 +6746,18 @@
</span><span class="cx"> stream.pos = text.length;
</span><span class="cx"> style = null;
</span><span class="cx"> } else {
</span><del>- style = extractLineClasses(readToken(mode, stream, state), lineClasses);
</del><ins>+ style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses);
</ins><span class="cx"> }
</span><del>- if (cm.options.addModeClass) {
- var mName = CodeMirror.innerMode(mode, state).mode.name;
</del><ins>+ if (inner) {
+ var mName = inner[0].name;
</ins><span class="cx"> if (mName) style = "m-" + (style ? mName + " " + style : mName);
</span><span class="cx"> }
</span><span class="cx"> if (!flattenSpans || curStyle != style) {
</span><del>- if (curStart < stream.start) f(stream.start, curStyle);
- curStart = stream.start; curStyle = style;
</del><ins>+ while (curStart < stream.start) {
+ curStart = Math.min(stream.start, curStart + 50000);
+ f(curStart, curStyle);
+ }
+ curStyle = style;
</ins><span class="cx"> }
</span><span class="cx"> stream.start = stream.pos;
</span><span class="cx"> }
</span><span class="lines">@@ -5699,12 +6811,13 @@
</span><span class="cx"> return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null};
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function getLineStyles(cm, line) {
</del><ins>+ function getLineStyles(cm, line, updateFrontier) {
</ins><span class="cx"> if (!line.styles || line.styles[0] != cm.state.modeGen) {
</span><span class="cx"> var result = highlightLine(cm, line, line.stateAfter = getStateBefore(cm, lineNo(line)));
</span><span class="cx"> line.styles = result.styles;
</span><span class="cx"> if (result.classes) line.styleClasses = result.classes;
</span><span class="cx"> else if (line.styleClasses) line.styleClasses = null;
</span><ins>+ if (updateFrontier === cm.doc.frontier) cm.doc.frontier++;
</ins><span class="cx"> }
</span><span class="cx"> return line.styles;
</span><span class="cx"> }
</span><span class="lines">@@ -5744,7 +6857,9 @@
</span><span class="cx"> // is needed on Webkit to be able to get line-level bounding
</span><span class="cx"> // rectangles for it (in measureChar).
</span><span class="cx"> var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
</span><del>- var builder = {pre: elt("pre", [content]), content: content, col: 0, pos: 0, cm: cm};
</del><ins>+ var builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
+ col: 0, pos: 0, cm: cm,
+ splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")};
</ins><span class="cx"> lineView.measure = {};
</span><span class="cx">
</span><span class="cx"> // Iterate over the logical lines that make up this visual line.
</span><span class="lines">@@ -5754,12 +6869,11 @@
</span><span class="cx"> builder.addToken = buildToken;
</span><span class="cx"> // Optionally wire in some hacks into the token-rendering
</span><span class="cx"> // algorithm, to deal with browser quirks.
</span><del>- if ((ie || webkit) && cm.getOption("lineWrapping"))
- builder.addToken = buildTokenSplitSpaces(builder.addToken);
</del><span class="cx"> if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
</span><span class="cx"> builder.addToken = buildTokenBadBidi(builder.addToken, order);
</span><span class="cx"> builder.map = [];
</span><del>- insertLineContent(line, builder, getLineStyles(cm, line));
</del><ins>+ var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line);
+ insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate));
</ins><span class="cx"> if (line.styleClasses) {
</span><span class="cx"> if (line.styleClasses.bgClass)
</span><span class="cx"> builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || "");
</span><span class="lines">@@ -5781,28 +6895,35 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // See issue #2901
+ if (webkit && /\bcm-tab\b/.test(builder.content.lastChild.className))
+ builder.content.className = "cm-tab-wrap-hack";
+
</ins><span class="cx"> signal(cm, "renderLine", cm, lineView.line, builder.pre);
</span><span class="cx"> if (builder.pre.className)
</span><span class="cx"> builder.textClass = joinClasses(builder.pre.className, builder.textClass || "");
</span><ins>+
</ins><span class="cx"> return builder;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function defaultSpecialCharPlaceholder(ch) {
</span><span class="cx"> var token = elt("span", "\u2022", "cm-invalidchar");
</span><span class="cx"> token.title = "\\u" + ch.charCodeAt(0).toString(16);
</span><ins>+ token.setAttribute("aria-label", token.title);
</ins><span class="cx"> return token;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Build up the DOM representation for a single token, and add it to
</span><span class="cx"> // the line map. Takes care to render special characters separately.
</span><del>- function buildToken(builder, text, style, startStyle, endStyle, title) {
</del><ins>+ function buildToken(builder, text, style, startStyle, endStyle, title, css) {
</ins><span class="cx"> if (!text) return;
</span><del>- var special = builder.cm.options.specialChars, mustWrap = false;
</del><ins>+ var displayText = builder.splitSpaces ? text.replace(/ {3,}/g, splitSpaces) : text;
+ var special = builder.cm.state.specialChars, mustWrap = false;
</ins><span class="cx"> if (!special.test(text)) {
</span><span class="cx"> builder.col += text.length;
</span><del>- var content = document.createTextNode(text);
</del><ins>+ var content = document.createTextNode(displayText);
</ins><span class="cx"> builder.map.push(builder.pos, builder.pos + text.length, content);
</span><del>- if (ie_upto8) mustWrap = true;
</del><ins>+ if (ie && ie_version < 9) mustWrap = true;
</ins><span class="cx"> builder.pos += text.length;
</span><span class="cx"> } else {
</span><span class="cx"> var content = document.createDocumentFragment(), pos = 0;
</span><span class="lines">@@ -5811,8 +6932,8 @@
</span><span class="cx"> var m = special.exec(text);
</span><span class="cx"> var skipped = m ? m.index - pos : text.length - pos;
</span><span class="cx"> if (skipped) {
</span><del>- var txt = document.createTextNode(text.slice(pos, pos + skipped));
- if (ie_upto8) content.appendChild(elt("span", [txt]));
</del><ins>+ var txt = document.createTextNode(displayText.slice(pos, pos + skipped));
+ if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
</ins><span class="cx"> else content.appendChild(txt);
</span><span class="cx"> builder.map.push(builder.pos, builder.pos + skipped, txt);
</span><span class="cx"> builder.col += skipped;
</span><span class="lines">@@ -5823,10 +6944,17 @@
</span><span class="cx"> if (m[0] == "\t") {
</span><span class="cx"> var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize;
</span><span class="cx"> var txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
</span><ins>+ txt.setAttribute("role", "presentation");
+ txt.setAttribute("cm-text", "\t");
</ins><span class="cx"> builder.col += tabWidth;
</span><ins>+ } else if (m[0] == "\r" || m[0] == "\n") {
+ var txt = content.appendChild(elt("span", m[0] == "\r" ? "␍" : "", "cm-invalidchar"));
+ txt.setAttribute("cm-text", m[0]);
+ builder.col += 1;
</ins><span class="cx"> } else {
</span><span class="cx"> var txt = builder.cm.options.specialCharPlaceholder(m[0]);
</span><del>- if (ie_upto8) content.appendChild(elt("span", [txt]));
</del><ins>+ txt.setAttribute("cm-text", m[0]);
+ if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
</ins><span class="cx"> else content.appendChild(txt);
</span><span class="cx"> builder.col += 1;
</span><span class="cx"> }
</span><span class="lines">@@ -5834,33 +6962,28 @@
</span><span class="cx"> builder.pos++;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (style || startStyle || endStyle || mustWrap) {
</del><ins>+ if (style || startStyle || endStyle || mustWrap || css) {
</ins><span class="cx"> var fullStyle = style || "";
</span><span class="cx"> if (startStyle) fullStyle += startStyle;
</span><span class="cx"> if (endStyle) fullStyle += endStyle;
</span><del>- var token = elt("span", [content], fullStyle);
</del><ins>+ var token = elt("span", [content], fullStyle, css);
</ins><span class="cx"> if (title) token.title = title;
</span><span class="cx"> return builder.content.appendChild(token);
</span><span class="cx"> }
</span><span class="cx"> builder.content.appendChild(content);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function buildTokenSplitSpaces(inner) {
- function split(old) {
- var out = " ";
- for (var i = 0; i < old.length - 2; ++i) out += i % 2 ? " " : "\u00a0";
- out += " ";
- return out;
- }
- return function(builder, text, style, startStyle, endStyle, title) {
- inner(builder, text.replace(/ {3,}/g, split), style, startStyle, endStyle, title);
- };
</del><ins>+ function splitSpaces(old) {
+ var out = " ";
+ for (var i = 0; i < old.length - 2; ++i) out += i % 2 ? " " : "\u00a0";
+ out += " ";
+ return out;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Work around nonsense dimensions being reported for stretches of
</span><span class="cx"> // right-to-left text.
</span><span class="cx"> function buildTokenBadBidi(inner, order) {
</span><del>- return function(builder, text, style, startStyle, endStyle, title) {
</del><ins>+ return function(builder, text, style, startStyle, endStyle, title, css) {
</ins><span class="cx"> style = style ? style + " cm-force-border" : "cm-force-border";
</span><span class="cx"> var start = builder.pos, end = start + text.length;
</span><span class="cx"> for (;;) {
</span><span class="lines">@@ -5869,8 +6992,8 @@
</span><span class="cx"> var part = order[i];
</span><span class="cx"> if (part.to > start && part.from <= start) break;
</span><span class="cx"> }
</span><del>- if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title);
- inner(builder, text.slice(0, part.to - start), style, startStyle, null, title);
</del><ins>+ if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title, css);
+ inner(builder, text.slice(0, part.to - start), style, startStyle, null, title, css);
</ins><span class="cx"> startStyle = null;
</span><span class="cx"> text = text.slice(part.to - start);
</span><span class="cx"> start = part.to;
</span><span class="lines">@@ -5880,8 +7003,14 @@
</span><span class="cx">
</span><span class="cx"> function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
</span><span class="cx"> var widget = !ignoreWidget && marker.widgetNode;
</span><ins>+ if (widget) builder.map.push(builder.pos, builder.pos + size, widget);
+ if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) {
+ if (!widget)
+ widget = builder.content.appendChild(document.createElement("span"));
+ widget.setAttribute("cm-marker", marker.id);
+ }
</ins><span class="cx"> if (widget) {
</span><del>- builder.map.push(builder.pos, builder.pos + size, widget);
</del><ins>+ builder.cm.display.input.setUneditable(widget);
</ins><span class="cx"> builder.content.appendChild(widget);
</span><span class="cx"> }
</span><span class="cx"> builder.pos += size;
</span><span class="lines">@@ -5897,18 +7026,24 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var len = allText.length, pos = 0, i = 1, text = "", style;
</del><ins>+ var len = allText.length, pos = 0, i = 1, text = "", style, css;
</ins><span class="cx"> var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed;
</span><span class="cx"> for (;;) {
</span><span class="cx"> if (nextChange == pos) { // Update current marker set
</span><del>- spanStyle = spanEndStyle = spanStartStyle = title = "";
</del><ins>+ spanStyle = spanEndStyle = spanStartStyle = title = css = "";
</ins><span class="cx"> collapsed = null; nextChange = Infinity;
</span><span class="cx"> var foundBookmarks = [];
</span><span class="cx"> for (var j = 0; j < spans.length; ++j) {
</span><span class="cx"> var sp = spans[j], m = sp.marker;
</span><del>- if (sp.from <= pos && (sp.to == null || sp.to > pos)) {
- if (sp.to != null && nextChange > sp.to) { nextChange = sp.to; spanEndStyle = ""; }
</del><ins>+ if (m.type == "bookmark" && sp.from == pos && m.widgetNode) {
+ foundBookmarks.push(m);
+ } else if (sp.from <= pos && (sp.to == null || sp.to > pos || m.collapsed && sp.to == pos && sp.from == pos)) {
+ if (sp.to != null && sp.to != pos && nextChange > sp.to) {
+ nextChange = sp.to;
+ spanEndStyle = "";
+ }
</ins><span class="cx"> if (m.className) spanStyle += " " + m.className;
</span><ins>+ if (m.css) css = m.css;
</ins><span class="cx"> if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
</span><span class="cx"> if (m.endStyle && sp.to == nextChange) spanEndStyle += " " + m.endStyle;
</span><span class="cx"> if (m.title && !title) title = m.title;
</span><span class="lines">@@ -5917,12 +7052,12 @@
</span><span class="cx"> } else if (sp.from > pos && nextChange > sp.from) {
</span><span class="cx"> nextChange = sp.from;
</span><span class="cx"> }
</span><del>- if (m.type == "bookmark" && sp.from == pos && m.widgetNode) foundBookmarks.push(m);
</del><span class="cx"> }
</span><span class="cx"> if (collapsed && (collapsed.from || 0) == pos) {
</span><span class="cx"> buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
</span><span class="cx"> collapsed.marker, collapsed.from == null);
</span><span class="cx"> if (collapsed.to == null) return;
</span><ins>+ if (collapsed.to == pos) collapsed = false;
</ins><span class="cx"> }
</span><span class="cx"> if (!collapsed && foundBookmarks.length) for (var j = 0; j < foundBookmarks.length; ++j)
</span><span class="cx"> buildCollapsedSpan(builder, 0, foundBookmarks[j]);
</span><span class="lines">@@ -5936,7 +7071,7 @@
</span><span class="cx"> if (!collapsed) {
</span><span class="cx"> var tokenText = end > upto ? text.slice(0, upto - pos) : text;
</span><span class="cx"> builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
</span><del>- spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title);
</del><ins>+ spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css);
</ins><span class="cx"> }
</span><span class="cx"> if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
</span><span class="cx"> pos = end;
</span><span class="lines">@@ -5965,17 +7100,24 @@
</span><span class="cx"> updateLine(line, text, spans, estimateHeight);
</span><span class="cx"> signalLater(line, "change", line, change);
</span><span class="cx"> }
</span><ins>+ function linesFor(start, end) {
+ for (var i = start, result = []; i < end; ++i)
+ result.push(new Line(text[i], spansFor(i), estimateHeight));
+ return result;
+ }
</ins><span class="cx">
</span><span class="cx"> var from = change.from, to = change.to, text = change.text;
</span><span class="cx"> var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line);
</span><span class="cx"> var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;
</span><span class="cx">
</span><span class="cx"> // Adjust the line structure
</span><del>- if (isWholeLineUpdate(doc, change)) {
</del><ins>+ if (change.full) {
+ doc.insert(0, linesFor(0, text.length));
+ doc.remove(text.length, doc.size - text.length);
+ } else if (isWholeLineUpdate(doc, change)) {
</ins><span class="cx"> // This is a whole-line replace. Treated specially to make
</span><span class="cx"> // sure line objects move the way they are supposed to.
</span><del>- for (var i = 0, added = []; i < text.length - 1; ++i)
- added.push(new Line(text[i], spansFor(i), estimateHeight));
</del><ins>+ var added = linesFor(0, text.length - 1);
</ins><span class="cx"> update(lastLine, lastLine.text, lastSpans);
</span><span class="cx"> if (nlines) doc.remove(from.line, nlines);
</span><span class="cx"> if (added.length) doc.insert(from.line, added);
</span><span class="lines">@@ -5983,8 +7125,7 @@
</span><span class="cx"> if (text.length == 1) {
</span><span class="cx"> update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);
</span><span class="cx"> } else {
</span><del>- for (var added = [], i = 1; i < text.length - 1; ++i)
- added.push(new Line(text[i], spansFor(i), estimateHeight));
</del><ins>+ var added = linesFor(1, text.length - 1);
</ins><span class="cx"> added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));
</span><span class="cx"> update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
</span><span class="cx"> doc.insert(from.line + 1, added);
</span><span class="lines">@@ -5995,8 +7136,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
</span><span class="cx"> update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);
</span><del>- for (var i = 1, added = []; i < text.length - 1; ++i)
- added.push(new Line(text[i], spansFor(i), estimateHeight));
</del><ins>+ var added = linesFor(1, text.length - 1);
</ins><span class="cx"> if (nlines > 1) doc.remove(from.line + 1, nlines - 1);
</span><span class="cx"> doc.insert(from.line + 1, added);
</span><span class="cx"> }
</span><span class="lines">@@ -6156,8 +7296,8 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> var nextDocId = 0;
</span><del>- var Doc = CodeMirror.Doc = function(text, mode, firstLine) {
- if (!(this instanceof Doc)) return new Doc(text, mode, firstLine);
</del><ins>+ var Doc = CodeMirror.Doc = function(text, mode, firstLine, lineSep) {
+ if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep);
</ins><span class="cx"> if (firstLine == null) firstLine = 0;
</span><span class="cx">
</span><span class="cx"> BranchChunk.call(this, [new LeafChunk([new Line("", null)])]);
</span><span class="lines">@@ -6171,8 +7311,9 @@
</span><span class="cx"> this.history = new History(null);
</span><span class="cx"> this.id = ++nextDocId;
</span><span class="cx"> this.modeOption = mode;
</span><ins>+ this.lineSep = lineSep;
</ins><span class="cx">
</span><del>- if (typeof text == "string") text = splitLines(text);
</del><ins>+ if (typeof text == "string") text = this.splitLines(text);
</ins><span class="cx"> updateDoc(this, {from: start, to: start, text: text});
</span><span class="cx"> setSelection(this, simpleSelection(start), sel_dontScroll);
</span><span class="cx"> };
</span><span class="lines">@@ -6202,12 +7343,12 @@
</span><span class="cx"> getValue: function(lineSep) {
</span><span class="cx"> var lines = getLines(this, this.first, this.first + this.size);
</span><span class="cx"> if (lineSep === false) return lines;
</span><del>- return lines.join(lineSep || "\n");
</del><ins>+ return lines.join(lineSep || this.lineSeparator());
</ins><span class="cx"> },
</span><span class="cx"> setValue: docMethodOp(function(code) {
</span><span class="cx"> var top = Pos(this.first, 0), last = this.first + this.size - 1;
</span><span class="cx"> makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
</span><del>- text: splitLines(code), origin: "setValue"}, true);
</del><ins>+ text: this.splitLines(code), origin: "setValue", full: true}, true);
</ins><span class="cx"> setSelection(this, simpleSelection(top));
</span><span class="cx"> }),
</span><span class="cx"> replaceRange: function(code, from, to, origin) {
</span><span class="lines">@@ -6218,7 +7359,7 @@
</span><span class="cx"> getRange: function(from, to, lineSep) {
</span><span class="cx"> var lines = getBetween(this, clipPos(this, from), clipPos(this, to));
</span><span class="cx"> if (lineSep === false) return lines;
</span><del>- return lines.join(lineSep || "\n");
</del><ins>+ return lines.join(lineSep || this.lineSeparator());
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> getLine: function(line) {var l = this.getLineHandle(line); return l && l.text;},
</span><span class="lines">@@ -6284,13 +7425,13 @@
</span><span class="cx"> lines = lines ? lines.concat(sel) : sel;
</span><span class="cx"> }
</span><span class="cx"> if (lineSep === false) return lines;
</span><del>- else return lines.join(lineSep || "\n");
</del><ins>+ else return lines.join(lineSep || this.lineSeparator());
</ins><span class="cx"> },
</span><span class="cx"> getSelections: function(lineSep) {
</span><span class="cx"> var parts = [], ranges = this.sel.ranges;
</span><span class="cx"> for (var i = 0; i < ranges.length; i++) {
</span><span class="cx"> var sel = getBetween(this, ranges[i].from(), ranges[i].to());
</span><del>- if (lineSep !== false) sel = sel.join(lineSep || "\n");
</del><ins>+ if (lineSep !== false) sel = sel.join(lineSep || this.lineSeparator());
</ins><span class="cx"> parts[i] = sel;
</span><span class="cx"> }
</span><span class="cx"> return parts;
</span><span class="lines">@@ -6305,7 +7446,7 @@
</span><span class="cx"> var changes = [], sel = this.sel;
</span><span class="cx"> for (var i = 0; i < sel.ranges.length; i++) {
</span><span class="cx"> var range = sel.ranges[i];
</span><del>- changes[i] = {from: range.from(), to: range.to(), text: splitLines(code[i]), origin: origin};
</del><ins>+ changes[i] = {from: range.from(), to: range.to(), text: this.splitLines(code[i]), origin: origin};
</ins><span class="cx"> }
</span><span class="cx"> var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);
</span><span class="cx"> for (var i = changes.length - 1; i >= 0; i--)
</span><span class="lines">@@ -6334,7 +7475,7 @@
</span><span class="cx"> },
</span><span class="cx"> changeGeneration: function(forceSplit) {
</span><span class="cx"> if (forceSplit)
</span><del>- this.history.lastOp = this.history.lastOrigin = null;
</del><ins>+ this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null;
</ins><span class="cx"> return this.history.generation;
</span><span class="cx"> },
</span><span class="cx"> isClean: function (gen) {
</span><span class="lines">@@ -6351,13 +7492,48 @@
</span><span class="cx"> hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ addLineClass: docMethodOp(function(handle, where, cls) {
+ return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
+ var prop = where == "text" ? "textClass"
+ : where == "background" ? "bgClass"
+ : where == "gutter" ? "gutterClass" : "wrapClass";
+ if (!line[prop]) line[prop] = cls;
+ else if (classTest(cls).test(line[prop])) return false;
+ else line[prop] += " " + cls;
+ return true;
+ });
+ }),
+ removeLineClass: docMethodOp(function(handle, where, cls) {
+ return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
+ var prop = where == "text" ? "textClass"
+ : where == "background" ? "bgClass"
+ : where == "gutter" ? "gutterClass" : "wrapClass";
+ var cur = line[prop];
+ if (!cur) return false;
+ else if (cls == null) line[prop] = null;
+ else {
+ var found = cur.match(classTest(cls));
+ if (!found) return false;
+ var end = found.index + found[0].length;
+ line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
+ }
+ return true;
+ });
+ }),
+
+ addLineWidget: docMethodOp(function(handle, node, options) {
+ return addLineWidget(this, handle, node, options);
+ }),
+ removeLineWidget: function(widget) { widget.clear(); },
+
</ins><span class="cx"> markText: function(from, to, options) {
</span><span class="cx"> return markText(this, clipPos(this, from), clipPos(this, to), options, "range");
</span><span class="cx"> },
</span><span class="cx"> setBookmark: function(pos, options) {
</span><span class="cx"> var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
</span><span class="cx"> insertLeft: options && options.insertLeft,
</span><del>- clearWhenEmpty: false, shared: options && options.shared};
</del><ins>+ clearWhenEmpty: false, shared: options && options.shared,
+ handleMouseEvents: options && options.handleMouseEvents};
</ins><span class="cx"> pos = clipPos(this, pos);
</span><span class="cx"> return markText(this, pos, pos, realOpts, "bookmark");
</span><span class="cx"> },
</span><span class="lines">@@ -6420,7 +7596,8 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> copy: function(copyHistory) {
</span><del>- var doc = new Doc(getLines(this, this.first, this.first + this.size), this.modeOption, this.first);
</del><ins>+ var doc = new Doc(getLines(this, this.first, this.first + this.size),
+ this.modeOption, this.first, this.lineSep);
</ins><span class="cx"> doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft;
</span><span class="cx"> doc.sel = this.sel;
</span><span class="cx"> doc.extend = false;
</span><span class="lines">@@ -6436,7 +7613,7 @@
</span><span class="cx"> var from = this.first, to = this.first + this.size;
</span><span class="cx"> if (options.from != null && options.from > from) from = options.from;
</span><span class="cx"> if (options.to != null && options.to < to) to = options.to;
</span><del>- var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from);
</del><ins>+ var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep);
</ins><span class="cx"> if (options.sharedHist) copy.history = this.history;
</span><span class="cx"> (this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist});
</span><span class="cx"> copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}];
</span><span class="lines">@@ -6465,14 +7642,20 @@
</span><span class="cx"> iterLinkedDocs: function(f) {linkedDocs(this, f);},
</span><span class="cx">
</span><span class="cx"> getMode: function() {return this.mode;},
</span><del>- getEditor: function() {return this.cm;}
</del><ins>+ getEditor: function() {return this.cm;},
+
+ splitLines: function(str) {
+ if (this.lineSep) return str.split(this.lineSep);
+ return splitLinesAuto(str);
+ },
+ lineSeparator: function() { return this.lineSep || "\n"; }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // Public alias.
</span><span class="cx"> Doc.prototype.eachLine = Doc.prototype.iter;
</span><span class="cx">
</span><span class="cx"> // Set up methods on CodeMirror's prototype to redirect to the editor's document.
</span><del>- var dontDelegate = "iter insert remove copy getEditor".split(" ");
</del><ins>+ var dontDelegate = "iter insert remove copy getEditor constructor".split(" ");
</ins><span class="cx"> for (var prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
</span><span class="cx"> CodeMirror.prototype[prop] = (function(method) {
</span><span class="cx"> return function() {return method.apply(this.doc, arguments);};
</span><span class="lines">@@ -6626,7 +7809,7 @@
</span><span class="cx"> // Used to track when changes can be merged into a single undo
</span><span class="cx"> // event
</span><span class="cx"> this.lastModTime = this.lastSelTime = 0;
</span><del>- this.lastOp = null;
</del><ins>+ this.lastOp = this.lastSelOp = null;
</ins><span class="cx"> this.lastOrigin = this.lastSelOrigin = null;
</span><span class="cx"> // Used by the isClean() method
</span><span class="cx"> this.generation = this.maxGeneration = startGen || 1;
</span><span class="lines">@@ -6704,7 +7887,7 @@
</span><span class="cx"> hist.done.push(selAfter);
</span><span class="cx"> hist.generation = ++hist.maxGeneration;
</span><span class="cx"> hist.lastModTime = hist.lastSelTime = time;
</span><del>- hist.lastOp = opId;
</del><ins>+ hist.lastOp = hist.lastSelOp = opId;
</ins><span class="cx"> hist.lastOrigin = hist.lastSelOrigin = change.origin;
</span><span class="cx">
</span><span class="cx"> if (!last) signal(doc, "historyAdded");
</span><span class="lines">@@ -6730,7 +7913,7 @@
</span><span class="cx"> // the current, or the origins don't allow matching. Origins
</span><span class="cx"> // starting with * are always merged, those starting with + are
</span><span class="cx"> // merged when similar and close together in time.
</span><del>- if (opId == hist.lastOp ||
</del><ins>+ if (opId == hist.lastSelOp ||
</ins><span class="cx"> (origin && hist.lastSelOrigin == origin &&
</span><span class="cx"> (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin ||
</span><span class="cx"> selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))))
</span><span class="lines">@@ -6740,7 +7923,7 @@
</span><span class="cx">
</span><span class="cx"> hist.lastSelTime = +new Date;
</span><span class="cx"> hist.lastSelOrigin = origin;
</span><del>- hist.lastOp = opId;
</del><ins>+ hist.lastSelOp = opId;
</ins><span class="cx"> if (options && options.clearRedo !== false)
</span><span class="cx"> clearSelectionEvents(hist.undone);
</span><span class="cx"> }
</span><span class="lines">@@ -6925,6 +8108,8 @@
</span><span class="cx"> for (var i = 0; i < arr.length; ++i) arr[i].apply(null, args);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ var orphanDelayedCallbacks = null;
+
</ins><span class="cx"> // Often, we want to signal events at a point where we are in the
</span><span class="cx"> // middle of some work, but don't want the handler to start calling
</span><span class="cx"> // other methods on the editor, which might be in an inconsistent
</span><span class="lines">@@ -6932,25 +8117,26 @@
</span><span class="cx"> // signalLater looks whether there are any handlers, and schedules
</span><span class="cx"> // them to be executed when the last operation ends, or, if no
</span><span class="cx"> // operation is active, when a timeout fires.
</span><del>- var delayedCallbacks, delayedCallbackDepth = 0;
</del><span class="cx"> function signalLater(emitter, type /*, values...*/) {
</span><span class="cx"> var arr = emitter._handlers && emitter._handlers[type];
</span><span class="cx"> if (!arr) return;
</span><del>- var args = Array.prototype.slice.call(arguments, 2);
- if (!delayedCallbacks) {
- ++delayedCallbackDepth;
- delayedCallbacks = [];
- setTimeout(fireDelayed, 0);
</del><ins>+ var args = Array.prototype.slice.call(arguments, 2), list;
+ if (operationGroup) {
+ list = operationGroup.delayedCallbacks;
+ } else if (orphanDelayedCallbacks) {
+ list = orphanDelayedCallbacks;
+ } else {
+ list = orphanDelayedCallbacks = [];
+ setTimeout(fireOrphanDelayed, 0);
</ins><span class="cx"> }
</span><span class="cx"> function bnd(f) {return function(){f.apply(null, args);};};
</span><span class="cx"> for (var i = 0; i < arr.length; ++i)
</span><del>- delayedCallbacks.push(bnd(arr[i]));
</del><ins>+ list.push(bnd(arr[i]));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function fireDelayed() {
- --delayedCallbackDepth;
- var delayed = delayedCallbacks;
- delayedCallbacks = null;
</del><ins>+ function fireOrphanDelayed() {
+ var delayed = orphanDelayedCallbacks;
+ orphanDelayedCallbacks = null;
</ins><span class="cx"> for (var i = 0; i < delayed.length; ++i) delayed[i]();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6987,7 +8173,7 @@
</span><span class="cx"> // MISC UTILITIES
</span><span class="cx">
</span><span class="cx"> // Number of pixels added to scroller and sizer to hide scrollbar
</span><del>- var scrollerCutOff = 30;
</del><ins>+ var scrollerGap = 30;
</ins><span class="cx">
</span><span class="cx"> // Returned or thrown by various protocols to signal 'I'm not
</span><span class="cx"> // handling this'.
</span><span class="lines">@@ -7055,22 +8241,21 @@
</span><span class="cx"> if (array[i] == elt) return i;
</span><span class="cx"> return -1;
</span><span class="cx"> }
</span><del>- if ([].indexOf) indexOf = function(array, elt) { return array.indexOf(elt); };
</del><span class="cx"> function map(array, f) {
</span><span class="cx"> var out = [];
</span><span class="cx"> for (var i = 0; i < array.length; i++) out[i] = f(array[i], i);
</span><span class="cx"> return out;
</span><span class="cx"> }
</span><del>- if ([].map) map = function(array, f) { return array.map(f); };
</del><span class="cx">
</span><ins>+ function nothing() {}
+
</ins><span class="cx"> function createObj(base, props) {
</span><span class="cx"> var inst;
</span><span class="cx"> if (Object.create) {
</span><span class="cx"> inst = Object.create(base);
</span><span class="cx"> } else {
</span><del>- var ctor = function() {};
- ctor.prototype = base;
- inst = new ctor();
</del><ins>+ nothing.prototype = base;
+ inst = new nothing();
</ins><span class="cx"> }
</span><span class="cx"> if (props) copyObj(props, inst);
</span><span class="cx"> return inst;
</span><span class="lines">@@ -7089,7 +8274,7 @@
</span><span class="cx"> return function(){return f.apply(null, args);};
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var nonASCIISingleCaseWordChar = /[\u00df\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
</del><ins>+ var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
</ins><span class="cx"> var isWordCharBasic = CodeMirror.isWordChar = function(ch) {
</span><span class="cx"> return /\w/.test(ch) || ch > "\x80" &&
</span><span class="cx"> (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch));
</span><span class="lines">@@ -7125,15 +8310,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var range;
</span><del>- if (document.createRange) range = function(node, start, end) {
</del><ins>+ if (document.createRange) range = function(node, start, end, endNode) {
</ins><span class="cx"> var r = document.createRange();
</span><del>- r.setEnd(node, end);
</del><ins>+ r.setEnd(endNode || node, end);
</ins><span class="cx"> r.setStart(node, start);
</span><span class="cx"> return r;
</span><span class="cx"> };
</span><span class="cx"> else range = function(node, start, end) {
</span><span class="cx"> var r = document.body.createTextRange();
</span><del>- r.moveToElementText(node.parentNode);
</del><ins>+ try { r.moveToElementText(node.parentNode); }
+ catch(e) { return r; }
</ins><span class="cx"> r.collapse(true);
</span><span class="cx"> r.moveEnd("character", end);
</span><span class="cx"> r.moveStart("character", start);
</span><span class="lines">@@ -7150,29 +8336,43 @@
</span><span class="cx"> return removeChildren(parent).appendChild(e);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function contains(parent, child) {
</del><ins>+ var contains = CodeMirror.contains = function(parent, child) {
+ if (child.nodeType == 3) // Android browser always returns false when child is a textnode
+ child = child.parentNode;
</ins><span class="cx"> if (parent.contains)
</span><span class="cx"> return parent.contains(child);
</span><del>- while (child = child.parentNode)
</del><ins>+ do {
+ if (child.nodeType == 11) child = child.host;
</ins><span class="cx"> if (child == parent) return true;
</span><ins>+ } while (child = child.parentNode);
+ };
+
+ function activeElt() {
+ var activeElement = document.activeElement;
+ while (activeElement && activeElement.root && activeElement.root.activeElement)
+ activeElement = activeElement.root.activeElement;
+ return activeElement;
</ins><span class="cx"> }
</span><del>-
- function activeElt() { return document.activeElement; }
</del><span class="cx"> // Older versions of IE throws unspecified error when touching
</span><span class="cx"> // document.activeElement in some cases (during loading, in iframe)
</span><del>- if (ie_upto10) activeElt = function() {
</del><ins>+ if (ie && ie_version < 11) activeElt = function() {
</ins><span class="cx"> try { return document.activeElement; }
</span><span class="cx"> catch(e) { return document.body; }
</span><span class="cx"> };
</span><span class="cx">
</span><del>- function classTest(cls) { return new RegExp("\\b" + cls + "\\b\\s*"); }
- function rmClass(node, cls) {
- var test = classTest(cls);
- if (test.test(node.className)) node.className = node.className.replace(test, "");
- }
- function addClass(node, cls) {
- if (!classTest(cls).test(node.className)) node.className += " " + cls;
- }
</del><ins>+ function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*"); }
+ var rmClass = CodeMirror.rmClass = function(node, cls) {
+ var current = node.className;
+ var match = classTest(cls).exec(current);
+ if (match) {
+ var after = current.slice(match.index + match[0].length);
+ node.className = current.slice(0, match.index) + (after ? match[1] + after : "");
+ }
+ };
+ var addClass = CodeMirror.addClass = function(node, cls) {
+ var current = node.className;
+ if (!classTest(cls).test(current)) node.className += (current ? " " : "") + cls;
+ };
</ins><span class="cx"> function joinClasses(a, b) {
</span><span class="cx"> var as = a.split(" ");
</span><span class="cx"> for (var i = 0; i < as.length; i++)
</span><span class="lines">@@ -7207,7 +8407,6 @@
</span><span class="cx"> on(window, "resize", function() {
</span><span class="cx"> if (resizeTimer == null) resizeTimer = setTimeout(function() {
</span><span class="cx"> resizeTimer = null;
</span><del>- knownScrollbarWidth = null;
</del><span class="cx"> forEachCodeMirror(onResize);
</span><span class="cx"> }, 100);
</span><span class="cx"> });
</span><span class="lines">@@ -7223,31 +8422,23 @@
</span><span class="cx"> var dragAndDrop = function() {
</span><span class="cx"> // There is *some* kind of drag-and-drop support in IE6-8, but I
</span><span class="cx"> // couldn't get it to work yet.
</span><del>- if (ie_upto8) return false;
</del><ins>+ if (ie && ie_version < 9) return false;
</ins><span class="cx"> var div = elt('div');
</span><span class="cx"> return "draggable" in div || "dragDrop" in div;
</span><span class="cx"> }();
</span><span class="cx">
</span><del>- var knownScrollbarWidth;
- function scrollbarWidth(measure) {
- if (knownScrollbarWidth != null) return knownScrollbarWidth;
- var test = elt("div", null, null, "width: 50px; height: 50px; overflow-x: scroll");
- removeChildrenAndAdd(measure, test);
- if (test.offsetWidth)
- knownScrollbarWidth = test.offsetHeight - test.clientHeight;
- return knownScrollbarWidth || 0;
- }
-
</del><span class="cx"> var zwspSupported;
</span><span class="cx"> function zeroWidthElement(measure) {
</span><span class="cx"> if (zwspSupported == null) {
</span><span class="cx"> var test = elt("span", "\u200b");
</span><span class="cx"> removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));
</span><span class="cx"> if (measure.firstChild.offsetHeight != 0)
</span><del>- zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !ie_upto7;
</del><ins>+ zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8);
</ins><span class="cx"> }
</span><del>- if (zwspSupported) return elt("span", "\u200b");
- else return elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
</del><ins>+ var node = zwspSupported ? elt("span", "\u200b") :
+ elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
+ node.setAttribute("cm-text", "");
+ return node;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Feature-detect IE's crummy client rect reporting for bidi text
</span><span class="lines">@@ -7256,14 +8447,14 @@
</span><span class="cx"> if (badBidiRects != null) return badBidiRects;
</span><span class="cx"> var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));
</span><span class="cx"> var r0 = range(txt, 0, 1).getBoundingClientRect();
</span><del>- if (r0.left == r0.right) return false;
</del><ins>+ if (!r0 || r0.left == r0.right) return false; // Safari returns null in some cases (#2780)
</ins><span class="cx"> var r1 = range(txt, 1, 2).getBoundingClientRect();
</span><span class="cx"> return badBidiRects = (r1.right - r0.right < 3);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // See if "".split is the broken IE version, if so, provide an
</span><span class="cx"> // alternative way to split lines.
</span><del>- var splitLines = CodeMirror.splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
</del><ins>+ var splitLinesAuto = CodeMirror.splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
</ins><span class="cx"> var pos = 0, result = [], l = string.length;
</span><span class="cx"> while (pos <= l) {
</span><span class="cx"> var nl = string.indexOf("\n", pos);
</span><span class="lines">@@ -7298,6 +8489,15 @@
</span><span class="cx"> return typeof e.oncopy == "function";
</span><span class="cx"> })();
</span><span class="cx">
</span><ins>+ var badZoomedRects = null;
+ function hasBadZoomedRects(measure) {
+ if (badZoomedRects != null) return badZoomedRects;
+ var node = removeChildrenAndAdd(measure, elt("span", "x"));
+ var normal = node.getBoundingClientRect();
+ var fromRange = range(node, 0, 1).getBoundingClientRect();
+ return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1;
+ }
+
</ins><span class="cx"> // KEY NAMES
</span><span class="cx">
</span><span class="cx"> var keyNames = {3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
</span><span class="lines">@@ -7360,6 +8560,17 @@
</span><span class="cx"> var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line);
</span><span class="cx"> return Pos(lineN == null ? lineNo(line) : lineN, ch);
</span><span class="cx"> }
</span><ins>+ function lineStartSmart(cm, pos) {
+ var start = lineStart(cm, pos.line);
+ var line = getLine(cm.doc, start.line);
+ var order = getOrder(line);
+ if (!order || order[0].level == 0) {
+ var firstNonWS = Math.max(0, line.text.search(/\S/));
+ var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch;
+ return Pos(start.line, inWS ? 0 : firstNonWS);
+ }
+ return start;
+ }
</ins><span class="cx">
</span><span class="cx"> function compareBidiLevel(order, a, b) {
</span><span class="cx"> var linedir = order[0].level;
</span><span class="lines">@@ -7590,6 +8801,8 @@
</span><span class="cx"> lst(order).to -= m[0].length;
</span><span class="cx"> order.push(new BidiSpan(0, len - m[0].length, len));
</span><span class="cx"> }
</span><ins>+ if (order[0].level == 2)
+ order.unshift(new BidiSpan(1, order[0].to, order[0].to));
</ins><span class="cx"> if (order[0].level != lst(order).level)
</span><span class="cx"> order.push(new BidiSpan(order[0].level, len, len));
</span><span class="cx">
</span><span class="lines">@@ -7599,7 +8812,7 @@
</span><span class="cx">
</span><span class="cx"> // THE END
</span><span class="cx">
</span><del>- CodeMirror.version = "4.2.0";
</del><ins>+ CodeMirror.version = "5.5.1";
</ins><span class="cx">
</span><span class="cx"> return CodeMirror;
</span><span class="cx"> });
</span><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorcoffeescriptjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/coffeescript.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/coffeescript.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/coffeescript.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -15,14 +15,14 @@
</span><span class="cx"> })(function(CodeMirror) {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>-CodeMirror.defineMode("coffeescript", function(conf) {
</del><ins>+CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
</ins><span class="cx"> var ERRORCLASS = "error";
</span><span class="cx">
</span><span class="cx"> function wordRegexp(words) {
</span><span class="cx"> return new RegExp("^((" + words.join(")|(") + "))\\b");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var operators = /^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?)/;
</del><ins>+ var operators = /^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?|(or|and|\|\||&&|\?)=)/;
</ins><span class="cx"> var delimiters = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/;
</span><span class="cx"> var identifiers = /^[_A-Za-z$][_A-Za-z$0-9]*/;
</span><span class="cx"> var properties = /^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/;
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> "switch", "try", "catch", "finally", "class"];
</span><span class="cx"> var commonKeywords = ["break", "by", "continue", "debugger", "delete",
</span><span class="cx"> "do", "in", "of", "new", "return", "then",
</span><del>- "this", "throw", "when", "until"];
</del><ins>+ "this", "@", "throw", "when", "until", "extends"];
</ins><span class="cx">
</span><span class="cx"> var keywords = wordRegexp(indentKeywords.concat(commonKeywords));
</span><span class="cx">
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (singleline) {
</span><del>- if (conf.mode.singleLineStringErrors) {
</del><ins>+ if (parserConf.singleLineStringErrors) {
</ins><span class="cx"> outclass = ERRORCLASS;
</span><span class="cx"> } else {
</span><span class="cx"> state.tokenize = tokenBase;
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> type = type || "coffee";
</span><span class="cx"> var offset = 0, align = false, alignOffset = null;
</span><span class="cx"> for (var scope = state.scope; scope; scope = scope.prev) {
</span><del>- if (scope.type === "coffee") {
</del><ins>+ if (scope.type === "coffee" || scope.type == "}") {
</ins><span class="cx"> offset = scope.offset + conf.indentUnit;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx">
</span><span class="cx"> // Handle scope changes.
</span><span class="cx"> if (current === "return") {
</span><del>- state.dedent += 1;
</del><ins>+ state.dedent = true;
</ins><span class="cx"> }
</span><span class="cx"> if (((current === "->" || current === "=>") &&
</span><span class="cx"> !state.lambda &&
</span><span class="lines">@@ -310,9 +310,10 @@
</span><span class="cx"> if (state.scope.type == current)
</span><span class="cx"> state.scope = state.scope.prev;
</span><span class="cx"> }
</span><del>- if (state.dedent > 0 && stream.eol() && state.scope.type == "coffee") {
- if (state.scope.prev) state.scope = state.scope.prev;
- state.dedent -= 1;
</del><ins>+ if (state.dedent && stream.eol()) {
+ if (state.scope.type == "coffee" && state.scope.prev)
+ state.scope = state.scope.prev;
+ state.dedent = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return style;
</span><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/coffeescript.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorcommentjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/comment.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/comment.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/comment.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> CodeMirror.defineExtension("uncomment", function(from, to, options) {
</span><span class="cx"> if (!options) options = noOptions;
</span><span class="cx"> var self = this, mode = self.getModeAt(from);
</span><del>- var end = Math.min(to.line, self.lastLine()), start = Math.min(from.line, end);
</del><ins>+ var end = Math.min(to.ch != 0 || to.line == from.line ? to.line : to.line - 1, self.lastLine()), start = Math.min(from.line, end);
</ins><span class="cx">
</span><span class="cx"> // Try finding line comments
</span><span class="cx"> var lineString = options.lineComment || mode.lineComment, lines = [];
</span><span class="lines">@@ -153,6 +153,17 @@
</span><span class="cx"> !/comment/.test(self.getTokenTypeAt(Pos(end, close + 1))))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ // Avoid killing block comments completely outside the selection.
+ // Positions of the last startString before the start of the selection, and the first endString after it.
+ var lastStart = startLine.lastIndexOf(startString, from.ch);
+ var firstEnd = lastStart == -1 ? -1 : startLine.slice(0, from.ch).indexOf(endString, lastStart + startString.length);
+ if (lastStart != -1 && firstEnd != -1 && firstEnd + endString.length != from.ch) return false;
+ // Positions of the first endString after the end of the selection, and the last startString before it.
+ firstEnd = endLine.indexOf(endString, to.ch);
+ var almostLastStart = endLine.slice(to.ch).lastIndexOf(startString, firstEnd - to.ch);
+ lastStart = (firstEnd == -1 || almostLastStart == -1) ? -1 : to.ch + almostLastStart;
+ if (firstEnd != -1 && lastStart != -1 && lastStart != to.ch) return false;
+
</ins><span class="cx"> self.operation(function() {
</span><span class="cx"> self.replaceRange("", Pos(end, close - (pad && endLine.slice(close - pad.length, close) == pad ? pad.length : 0)),
</span><span class="cx"> Pos(end, close + endString.length));
</span><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/comment.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorcssjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/css.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/css.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/css.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -12,17 +12,22 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> CodeMirror.defineMode("css", function(config, parserConfig) {
</span><ins>+ var provided = parserConfig;
</ins><span class="cx"> if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
</span><ins>+ parserConfig.inline = provided.inline;
</ins><span class="cx">
</span><span class="cx"> var indentUnit = config.indentUnit,
</span><span class="cx"> tokenHooks = parserConfig.tokenHooks,
</span><ins>+ documentTypes = parserConfig.documentTypes || {},
</ins><span class="cx"> mediaTypes = parserConfig.mediaTypes || {},
</span><span class="cx"> mediaFeatures = parserConfig.mediaFeatures || {},
</span><ins>+ mediaValueKeywords = parserConfig.mediaValueKeywords || {},
</ins><span class="cx"> propertyKeywords = parserConfig.propertyKeywords || {},
</span><span class="cx"> nonStandardPropertyKeywords = parserConfig.nonStandardPropertyKeywords || {},
</span><ins>+ fontProperties = parserConfig.fontProperties || {},
+ counterDescriptors = parserConfig.counterDescriptors || {},
</ins><span class="cx"> colorKeywords = parserConfig.colorKeywords || {},
</span><span class="cx"> valueKeywords = parserConfig.valueKeywords || {},
</span><del>- fontProperties = parserConfig.fontProperties || {},
</del><span class="cx"> allowNested = parserConfig.allowNested;
</span><span class="cx">
</span><span class="cx"> var type, override;
</span><span class="lines">@@ -57,6 +62,11 @@
</span><span class="cx"> if (/[\d.]/.test(stream.peek())) {
</span><span class="cx"> stream.eatWhile(/[\w.%]/);
</span><span class="cx"> return ret("number", "unit");
</span><ins>+ } else if (stream.match(/^-[\w\\\-]+/)) {
+ stream.eatWhile(/[\w\\\-]/);
+ if (stream.match(/^\s*:/, false))
+ return ret("variable-2", "variable-definition");
+ return ret("variable-2", "variable");
</ins><span class="cx"> } else if (stream.match(/^\w+-/)) {
</span><span class="cx"> return ret("meta", "meta");
</span><span class="cx"> }
</span><span class="lines">@@ -66,7 +76,9 @@
</span><span class="cx"> return ret("qualifier", "qualifier");
</span><span class="cx"> } else if (/[:;{}\[\]\(\)]/.test(ch)) {
</span><span class="cx"> return ret(null, ch);
</span><del>- } else if (ch == "u" && stream.match("rl(")) {
</del><ins>+ } else if ((ch == "u" && stream.match(/rl(-prefix)?\(/)) ||
+ (ch == "d" && stream.match("omain(")) ||
+ (ch == "r" && stream.match("egexp("))) {
</ins><span class="cx"> stream.backUp(1);
</span><span class="cx"> state.tokenize = tokenParenthesized;
</span><span class="cx"> return ret("property", "word");
</span><span class="lines">@@ -148,10 +160,11 @@
</span><span class="cx"> return pushContext(state, stream, "block");
</span><span class="cx"> } else if (type == "}" && state.context.prev) {
</span><span class="cx"> return popContext(state);
</span><del>- } else if (type == "@media") {
- return pushContext(state, stream, "media");
- } else if (type == "@font-face") {
- return "font_face_before";
</del><ins>+ } else if (/@(media|supports|(-moz-)?document)/.test(type)) {
+ return pushContext(state, stream, "atBlock");
+ } else if (/@(font-face|counter-style)/.test(type)) {
+ state.stateArg = type;
+ return "restricted_atBlock_before";
</ins><span class="cx"> } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) {
</span><span class="cx"> return "keyframes";
</span><span class="cx"> } else if (type && type.charAt(0) == "@") {
</span><span class="lines">@@ -182,7 +195,7 @@
</span><span class="cx"> override = "string-2";
</span><span class="cx"> return "maybeprop";
</span><span class="cx"> } else if (allowNested) {
</span><del>- override = stream.match(/^\s*:/, false) ? "property" : "tag";
</del><ins>+ override = stream.match(/^\s*:(?:\s|$)/, false) ? "property" : "tag";
</ins><span class="cx"> return "block";
</span><span class="cx"> } else {
</span><span class="cx"> override += " error";
</span><span class="lines">@@ -229,6 +242,7 @@
</span><span class="cx"> if (type == "{" || type == "}") return popAndPass(type, stream, state);
</span><span class="cx"> if (type == ")") return popContext(state);
</span><span class="cx"> if (type == "(") return pushContext(state, stream, "parens");
</span><ins>+ if (type == "interpolation") return pushContext(state, stream, "interpolation");
</ins><span class="cx"> if (type == "word") wordAsValue(stream);
</span><span class="cx"> return "parens";
</span><span class="cx"> };
</span><span class="lines">@@ -241,47 +255,67 @@
</span><span class="cx"> return pass(type, stream, state);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- states.media = function(type, stream, state) {
- if (type == "(") return pushContext(state, stream, "media_parens");
</del><ins>+ states.atBlock = function(type, stream, state) {
+ if (type == "(") return pushContext(state, stream, "atBlock_parens");
</ins><span class="cx"> if (type == "}") return popAndPass(type, stream, state);
</span><span class="cx"> if (type == "{") return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top");
</span><span class="cx">
</span><span class="cx"> if (type == "word") {
</span><span class="cx"> var word = stream.current().toLowerCase();
</span><del>- if (word == "only" || word == "not" || word == "and")
</del><ins>+ if (word == "only" || word == "not" || word == "and" || word == "or")
</ins><span class="cx"> override = "keyword";
</span><ins>+ else if (documentTypes.hasOwnProperty(word))
+ override = "tag";
</ins><span class="cx"> else if (mediaTypes.hasOwnProperty(word))
</span><span class="cx"> override = "attribute";
</span><span class="cx"> else if (mediaFeatures.hasOwnProperty(word))
</span><span class="cx"> override = "property";
</span><ins>+ else if (mediaValueKeywords.hasOwnProperty(word))
+ override = "keyword";
+ else if (propertyKeywords.hasOwnProperty(word))
+ override = "property";
+ else if (nonStandardPropertyKeywords.hasOwnProperty(word))
+ override = "string-2";
+ else if (valueKeywords.hasOwnProperty(word))
+ override = "atom";
+ else if (colorKeywords.hasOwnProperty(word))
+ override = "keyword";
</ins><span class="cx"> else
</span><span class="cx"> override = "error";
</span><span class="cx"> }
</span><span class="cx"> return state.context.type;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- states.media_parens = function(type, stream, state) {
</del><ins>+ states.atBlock_parens = function(type, stream, state) {
</ins><span class="cx"> if (type == ")") return popContext(state);
</span><span class="cx"> if (type == "{" || type == "}") return popAndPass(type, stream, state, 2);
</span><del>- return states.media(type, stream, state);
</del><ins>+ return states.atBlock(type, stream, state);
</ins><span class="cx"> };
</span><span class="cx">
</span><del>- states.font_face_before = function(type, stream, state) {
</del><ins>+ states.restricted_atBlock_before = function(type, stream, state) {
</ins><span class="cx"> if (type == "{")
</span><del>- return pushContext(state, stream, "font_face");
</del><ins>+ return pushContext(state, stream, "restricted_atBlock");
+ if (type == "word" && state.stateArg == "@counter-style") {
+ override = "variable";
+ return "restricted_atBlock_before";
+ }
</ins><span class="cx"> return pass(type, stream, state);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- states.font_face = function(type, stream, state) {
- if (type == "}") return popContext(state);
</del><ins>+ states.restricted_atBlock = function(type, stream, state) {
+ if (type == "}") {
+ state.stateArg = null;
+ return popContext(state);
+ }
</ins><span class="cx"> if (type == "word") {
</span><del>- if (!fontProperties.hasOwnProperty(stream.current().toLowerCase()))
</del><ins>+ if ((state.stateArg == "@font-face" && !fontProperties.hasOwnProperty(stream.current().toLowerCase())) ||
+ (state.stateArg == "@counter-style" && !counterDescriptors.hasOwnProperty(stream.current().toLowerCase())))
</ins><span class="cx"> override = "error";
</span><span class="cx"> else
</span><span class="cx"> override = "property";
</span><span class="cx"> return "maybeprop";
</span><span class="cx"> }
</span><del>- return "font_face";
</del><ins>+ return "restricted_atBlock";
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> states.keyframes = function(type, stream, state) {
</span><span class="lines">@@ -301,15 +335,17 @@
</span><span class="cx"> states.interpolation = function(type, stream, state) {
</span><span class="cx"> if (type == "}") return popContext(state);
</span><span class="cx"> if (type == "{" || type == ";") return popAndPass(type, stream, state);
</span><del>- if (type != "variable") override = "error";
</del><ins>+ if (type == "word") override = "variable";
+ else if (type != "variable" && type != "(" && type != ")") override = "error";
</ins><span class="cx"> return "interpolation";
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> return {
</span><span class="cx"> startState: function(base) {
</span><span class="cx"> return {tokenize: null,
</span><del>- state: "top",
- context: new Context("top", base || 0, null)};
</del><ins>+ state: parserConfig.inline ? "block" : "top",
+ stateArg: null,
+ context: new Context(parserConfig.inline ? "block" : "top", base || 0, null)};
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> token: function(stream, state) {
</span><span class="lines">@@ -329,9 +365,9 @@
</span><span class="cx"> var indent = cx.indent;
</span><span class="cx"> if (cx.type == "prop" && (ch == "}" || ch == ")")) cx = cx.prev;
</span><span class="cx"> if (cx.prev &&
</span><del>- (ch == "}" && (cx.type == "block" || cx.type == "top" || cx.type == "interpolation" || cx.type == "font_face") ||
- ch == ")" && (cx.type == "parens" || cx.type == "media_parens") ||
- ch == "{" && (cx.type == "at" || cx.type == "media"))) {
</del><ins>+ (ch == "}" && (cx.type == "block" || cx.type == "top" || cx.type == "interpolation" || cx.type == "restricted_atBlock") ||
+ ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
+ ch == "{" && (cx.type == "at" || cx.type == "atBlock"))) {
</ins><span class="cx"> indent = cx.indent - indentUnit;
</span><span class="cx"> cx = cx.prev;
</span><span class="cx"> }
</span><span class="lines">@@ -353,6 +389,10 @@
</span><span class="cx"> return keys;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ var documentTypes_ = [
+ "domain", "regexp", "url", "url-prefix"
+ ], documentTypes = keySet(documentTypes_);
+
</ins><span class="cx"> var mediaTypes_ = [
</span><span class="cx"> "all", "aural", "braille", "handheld", "print", "projection", "screen",
</span><span class="cx"> "tty", "tv", "embossed"
</span><span class="lines">@@ -366,9 +406,16 @@
</span><span class="cx"> "min-device-aspect-ratio", "max-device-aspect-ratio", "color", "min-color",
</span><span class="cx"> "max-color", "color-index", "min-color-index", "max-color-index",
</span><span class="cx"> "monochrome", "min-monochrome", "max-monochrome", "resolution",
</span><del>- "min-resolution", "max-resolution", "scan", "grid"
</del><ins>+ "min-resolution", "max-resolution", "scan", "grid", "orientation",
+ "device-pixel-ratio", "min-device-pixel-ratio", "max-device-pixel-ratio",
+ "pointer", "any-pointer", "hover", "any-hover"
</ins><span class="cx"> ], mediaFeatures = keySet(mediaFeatures_);
</span><span class="cx">
</span><ins>+ var mediaValueKeywords_ = [
+ "landscape", "portrait", "none", "coarse", "fine", "on-demand", "hover",
+ "interlace", "progressive"
+ ], mediaValueKeywords = keySet(mediaValueKeywords_);
+
</ins><span class="cx"> var propertyKeywords_ = [
</span><span class="cx"> "align-content", "align-items", "align-self", "alignment-adjust",
</span><span class="cx"> "alignment-baseline", "anchor-point", "animation", "animation-delay",
</span><span class="lines">@@ -461,14 +508,24 @@
</span><span class="cx"> "glyph-orientation-vertical", "text-anchor", "writing-mode"
</span><span class="cx"> ], propertyKeywords = keySet(propertyKeywords_);
</span><span class="cx">
</span><del>- var nonStandardPropertyKeywords = [
</del><ins>+ var nonStandardPropertyKeywords_ = [
</ins><span class="cx"> "scrollbar-arrow-color", "scrollbar-base-color", "scrollbar-dark-shadow-color",
</span><span class="cx"> "scrollbar-face-color", "scrollbar-highlight-color", "scrollbar-shadow-color",
</span><span class="cx"> "scrollbar-3d-light-color", "scrollbar-track-color", "shape-inside",
</span><span class="cx"> "searchfield-cancel-button", "searchfield-decoration", "searchfield-results-button",
</span><span class="cx"> "searchfield-results-decoration", "zoom"
</span><del>- ], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords);
</del><ins>+ ], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_);
</ins><span class="cx">
</span><ins>+ var fontProperties_ = [
+ "font-family", "src", "unicode-range", "font-variant", "font-feature-settings",
+ "font-stretch", "font-weight", "font-style"
+ ], fontProperties = keySet(fontProperties_);
+
+ var counterDescriptors_ = [
+ "additive-symbols", "fallback", "negative", "pad", "prefix", "range",
+ "speak-as", "suffix", "symbols", "system"
+ ], counterDescriptors = keySet(counterDescriptors_);
+
</ins><span class="cx"> var colorKeywords_ = [
</span><span class="cx"> "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige",
</span><span class="cx"> "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown",
</span><span class="lines">@@ -491,54 +548,57 @@
</span><span class="cx"> "navajowhite", "navy", "oldlace", "olive", "olivedrab", "orange", "orangered",
</span><span class="cx"> "orchid", "palegoldenrod", "palegreen", "paleturquoise", "palevioletred",
</span><span class="cx"> "papayawhip", "peachpuff", "peru", "pink", "plum", "powderblue",
</span><del>- "purple", "rebeccapurple", "red", "rosybrown", "royalblue", "saddlebrown", "salmon",
- "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue",
</del><ins>+ "purple", "rebeccapurple", "red", "rosybrown", "royalblue", "saddlebrown",
+ "salmon", "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue",
</ins><span class="cx"> "slateblue", "slategray", "snow", "springgreen", "steelblue", "tan",
</span><span class="cx"> "teal", "thistle", "tomato", "turquoise", "violet", "wheat", "white",
</span><span class="cx"> "whitesmoke", "yellow", "yellowgreen"
</span><span class="cx"> ], colorKeywords = keySet(colorKeywords_);
</span><span class="cx">
</span><span class="cx"> var valueKeywords_ = [
</span><del>- "above", "absolute", "activeborder", "activecaption", "afar",
- "after-white-space", "ahead", "alias", "all", "all-scroll", "alternate",
</del><ins>+ "above", "absolute", "activeborder", "additive", "activecaption", "afar",
+ "after-white-space", "ahead", "alias", "all", "all-scroll", "alphabetic", "alternate",
</ins><span class="cx"> "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
</span><del>- "arabic-indic", "armenian", "asterisks", "auto", "avoid", "avoid-column", "avoid-page",
</del><ins>+ "arabic-indic", "armenian", "asterisks", "attr", "auto", "avoid", "avoid-column", "avoid-page",
</ins><span class="cx"> "avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary",
</span><span class="cx"> "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
</span><del>- "both", "bottom", "break", "break-all", "break-word", "button", "button-bevel",
- "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "cambodian",
</del><ins>+ "both", "bottom", "break", "break-all", "break-word", "bullets", "button", "button-bevel",
+ "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "calc", "cambodian",
</ins><span class="cx"> "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
</span><del>- "cell", "center", "checkbox", "circle", "cjk-earthly-branch",
</del><ins>+ "cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
</ins><span class="cx"> "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
</span><del>- "col-resize", "collapse", "column", "compact", "condensed", "contain", "content",
- "content-box", "context-menu", "continuous", "copy", "cover", "crop",
- "cross", "crosshair", "currentcolor", "cursive", "dashed", "decimal",
</del><ins>+ "col-resize", "collapse", "column", "column-reverse", "compact", "condensed", "contain", "content",
+ "content-box", "context-menu", "continuous", "copy", "counter", "counters", "cover", "crop",
+ "cross", "crosshair", "currentcolor", "cursive", "cyclic", "dashed", "decimal",
</ins><span class="cx"> "decimal-leading-zero", "default", "default-button", "destination-atop",
</span><span class="cx"> "destination-in", "destination-out", "destination-over", "devanagari",
</span><del>- "disc", "discard", "document", "dot-dash", "dot-dot-dash", "dotted",
- "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
</del><ins>+ "disc", "discard", "disclosure-closed", "disclosure-open", "document",
+ "dot-dash", "dot-dot-dash",
+ "dotted", "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
</ins><span class="cx"> "element", "ellipse", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede",
</span><span class="cx"> "ethiopic-abegede-am-et", "ethiopic-abegede-gez", "ethiopic-abegede-ti-er",
</span><span class="cx"> "ethiopic-abegede-ti-et", "ethiopic-halehame-aa-er",
</span><span class="cx"> "ethiopic-halehame-aa-et", "ethiopic-halehame-am-et",
</span><span class="cx"> "ethiopic-halehame-gez", "ethiopic-halehame-om-et",
</span><span class="cx"> "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et",
</span><del>- "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et",
- "ethiopic-halehame-tig", "ew-resize", "expanded", "extra-condensed",
- "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "footnotes",
</del><ins>+ "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig",
+ "ethiopic-numeric", "ew-resize", "expanded", "extends", "extra-condensed",
+ "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "footnotes",
</ins><span class="cx"> "forwards", "from", "geometricPrecision", "georgian", "graytext", "groove",
</span><span class="cx"> "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hebrew",
</span><span class="cx"> "help", "hidden", "hide", "higher", "highlight", "highlighttext",
</span><span class="cx"> "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "icon", "ignore",
</span><span class="cx"> "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
</span><span class="cx"> "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
</span><del>- "inline-block", "inline-table", "inset", "inside", "intrinsic", "invert",
- "italic", "justify", "kannada", "katakana", "katakana-iroha", "keep-all", "khmer",
</del><ins>+ "inline-block", "inline-flex", "inline-table", "inset", "inside", "intrinsic", "invert",
+ "italic", "japanese-formal", "japanese-informal", "justify", "kannada",
+ "katakana", "katakana-iroha", "keep-all", "khmer",
+ "korean-hangul-formal", "korean-hanja-formal", "korean-hanja-informal",
</ins><span class="cx"> "landscape", "lao", "large", "larger", "left", "level", "lighter",
</span><del>- "line-through", "linear", "lines", "list-item", "listbox", "listitem",
</del><ins>+ "line-through", "linear", "linear-gradient", "lines", "list-item", "listbox", "listitem",
</ins><span class="cx"> "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
</span><span class="cx"> "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian",
</span><del>- "lower-roman", "lowercase", "ltr", "malayalam", "match",
</del><ins>+ "lower-roman", "lowercase", "ltr", "malayalam", "match", "matrix", "matrix3d",
</ins><span class="cx"> "media-controls-background", "media-current-time-display",
</span><span class="cx"> "media-fullscreen-button", "media-mute-button", "media-play-button",
</span><span class="cx"> "media-return-to-realtime-button", "media-rewind-button",
</span><span class="lines">@@ -550,46 +610,50 @@
</span><span class="cx"> "mix", "mongolian", "monospace", "move", "multiple", "myanmar", "n-resize",
</span><span class="cx"> "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
</span><span class="cx"> "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
</span><del>- "ns-resize", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
</del><ins>+ "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
</ins><span class="cx"> "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
</span><span class="cx"> "outside", "outside-shape", "overlay", "overline", "padding", "padding-box",
</span><del>- "painted", "page", "paused", "persian", "plus-darker", "plus-lighter", "pointer",
- "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d", "progress", "push-button",
- "radio", "read-only", "read-write", "read-write-plaintext-only", "rectangle", "region",
- "relative", "repeat", "repeat-x", "repeat-y", "reset", "reverse", "rgb", "rgba",
- "ridge", "right", "round", "row-resize", "rtl", "run-in", "running",
- "s-resize", "sans-serif", "scroll", "scrollbar", "se-resize", "searchfield",
</del><ins>+ "painted", "page", "paused", "persian", "perspective", "plus-darker", "plus-lighter",
+ "pointer", "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d",
+ "progress", "push-button", "radial-gradient", "radio", "read-only",
+ "read-write", "read-write-plaintext-only", "rectangle", "region",
+ "relative", "repeat", "repeating-linear-gradient",
+ "repeating-radial-gradient", "repeat-x", "repeat-y", "reset", "reverse",
+ "rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY",
+ "rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running",
+ "s-resize", "sans-serif", "scale", "scale3d", "scaleX", "scaleY", "scaleZ",
+ "scroll", "scrollbar", "se-resize", "searchfield",
</ins><span class="cx"> "searchfield-cancel-button", "searchfield-decoration",
</span><span class="cx"> "searchfield-results-button", "searchfield-results-decoration",
</span><span class="cx"> "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",
</span><del>- "single", "skip-white-space", "slide", "slider-horizontal",
</del><ins>+ "simp-chinese-formal", "simp-chinese-informal", "single",
+ "skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal",
</ins><span class="cx"> "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
</span><span class="cx"> "small", "small-caps", "small-caption", "smaller", "solid", "somali",
</span><del>- "source-atop", "source-in", "source-out", "source-over", "space", "square",
- "square-button", "start", "static", "status-bar", "stretch", "stroke",
- "sub", "subpixel-antialiased", "super", "sw-resize", "table",
</del><ins>+ "source-atop", "source-in", "source-out", "source-over", "space", "spell-out", "square",
+ "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
+ "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "table",
</ins><span class="cx"> "table-caption", "table-cell", "table-column", "table-column-group",
</span><span class="cx"> "table-footer-group", "table-header-group", "table-row", "table-row-group",
</span><ins>+ "tamil",
</ins><span class="cx"> "telugu", "text", "text-bottom", "text-top", "textarea", "textfield", "thai",
</span><span class="cx"> "thick", "thin", "threeddarkshadow", "threedface", "threedhighlight",
</span><span class="cx"> "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er",
</span><span class="cx"> "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
</span><ins>+ "trad-chinese-formal", "trad-chinese-informal",
+ "translate", "translate3d", "translateX", "translateY", "translateZ",
</ins><span class="cx"> "transparent", "ultra-condensed", "ultra-expanded", "underline", "up",
</span><span class="cx"> "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
</span><span class="cx"> "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
</span><del>- "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
</del><ins>+ "var", "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
</ins><span class="cx"> "visibleStroke", "visual", "w-resize", "wait", "wave", "wider",
</span><del>- "window", "windowframe", "windowtext", "x-large", "x-small", "xor",
</del><ins>+ "window", "windowframe", "windowtext", "words", "x-large", "x-small", "xor",
</ins><span class="cx"> "xx-large", "xx-small"
</span><span class="cx"> ], valueKeywords = keySet(valueKeywords_);
</span><span class="cx">
</span><del>- var fontProperties_ = [
- "font-family", "src", "unicode-range", "font-variant", "font-feature-settings",
- "font-stretch", "font-weight", "font-style"
- ], fontProperties = keySet(fontProperties_);
-
- var allWords = mediaTypes_.concat(mediaFeatures_).concat(propertyKeywords_)
- .concat(nonStandardPropertyKeywords).concat(colorKeywords_).concat(valueKeywords_);
</del><ins>+ var allWords = documentTypes_.concat(mediaTypes_).concat(mediaFeatures_).concat(mediaValueKeywords_)
+ .concat(propertyKeywords_).concat(nonStandardPropertyKeywords_).concat(colorKeywords_)
+ .concat(valueKeywords_);
</ins><span class="cx"> CodeMirror.registerHelper("hintWords", "css", allWords);
</span><span class="cx">
</span><span class="cx"> function tokenCComment(stream, state) {
</span><span class="lines">@@ -604,30 +668,18 @@
</span><span class="cx"> return ["comment", "comment"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function tokenSGMLComment(stream, state) {
- if (stream.skipTo("-->")) {
- stream.match("-->");
- state.tokenize = null;
- } else {
- stream.skipToEnd();
- }
- return ["comment", "comment"];
- }
-
</del><span class="cx"> CodeMirror.defineMIME("text/css", {
</span><ins>+ documentTypes: documentTypes,
</ins><span class="cx"> mediaTypes: mediaTypes,
</span><span class="cx"> mediaFeatures: mediaFeatures,
</span><ins>+ mediaValueKeywords: mediaValueKeywords,
</ins><span class="cx"> propertyKeywords: propertyKeywords,
</span><span class="cx"> nonStandardPropertyKeywords: nonStandardPropertyKeywords,
</span><ins>+ fontProperties: fontProperties,
+ counterDescriptors: counterDescriptors,
</ins><span class="cx"> colorKeywords: colorKeywords,
</span><span class="cx"> valueKeywords: valueKeywords,
</span><del>- fontProperties: fontProperties,
</del><span class="cx"> tokenHooks: {
</span><del>- "<": function(stream, state) {
- if (!stream.match("!--")) return false;
- state.tokenize = tokenSGMLComment;
- return tokenSGMLComment(stream, state);
- },
</del><span class="cx"> "/": function(stream, state) {
</span><span class="cx"> if (!stream.eat("*")) return false;
</span><span class="cx"> state.tokenize = tokenCComment;
</span><span class="lines">@@ -640,6 +692,7 @@
</span><span class="cx"> CodeMirror.defineMIME("text/x-scss", {
</span><span class="cx"> mediaTypes: mediaTypes,
</span><span class="cx"> mediaFeatures: mediaFeatures,
</span><ins>+ mediaValueKeywords: mediaValueKeywords,
</ins><span class="cx"> propertyKeywords: propertyKeywords,
</span><span class="cx"> nonStandardPropertyKeywords: nonStandardPropertyKeywords,
</span><span class="cx"> colorKeywords: colorKeywords,
</span><span class="lines">@@ -659,7 +712,7 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx"> ":": function(stream) {
</span><del>- if (stream.match(/\s*{/))
</del><ins>+ if (stream.match(/\s*\{/))
</ins><span class="cx"> return [null, "{"];
</span><span class="cx"> return false;
</span><span class="cx"> },
</span><span class="lines">@@ -681,6 +734,7 @@
</span><span class="cx"> CodeMirror.defineMIME("text/x-less", {
</span><span class="cx"> mediaTypes: mediaTypes,
</span><span class="cx"> mediaFeatures: mediaFeatures,
</span><ins>+ mediaValueKeywords: mediaValueKeywords,
</ins><span class="cx"> propertyKeywords: propertyKeywords,
</span><span class="cx"> nonStandardPropertyKeywords: nonStandardPropertyKeywords,
</span><span class="cx"> colorKeywords: colorKeywords,
</span><span class="lines">@@ -700,6 +754,7 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx"> "@": function(stream) {
</span><ins>+ if (stream.eat("{")) return [null, "interpolation"];
</ins><span class="cx"> if (stream.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/, false)) return false;
</span><span class="cx"> stream.eatWhile(/[\w\\\-]/);
</span><span class="cx"> if (stream.match(/^\s*:/, false))
</span><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/css.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorhtmlmixedjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/htmlmixed.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/htmlmixed.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/htmlmixed.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> function html(stream, state) {
</span><span class="cx"> var tagName = state.htmlState.tagName;
</span><ins>+ if (tagName) tagName = tagName.toLowerCase();
</ins><span class="cx"> var style = htmlMode.token(stream, state.htmlState);
</span><span class="cx"> if (tagName == "script" && /\btag\b/.test(style) && stream.current() == ">") {
</span><span class="cx"> // Script block: mode to change to depends on type attribute
</span><span class="lines">@@ -56,9 +57,9 @@
</span><span class="cx"> }
</span><span class="cx"> function maybeBackup(stream, pat, style) {
</span><span class="cx"> var cur = stream.current();
</span><del>- var close = cur.search(pat), m;
</del><ins>+ var close = cur.search(pat);
</ins><span class="cx"> if (close > -1) stream.backUp(cur.length - close);
</span><del>- else if (m = cur.match(/<\/?$/)) {
</del><ins>+ else if (cur.match(/<\/?$/)) {
</ins><span class="cx"> stream.backUp(cur.length);
</span><span class="cx"> if (!stream.match(pat, false)) stream.match(cur);
</span><span class="cx"> }
</span><span class="lines">@@ -68,7 +69,7 @@
</span><span class="cx"> if (stream.match(/^<\/\s*script\s*>/i, false)) {
</span><span class="cx"> state.token = html;
</span><span class="cx"> state.localState = state.localMode = null;
</span><del>- return html(stream, state);
</del><ins>+ return null;
</ins><span class="cx"> }
</span><span class="cx"> return maybeBackup(stream, /<\/\s*script\s*>/,
</span><span class="cx"> state.localMode.token(stream, state.localState));
</span><span class="lines">@@ -77,7 +78,7 @@
</span><span class="cx"> if (stream.match(/^<\/\s*style\s*>/i, false)) {
</span><span class="cx"> state.token = html;
</span><span class="cx"> state.localState = state.localMode = null;
</span><del>- return html(stream, state);
</del><ins>+ return null;
</ins><span class="cx"> }
</span><span class="cx"> return maybeBackup(stream, /<\/\s*style\s*>/,
</span><span class="cx"> cssMode.token(stream, state.localState));
</span><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/htmlmixed.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorjavascriptjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/javascript.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/javascript.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/javascript.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> var jsonldMode = parserConfig.jsonld;
</span><span class="cx"> var jsonMode = parserConfig.json || jsonldMode;
</span><span class="cx"> var isTS = parserConfig.typescript;
</span><ins>+ var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/;
</ins><span class="cx">
</span><span class="cx"> // Tokenizer
</span><span class="cx">
</span><span class="lines">@@ -117,7 +118,7 @@
</span><span class="cx"> } else if (state.lastType == "operator" || state.lastType == "keyword c" ||
</span><span class="cx"> state.lastType == "sof" || /^[\[{}\(,;:]$/.test(state.lastType)) {
</span><span class="cx"> readRegexp(stream);
</span><del>- stream.eatWhile(/[gimy]/); // 'y' is "sticky" option in Mozilla
</del><ins>+ stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
</ins><span class="cx"> return ret("regexp", "string-2");
</span><span class="cx"> } else {
</span><span class="cx"> stream.eatWhile(isOperatorChar);
</span><span class="lines">@@ -132,8 +133,8 @@
</span><span class="cx"> } else if (isOperatorChar.test(ch)) {
</span><span class="cx"> stream.eatWhile(isOperatorChar);
</span><span class="cx"> return ret("operator", "operator", stream.current());
</span><del>- } else {
- stream.eatWhile(/[\w\$_]/);
</del><ins>+ } else if (wordRE.test(ch)) {
+ stream.eatWhile(wordRE);
</ins><span class="cx"> var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
</span><span class="cx"> return (known && state.lastType != ".") ? ret(known.type, known.style, word) :
</span><span class="cx"> ret("variable", "variable", word);
</span><span class="lines">@@ -202,8 +203,10 @@
</span><span class="cx"> if (--depth == 0) break;
</span><span class="cx"> } else if (bracket >= 3 && bracket < 6) {
</span><span class="cx"> ++depth;
</span><del>- } else if (/[$\w]/.test(ch)) {
</del><ins>+ } else if (wordRE.test(ch)) {
</ins><span class="cx"> sawSomething = true;
</span><ins>+ } else if (/["'\/]/.test(ch)) {
+ return;
</ins><span class="cx"> } else if (sawSomething && !depth) {
</span><span class="cx"> ++pos;
</span><span class="cx"> break;
</span><span class="lines">@@ -238,7 +241,7 @@
</span><span class="cx"> var cc = state.cc;
</span><span class="cx"> // Communicate our context to the combinators.
</span><span class="cx"> // (Less wasteful than consing up a hundred closures on every call.)
</span><del>- cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc;
</del><ins>+ cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc; cx.style = style;
</ins><span class="cx">
</span><span class="cx"> if (!state.lexical.hasOwnProperty("align"))
</span><span class="cx"> state.lexical.align = true;
</span><span class="lines">@@ -298,6 +301,8 @@
</span><span class="cx"> var result = function() {
</span><span class="cx"> var state = cx.state, indent = state.indented;
</span><span class="cx"> if (state.lexical.type == "stat") indent = state.lexical.indented;
</span><ins>+ else for (var outer = state.lexical; outer && outer.type == ")" && outer.align; outer = outer.prev)
+ indent = outer.indented;
</ins><span class="cx"> state.lexical = new JSLexical(indent, cx.stream.column(), type, null, state.lexical, info);
</span><span class="cx"> };
</span><span class="cx"> result.lex = true;
</span><span class="lines">@@ -343,7 +348,7 @@
</span><span class="cx"> if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
</span><span class="cx"> statement, poplex, popcontext);
</span><span class="cx"> if (type == "module") return cont(pushlex("form"), pushcontext, afterModule, popcontext, poplex);
</span><del>- if (type == "class") return cont(pushlex("form"), className, objlit, poplex);
</del><ins>+ if (type == "class") return cont(pushlex("form"), className, poplex);
</ins><span class="cx"> if (type == "export") return cont(pushlex("form"), afterExport, poplex);
</span><span class="cx"> if (type == "import") return cont(pushlex("form"), afterImport, poplex);
</span><span class="cx"> return pass(pushlex("stat"), expression, expect(";"), poplex);
</span><span class="lines">@@ -388,7 +393,7 @@
</span><span class="cx"> function maybeoperatorNoComma(type, value, noComma) {
</span><span class="cx"> var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma;
</span><span class="cx"> var expr = noComma == false ? expression : expressionNoComma;
</span><del>- if (value == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
</del><ins>+ if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
</ins><span class="cx"> if (type == "operator") {
</span><span class="cx"> if (/\+\+|--/.test(value)) return cont(me);
</span><span class="cx"> if (value == "?") return cont(expression, expect(":"), expr);
</span><span class="lines">@@ -414,13 +419,11 @@
</span><span class="cx"> }
</span><span class="cx"> function arrowBody(type) {
</span><span class="cx"> findFatArrow(cx.stream, cx.state);
</span><del>- if (type == "{") return pass(statement);
- return pass(expression);
</del><ins>+ return pass(type == "{" ? statement : expression);
</ins><span class="cx"> }
</span><span class="cx"> function arrowBodyNoComma(type) {
</span><span class="cx"> findFatArrow(cx.stream, cx.state);
</span><del>- if (type == "{") return pass(statement);
- return pass(expressionNoComma);
</del><ins>+ return pass(type == "{" ? statement : expressionNoComma);
</ins><span class="cx"> }
</span><span class="cx"> function maybelabel(type) {
</span><span class="cx"> if (type == ":") return cont(poplex, statement);
</span><span class="lines">@@ -430,15 +433,18 @@
</span><span class="cx"> if (type == "variable") {cx.marked = "property"; return cont();}
</span><span class="cx"> }
</span><span class="cx"> function objprop(type, value) {
</span><del>- if (type == "variable") {
</del><ins>+ if (type == "variable" || cx.style == "keyword") {
</ins><span class="cx"> cx.marked = "property";
</span><span class="cx"> if (value == "get" || value == "set") return cont(getterSetter);
</span><ins>+ return cont(afterprop);
</ins><span class="cx"> } else if (type == "number" || type == "string") {
</span><del>- cx.marked = jsonldMode ? "property" : (type + " property");
</del><ins>+ cx.marked = jsonldMode ? "property" : (cx.style + " property");
+ return cont(afterprop);
+ } else if (type == "jsonld-keyword") {
+ return cont(afterprop);
</ins><span class="cx"> } else if (type == "[") {
</span><span class="cx"> return cont(expression, expect("]"), afterprop);
</span><span class="cx"> }
</span><del>- if (atomicTypes.hasOwnProperty(type)) return cont(afterprop);
</del><span class="cx"> }
</span><span class="cx"> function getterSetter(type) {
</span><span class="cx"> if (type != "variable") return pass(afterprop);
</span><span class="lines">@@ -476,8 +482,11 @@
</span><span class="cx"> function maybetype(type) {
</span><span class="cx"> if (isTS && type == ":") return cont(typedef);
</span><span class="cx"> }
</span><ins>+ function maybedefault(_, value) {
+ if (value == "=") return cont(expressionNoComma);
+ }
</ins><span class="cx"> function typedef(type) {
</span><del>- if (type == "variable"){cx.marked = "variable-3"; return cont();}
</del><ins>+ if (type == "variable") {cx.marked = "variable-3"; return cont();}
</ins><span class="cx"> }
</span><span class="cx"> function vardef() {
</span><span class="cx"> return pass(pattern, maybetype, maybeAssign, vardefCont);
</span><span class="lines">@@ -532,17 +541,37 @@
</span><span class="cx"> }
</span><span class="cx"> function funarg(type) {
</span><span class="cx"> if (type == "spread") return cont(funarg);
</span><del>- return pass(pattern, maybetype);
</del><ins>+ return pass(pattern, maybetype, maybedefault);
</ins><span class="cx"> }
</span><span class="cx"> function className(type, value) {
</span><span class="cx"> if (type == "variable") {register(value); return cont(classNameAfter);}
</span><span class="cx"> }
</span><del>- function classNameAfter(_type, value) {
- if (value == "extends") return cont(expression);
</del><ins>+ function classNameAfter(type, value) {
+ if (value == "extends") return cont(expression, classNameAfter);
+ if (type == "{") return cont(pushlex("}"), classBody, poplex);
</ins><span class="cx"> }
</span><del>- function objlit(type) {
- if (type == "{") return contCommasep(objprop, "}");
</del><ins>+ function classBody(type, value) {
+ if (type == "variable" || cx.style == "keyword") {
+ if (value == "static") {
+ cx.marked = "keyword";
+ return cont(classBody);
+ }
+ cx.marked = "property";
+ if (value == "get" || value == "set") return cont(classGetterSetter, functiondef, classBody);
+ return cont(functiondef, classBody);
+ }
+ if (value == "*") {
+ cx.marked = "keyword";
+ return cont(classBody);
+ }
+ if (type == ";") return cont(classBody);
+ if (type == "}") return cont();
</ins><span class="cx"> }
</span><ins>+ function classGetterSetter(type) {
+ if (type != "variable") return pass();
+ cx.marked = "property";
+ return cont();
+ }
</ins><span class="cx"> function afterModule(type, value) {
</span><span class="cx"> if (type == "string") return cont(statement);
</span><span class="cx"> if (type == "variable") { register(value); return cont(maybeFrom); }
</span><span class="lines">@@ -559,8 +588,12 @@
</span><span class="cx"> function importSpec(type, value) {
</span><span class="cx"> if (type == "{") return contCommasep(importSpec, "}");
</span><span class="cx"> if (type == "variable") register(value);
</span><del>- return cont();
</del><ins>+ if (value == "*") cx.marked = "keyword";
+ return cont(maybeAs);
</ins><span class="cx"> }
</span><ins>+ function maybeAs(_type, value) {
+ if (value == "as") { cx.marked = "keyword"; return cont(importSpec); }
+ }
</ins><span class="cx"> function maybeFrom(_type, value) {
</span><span class="cx"> if (value == "from") { cx.marked = "keyword"; return cont(expression); }
</span><span class="cx"> }
</span><span class="lines">@@ -570,7 +603,7 @@
</span><span class="cx"> }
</span><span class="cx"> function maybeArrayComprehension(type) {
</span><span class="cx"> if (type == "for") return pass(comprehension, expect("]"));
</span><del>- if (type == ",") return cont(commasep(expressionNoComma, "]"));
</del><ins>+ if (type == ",") return cont(commasep(maybeexpressionNoComma, "]"));
</ins><span class="cx"> return pass(commasep(expressionNoComma, "]"));
</span><span class="cx"> }
</span><span class="cx"> function comprehension(type) {
</span><span class="lines">@@ -578,6 +611,12 @@
</span><span class="cx"> if (type == "if") return cont(expression, comprehension);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function isContinuedStatement(state, textAfter) {
+ return state.lastType == "operator" || state.lastType == "," ||
+ isOperatorChar.test(textAfter.charAt(0)) ||
+ /[,.]/.test(textAfter.charAt(0));
+ }
+
</ins><span class="cx"> // Interface
</span><span class="cx">
</span><span class="cx"> return {
</span><span class="lines">@@ -629,18 +668,19 @@
</span><span class="cx"> else if (type == "form" && firstChar == "{") return lexical.indented;
</span><span class="cx"> else if (type == "form") return lexical.indented + indentUnit;
</span><span class="cx"> else if (type == "stat")
</span><del>- return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? statementIndent || indentUnit : 0);
</del><ins>+ return lexical.indented + (isContinuedStatement(state, textAfter) ? statementIndent || indentUnit : 0);
</ins><span class="cx"> else if (lexical.info == "switch" && !closing && parserConfig.doubleIndentSwitch != false)
</span><span class="cx"> return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
</span><span class="cx"> else if (lexical.align) return lexical.column + (closing ? 0 : 1);
</span><span class="cx"> else return lexical.indented + (closing ? 0 : indentUnit);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- electricChars: ":{}",
</del><ins>+ electricInput: /^\s*(?:case .*?:|default:|\{|\})$/,
</ins><span class="cx"> blockCommentStart: jsonMode ? null : "/*",
</span><span class="cx"> blockCommentEnd: jsonMode ? null : "*/",
</span><span class="cx"> lineComment: jsonMode ? null : "//",
</span><span class="cx"> fold: "brace",
</span><ins>+ closeBrackets: "()[]{}''\"\"``",
</ins><span class="cx">
</span><span class="cx"> helperType: jsonMode ? "json" : "javascript",
</span><span class="cx"> jsonldMode: jsonldMode,
</span><span class="lines">@@ -648,11 +688,12 @@
</span><span class="cx"> };
</span><span class="cx"> });
</span><span class="cx">
</span><del>-CodeMirror.registerHelper("wordChars", "javascript", /[\\w$]/);
</del><ins>+CodeMirror.registerHelper("wordChars", "javascript", /[\w$]/);
</ins><span class="cx">
</span><span class="cx"> CodeMirror.defineMIME("text/javascript", "javascript");
</span><span class="cx"> CodeMirror.defineMIME("text/ecmascript", "javascript");
</span><span class="cx"> CodeMirror.defineMIME("application/javascript", "javascript");
</span><ins>+CodeMirror.defineMIME("application/x-javascript", "javascript");
</ins><span class="cx"> CodeMirror.defineMIME("application/ecmascript", "javascript");
</span><span class="cx"> CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
</span><span class="cx"> CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true});
</span><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/javascript.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorlivescriptjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/livescript.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/livescript.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/livescript.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx"> var nr = Rules[next_rule];
</span><span class="cx"> if (nr.splice) {
</span><span class="cx"> for (var i$ = 0; i$ < nr.length; ++i$) {
</span><del>- var r = nr[i$], m;
- if (r.regex && (m = stream.match(r.regex))) {
</del><ins>+ var r = nr[i$];
+ if (r.regex && stream.match(r.regex)) {
</ins><span class="cx"> state.next = r.next || state.next;
</span><span class="cx"> return r.token;
</span><span class="cx"> }
</span><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/livescript.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrormatchbracketsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/matchbrackets.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/matchbrackets.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/matchbrackets.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> if (marks.length) {
</span><span class="cx"> // Kludge to work around the IE bug from issue #1193, where text
</span><span class="cx"> // input stops going to the textare whever this fires.
</span><del>- if (ie_lt8 && cm.state.focused) cm.display.input.focus();
</del><ins>+ if (ie_lt8 && cm.state.focused) cm.focus();
</ins><span class="cx">
</span><span class="cx"> var clear = function() {
</span><span class="cx"> cm.operation(function() {
</span><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/matchbrackets.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirroroverlayjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/overlay.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/overlay.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/overlay.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> overlay: CodeMirror.startState(overlay),
</span><span class="cx"> basePos: 0, baseCur: null,
</span><span class="cx"> overlayPos: 0, overlayCur: null,
</span><del>- lineSeen: null
</del><ins>+ streamSeen: null
</ins><span class="cx"> };
</span><span class="cx"> },
</span><span class="cx"> copyState: function(state) {
</span><span class="lines">@@ -41,9 +41,9 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> token: function(stream, state) {
</span><del>- if (stream.sol() || stream.string != state.lineSeen ||
</del><ins>+ if (stream != state.streamSeen ||
</ins><span class="cx"> Math.min(state.basePos, state.overlayPos) < stream.start) {
</span><del>- state.lineSeen = stream.string;
</del><ins>+ state.streamSeen = stream;
</ins><span class="cx"> state.basePos = state.overlayPos = stream.start;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/overlay.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorplaceholderjs"></a>
<div class="propset"><h4>Property changes: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/placeholder.js</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorrunmodejs"></a>
<div class="propset"><h4>Property changes: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/runmode.js</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorsassjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/sass.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/sass.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/sass.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -12,302 +12,368 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> CodeMirror.defineMode("sass", function(config) {
</span><del>- var tokenRegexp = function(words){
</del><ins>+ function tokenRegexp(words) {
</ins><span class="cx"> return new RegExp("^" + words.join("|"));
</span><del>- };
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> var keywords = ["true", "false", "null", "auto"];
</span><span class="cx"> var keywordsRegexp = new RegExp("^" + keywords.join("|"));
</span><span class="cx">
</span><del>- var operators = ["\\(", "\\)", "=", ">", "<", "==", ">=", "<=", "\\+", "-", "\\!=", "/", "\\*", "%", "and", "or", "not"];
</del><ins>+ var operators = ["\\(", "\\)", "=", ">", "<", "==", ">=", "<=", "\\+", "-",
+ "\\!=", "/", "\\*", "%", "and", "or", "not", ";","\\{","\\}",":"];
</ins><span class="cx"> var opRegexp = tokenRegexp(operators);
</span><span class="cx">
</span><del>- var pseudoElementsRegexp = /^::?[\w\-]+/;
</del><ins>+ var pseudoElementsRegexp = /^::?[a-zA-Z_][\w\-]*/;
</ins><span class="cx">
</span><del>- var urlTokens = function(stream, state){
</del><ins>+ function urlTokens(stream, state) {
</ins><span class="cx"> var ch = stream.peek();
</span><span class="cx">
</span><del>- if (ch === ")"){
</del><ins>+ if (ch === ")") {
</ins><span class="cx"> stream.next();
</span><span class="cx"> state.tokenizer = tokenBase;
</span><span class="cx"> return "operator";
</span><del>- }else if (ch === "("){
</del><ins>+ } else if (ch === "(") {
</ins><span class="cx"> stream.next();
</span><span class="cx"> stream.eatSpace();
</span><span class="cx">
</span><span class="cx"> return "operator";
</span><del>- }else if (ch === "'" || ch === '"'){
</del><ins>+ } else if (ch === "'" || ch === '"') {
</ins><span class="cx"> state.tokenizer = buildStringTokenizer(stream.next());
</span><span class="cx"> return "string";
</span><del>- }else{
</del><ins>+ } else {
</ins><span class="cx"> state.tokenizer = buildStringTokenizer(")", false);
</span><span class="cx"> return "string";
</span><span class="cx"> }
</span><del>- };
- var multilineComment = function(stream, state) {
- if (stream.skipTo("*/")){
- stream.next();
- stream.next();
- state.tokenizer = tokenBase;
- }else {
- stream.next();
- }
</del><ins>+ }
+ function comment(indentation, multiLine) {
+ return function(stream, state) {
+ if (stream.sol() && stream.indentation() <= indentation) {
+ state.tokenizer = tokenBase;
+ return tokenBase(stream, state);
+ }
</ins><span class="cx">
</span><del>- return "comment";
- };
</del><ins>+ if (multiLine && stream.skipTo("*/")) {
+ stream.next();
+ stream.next();
+ state.tokenizer = tokenBase;
+ } else {
+ stream.skipToEnd();
+ }
</ins><span class="cx">
</span><del>- var buildStringTokenizer = function(quote, greedy){
- if(greedy == null){ greedy = true; }
</del><ins>+ return "comment";
+ };
+ }
</ins><span class="cx">
</span><del>- function stringTokenizer(stream, state){
</del><ins>+ function buildStringTokenizer(quote, greedy) {
+ if (greedy == null) { greedy = true; }
+
+ function stringTokenizer(stream, state) {
</ins><span class="cx"> var nextChar = stream.next();
</span><span class="cx"> var peekChar = stream.peek();
</span><span class="cx"> var previousChar = stream.string.charAt(stream.pos-2);
</span><span class="cx">
</span><span class="cx"> var endingString = ((nextChar !== "\\" && peekChar === quote) || (nextChar === quote && previousChar !== "\\"));
</span><span class="cx">
</span><del>- /*
- console.log("previousChar: " + previousChar);
- console.log("nextChar: " + nextChar);
- console.log("peekChar: " + peekChar);
- console.log("ending: " + endingString);
- */
-
- if (endingString){
</del><ins>+ if (endingString) {
</ins><span class="cx"> if (nextChar !== quote && greedy) { stream.next(); }
</span><span class="cx"> state.tokenizer = tokenBase;
</span><span class="cx"> return "string";
</span><del>- }else if (nextChar === "#" && peekChar === "{"){
</del><ins>+ } else if (nextChar === "#" && peekChar === "{") {
</ins><span class="cx"> state.tokenizer = buildInterpolationTokenizer(stringTokenizer);
</span><span class="cx"> stream.next();
</span><span class="cx"> return "operator";
</span><del>- }else {
</del><ins>+ } else {
</ins><span class="cx"> return "string";
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return stringTokenizer;
</span><del>- };
</del><ins>+ }
</ins><span class="cx">
</span><del>- var buildInterpolationTokenizer = function(currentTokenizer){
- return function(stream, state){
- if (stream.peek() === "}"){
</del><ins>+ function buildInterpolationTokenizer(currentTokenizer) {
+ return function(stream, state) {
+ if (stream.peek() === "}") {
</ins><span class="cx"> stream.next();
</span><span class="cx"> state.tokenizer = currentTokenizer;
</span><span class="cx"> return "operator";
</span><del>- }else{
</del><ins>+ } else {
</ins><span class="cx"> return tokenBase(stream, state);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>- };
</del><ins>+ }
</ins><span class="cx">
</span><del>- var indent = function(state){
- if (state.indentCount == 0){
</del><ins>+ function indent(state) {
+ if (state.indentCount == 0) {
</ins><span class="cx"> state.indentCount++;
</span><span class="cx"> var lastScopeOffset = state.scopes[0].offset;
</span><span class="cx"> var currentOffset = lastScopeOffset + config.indentUnit;
</span><span class="cx"> state.scopes.unshift({ offset:currentOffset });
</span><span class="cx"> }
</span><del>- };
</del><ins>+ }
</ins><span class="cx">
</span><del>- var dedent = function(state){
- if (state.scopes.length == 1) { return; }
</del><ins>+ function dedent(state) {
+ if (state.scopes.length == 1) return;
</ins><span class="cx">
</span><span class="cx"> state.scopes.shift();
</span><del>- };
</del><ins>+ }
</ins><span class="cx">
</span><del>- var tokenBase = function(stream, state) {
</del><ins>+ function tokenBase(stream, state) {
</ins><span class="cx"> var ch = stream.peek();
</span><span class="cx">
</span><del>- // Single line Comment
- if (stream.match('//')) {
- stream.skipToEnd();
- return "comment";
</del><ins>+ // Comment
+ if (stream.match("/*")) {
+ state.tokenizer = comment(stream.indentation(), true);
+ return state.tokenizer(stream, state);
</ins><span class="cx"> }
</span><del>-
- // Multiline Comment
- if (stream.match('/*')){
- state.tokenizer = multilineComment;
</del><ins>+ if (stream.match("//")) {
+ state.tokenizer = comment(stream.indentation(), false);
</ins><span class="cx"> return state.tokenizer(stream, state);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Interpolation
</span><del>- if (stream.match('#{')){
- state.tokenizer = buildInterpolationTokenizer(tokenBase);
</del><ins>+ if (stream.match("#{")) {
+ state.tokenizer = buildInterpolationTokenizer(tokenBase);
</ins><span class="cx"> return "operator";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (ch === "."){
</del><ins>+ // Strings
+ if (ch === '"' || ch === "'") {
</ins><span class="cx"> stream.next();
</span><ins>+ state.tokenizer = buildStringTokenizer(ch);
+ return "string";
+ }
</ins><span class="cx">
</span><del>- // Match class selectors
- if (stream.match(/^[\w-]+/)){
- indent(state);
- return "atom";
- }else if (stream.peek() === "#"){
- indent(state);
- return "atom";
- }else{
- return "operator";
</del><ins>+ if(!state.cursorHalf){// state.cursorHalf === 0
+ // first half i.e. before : for key-value pairs
+ // including selectors
+
+ if (ch === ".") {
+ stream.next();
+ if (stream.match(/^[\w-]+/)) {
+ indent(state);
+ return "atom";
+ } else if (stream.peek() === "#") {
+ indent(state);
+ return "atom";
+ }
</ins><span class="cx"> }
</span><del>- }
</del><span class="cx">
</span><del>- if (ch === "#"){
- stream.next();
</del><ins>+ if (ch === "#") {
+ stream.next();
+ // ID selectors
+ if (stream.match(/^[\w-]+/)) {
+ indent(state);
+ return "atom";
+ }
+ if (stream.peek() === "#") {
+ indent(state);
+ return "atom";
+ }
+ }
</ins><span class="cx">
</span><del>- // Hex numbers
- if (stream.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/)){
- return "number";
</del><ins>+ // Variables
+ if (ch === "$") {
+ stream.next();
+ stream.eatWhile(/[\w-]/);
+ return "variable-2";
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // ID selectors
- if (stream.match(/^[\w-]+/)){
- indent(state);
</del><ins>+ // Numbers
+ if (stream.match(/^-?[0-9\.]+/))
+ return "number";
+
+ // Units
+ if (stream.match(/^(px|em|in)\b/))
+ return "unit";
+
+ if (stream.match(keywordsRegexp))
+ return "keyword";
+
+ if (stream.match(/^url/) && stream.peek() === "(") {
+ state.tokenizer = urlTokens;
</ins><span class="cx"> return "atom";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (stream.peek() === "#"){
- indent(state);
- return "atom";
</del><ins>+ if (ch === "=") {
+ // Match shortcut mixin definition
+ if (stream.match(/^=[\w-]+/)) {
+ indent(state);
+ return "meta";
+ }
</ins><span class="cx"> }
</span><del>- }
</del><span class="cx">
</span><del>- // Numbers
- if (stream.match(/^-?[0-9\.]+/)){
- return "number";
- }
</del><ins>+ if (ch === "+") {
+ // Match shortcut mixin definition
+ if (stream.match(/^\+[\w-]+/)){
+ return "variable-3";
+ }
+ }
</ins><span class="cx">
</span><del>- // Units
- if (stream.match(/^(px|em|in)\b/)){
- return "unit";
- }
</del><ins>+ if(ch === "@"){
+ if(stream.match(/@extend/)){
+ if(!stream.match(/\s*[\w]/))
+ dedent(state);
+ }
+ }
</ins><span class="cx">
</span><del>- if (stream.match(keywordsRegexp)){
- return "keyword";
- }
</del><span class="cx">
</span><del>- if (stream.match(/^url/) && stream.peek() === "("){
- state.tokenizer = urlTokens;
- return "atom";
- }
</del><ins>+ // Indent Directives
+ if (stream.match(/^@(else if|if|media|else|for|each|while|mixin|function)/)) {
+ indent(state);
+ return "meta";
+ }
</ins><span class="cx">
</span><del>- // Variables
- if (ch === "$"){
- stream.next();
- stream.eatWhile(/[\w-]/);
</del><ins>+ // Other Directives
+ if (ch === "@") {
+ stream.next();
+ stream.eatWhile(/[\w-]/);
+ return "meta";
+ }
</ins><span class="cx">
</span><del>- if (stream.peek() === ":"){
</del><ins>+ if (stream.eatWhile(/[\w-]/)){
+ if(stream.match(/ *: *[\w-\+\$#!\("']/,false)){
+ return "property";
+ }
+ else if(stream.match(/ *:/,false)){
+ indent(state);
+ state.cursorHalf = 1;
+ return "atom";
+ }
+ else if(stream.match(/ *,/,false)){
+ return "atom";
+ }
+ else{
+ indent(state);
+ return "atom";
+ }
+ }
+
+ if(ch === ":"){
+ if (stream.match(pseudoElementsRegexp)){ // could be a pseudo-element
+ return "keyword";
+ }
</ins><span class="cx"> stream.next();
</span><del>- return "variable-2";
- }else{
- return "variable-3";
</del><ins>+ state.cursorHalf=1;
+ return "operator";
</ins><span class="cx"> }
</span><del>- }
</del><span class="cx">
</span><del>- if (ch === "!"){
- stream.next();
</del><ins>+ } // cursorHalf===0 ends here
+ else{
</ins><span class="cx">
</span><del>- if (stream.match(/^[\w]+/)){
- return "keyword";
</del><ins>+ if (ch === "#") {
+ stream.next();
+ // Hex numbers
+ if (stream.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/)){
+ if(!stream.peek()){
+ state.cursorHalf = 0;
+ }
+ return "number";
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return "operator";
- }
</del><ins>+ // Numbers
+ if (stream.match(/^-?[0-9\.]+/)){
+ if(!stream.peek()){
+ state.cursorHalf = 0;
+ }
+ return "number";
+ }
</ins><span class="cx">
</span><del>- if (ch === "="){
- stream.next();
</del><ins>+ // Units
+ if (stream.match(/^(px|em|in)\b/)){
+ if(!stream.peek()){
+ state.cursorHalf = 0;
+ }
+ return "unit";
+ }
</ins><span class="cx">
</span><del>- // Match shortcut mixin definition
- if (stream.match(/^[\w-]+/)){
- indent(state);
- return "meta";
- }else {
- return "operator";
</del><ins>+ if (stream.match(keywordsRegexp)){
+ if(!stream.peek()){
+ state.cursorHalf = 0;
+ }
+ return "keyword";
</ins><span class="cx"> }
</span><del>- }
</del><span class="cx">
</span><del>- if (ch === "+"){
- stream.next();
</del><ins>+ if (stream.match(/^url/) && stream.peek() === "(") {
+ state.tokenizer = urlTokens;
+ if(!stream.peek()){
+ state.cursorHalf = 0;
+ }
+ return "atom";
+ }
</ins><span class="cx">
</span><del>- // Match shortcut mixin definition
- if (stream.match(/^[\w-]+/)){
</del><ins>+ // Variables
+ if (ch === "$") {
+ stream.next();
+ stream.eatWhile(/[\w-]/);
+ if(!stream.peek()){
+ state.cursorHalf = 0;
+ }
</ins><span class="cx"> return "variable-3";
</span><del>- }else {
- return "operator";
</del><span class="cx"> }
</span><del>- }
</del><span class="cx">
</span><del>- // Indent Directives
- if (stream.match(/^@(else if|if|media|else|for|each|while|mixin|function)/)){
- indent(state);
- return "meta";
- }
</del><ins>+ // bang character for !important, !default, etc.
+ if (ch === "!") {
+ stream.next();
+ if(!stream.peek()){
+ state.cursorHalf = 0;
+ }
+ return stream.match(/^[\w]+/) ? "keyword": "operator";
+ }
</ins><span class="cx">
</span><del>- // Other Directives
- if (ch === "@"){
- stream.next();
- stream.eatWhile(/[\w-]/);
- return "meta";
- }
</del><ins>+ if (stream.match(opRegexp)){
+ if(!stream.peek()){
+ state.cursorHalf = 0;
+ }
+ return "operator";
+ }
</ins><span class="cx">
</span><del>- // Strings
- if (ch === '"' || ch === "'"){
- stream.next();
- state.tokenizer = buildStringTokenizer(ch);
- return "string";
- }
</del><ins>+ // attributes
+ if (stream.eatWhile(/[\w-]/)) {
+ if(!stream.peek()){
+ state.cursorHalf = 0;
+ }
+ return "attribute";
+ }
</ins><span class="cx">
</span><del>- // Pseudo element selectors
- if (ch == ':' && stream.match(pseudoElementsRegexp)){
- return "keyword";
- }
</del><ins>+ //stream.eatSpace();
+ if(!stream.peek()){
+ state.cursorHalf = 0;
+ return null;
+ }
</ins><span class="cx">
</span><del>- // atoms
- if (stream.eatWhile(/[\w-&]/)){
- // matches a property definition
- if (stream.peek() === ":" && !stream.match(pseudoElementsRegexp, false))
- return "property";
- else
- return "atom";
- }
</del><ins>+ } // else ends here
</ins><span class="cx">
</span><del>- if (stream.match(opRegexp)){
</del><ins>+ if (stream.match(opRegexp))
</ins><span class="cx"> return "operator";
</span><del>- }
</del><span class="cx">
</span><span class="cx"> // If we haven't returned by now, we move 1 character
</span><span class="cx"> // and return an error
</span><span class="cx"> stream.next();
</span><span class="cx"> return null;
</span><del>- };
</del><ins>+ }
</ins><span class="cx">
</span><del>- var tokenLexer = function(stream, state) {
- if (stream.sol()){
- state.indentCount = 0;
- }
</del><ins>+ function tokenLexer(stream, state) {
+ if (stream.sol()) state.indentCount = 0;
</ins><span class="cx"> var style = state.tokenizer(stream, state);
</span><span class="cx"> var current = stream.current();
</span><span class="cx">
</span><del>- if (current === "@return"){
</del><ins>+ if (current === "@return" || current === "}"){
</ins><span class="cx"> dedent(state);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (style === "atom"){
- indent(state);
- }
</del><ins>+ if (style !== null) {
+ var startOfToken = stream.pos - current.length;
</ins><span class="cx">
</span><del>- if (style !== null){
- var startOfToken = stream.pos - current.length;
</del><span class="cx"> var withCurrentIndent = startOfToken + (config.indentUnit * state.indentCount);
</span><span class="cx">
</span><span class="cx"> var newScopes = [];
</span><span class="cx">
</span><del>- for (var i = 0; i < state.scopes.length; i++){
</del><ins>+ for (var i = 0; i < state.scopes.length; i++) {
</ins><span class="cx"> var scope = state.scopes[i];
</span><span class="cx">
</span><del>- if (scope.offset <= withCurrentIndent){
</del><ins>+ if (scope.offset <= withCurrentIndent)
</ins><span class="cx"> newScopes.push(scope);
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> state.scopes = newScopes;
</span><span class="lines">@@ -315,13 +381,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> return style;
</span><del>- };
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return {
</span><span class="cx"> startState: function() {
</span><span class="cx"> return {
</span><span class="cx"> tokenizer: tokenBase,
</span><del>- scopes: [{offset: 0, type: 'sass'}],
</del><ins>+ scopes: [{offset: 0, type: "sass"}],
+ indentCount: 0,
+ cursorHalf: 0, // cursor half tells us if cursor lies after (1)
+ // or before (0) colon (well... more or less)
</ins><span class="cx"> definedVars: [],
</span><span class="cx"> definedMixins: []
</span><span class="cx"> };
</span><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/sass.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorsearchcursorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/searchcursor.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/searchcursor.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/searchcursor.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> var from = Pos(pos.line, cut);
</span><span class="cx"> for (var ln = pos.line + 1, i = 1; i < last; ++i, ++ln)
</span><span class="cx"> if (target[i] != fold(doc.getLine(ln))) return;
</span><del>- if (doc.getLine(ln).slice(0, origTarget[last].length) != target[last]) return;
</del><ins>+ if (fold(doc.getLine(ln).slice(0, origTarget[last].length)) != target[last]) return;
</ins><span class="cx"> return {from: from, to: Pos(ln, origTarget[last].length)};
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -148,10 +148,10 @@
</span><span class="cx"> from: function() {if (this.atOccurrence) return this.pos.from;},
</span><span class="cx"> to: function() {if (this.atOccurrence) return this.pos.to;},
</span><span class="cx">
</span><del>- replace: function(newText) {
</del><ins>+ replace: function(newText, origin) {
</ins><span class="cx"> if (!this.atOccurrence) return;
</span><span class="cx"> var lines = CodeMirror.splitLines(newText);
</span><del>- this.doc.replaceRange(lines, this.pos.from, this.pos.to);
</del><ins>+ this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin);
</ins><span class="cx"> this.pos.to = Pos(this.pos.from.line + lines.length - 1,
</span><span class="cx"> lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0));
</span><span class="cx"> }
</span><span class="lines">@@ -177,9 +177,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> CodeMirror.defineExtension("selectMatches", function(query, caseFold) {
</span><del>- var ranges = [], next;
</del><ins>+ var ranges = [];
</ins><span class="cx"> var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold);
</span><del>- while (next = cur.findNext()) {
</del><ins>+ while (cur.findNext()) {
</ins><span class="cx"> if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break;
</span><span class="cx"> ranges.push({anchor: cur.from(), head: cur.to()});
</span><span class="cx"> }
</span><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/searchcursor.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorsqljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/sql.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/sql.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/sql.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx">
</span><span class="cx"> indent: function(state, textAfter) {
</span><span class="cx"> var cx = state.context;
</span><del>- if (!cx) return 0;
</del><ins>+ if (!cx) return CodeMirror.Pass;
</ins><span class="cx"> var closing = textAfter.charAt(0) == cx.type;
</span><span class="cx"> if (cx.align) return cx.col + (closing ? 0 : 1);
</span><span class="cx"> else return cx.indent + (closing ? 0 : config.indentUnit);
</span><span class="lines">@@ -213,7 +213,8 @@
</span><span class="cx"> while ((ch = stream.next()) != null) {
</span><span class="cx"> if (ch == "`" && !stream.eat("`")) return "variable-2";
</span><span class="cx"> }
</span><del>- return null;
</del><ins>+ stream.backUp(stream.current().length - 1);
+ return stream.eatWhile(/\w/) ? "variable-2" : null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // variable token
</span><span class="lines">@@ -256,7 +257,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // these keywords are used by all SQL dialects (however, a mode can still overwrite it)
</span><del>- var sqlKeywords = "alter and as asc between by count create delete desc distinct drop from having in insert into is join like not on or order select set table union update values where ";
</del><ins>+ var sqlKeywords = "alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where ";
</ins><span class="cx">
</span><span class="cx"> // turn a space-separated list into an array
</span><span class="cx"> function set(str) {
</span><span class="lines">@@ -279,7 +280,7 @@
</span><span class="cx"> CodeMirror.defineMIME("text/x-mssql", {
</span><span class="cx"> name: "sql",
</span><span class="cx"> client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),
</span><del>- keywords: set(sqlKeywords + "begin trigger proc view index for add constraint key primary foreign collate clustered nonclustered"),
</del><ins>+ keywords: set(sqlKeywords + "begin trigger proc view index for add constraint key primary foreign collate clustered nonclustered declare"),
</ins><span class="cx"> builtin: set("bigint numeric bit smallint decimal smallmoney int tinyint money float real char varchar text nchar nvarchar ntext binary varbinary image cursor timestamp hierarchyid uniqueidentifier sql_variant xml table "),
</span><span class="cx"> atoms: set("false true null unknown"),
</span><span class="cx"> operatorChars: /^[*+\-%<>!=]/,
</span><span class="lines">@@ -292,7 +293,7 @@
</span><span class="cx"> CodeMirror.defineMIME("text/x-mysql", {
</span><span class="cx"> name: "sql",
</span><span class="cx"> client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),
</span><del>- keywords: set(sqlKeywords + "accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists e
xit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group groupby_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist
profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables v
arying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
</del><ins>+ keywords: set(sqlKeywords + "accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists ex
it explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group group_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist pro
file profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables vary
ing view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
</ins><span class="cx"> builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
</span><span class="cx"> atoms: set("false true null unknown"),
</span><span class="cx"> operatorChars: /^[*+\-%<>!=&|^]/,
</span><span class="lines">@@ -326,9 +327,9 @@
</span><span class="cx"> CodeMirror.defineMIME("text/x-cassandra", {
</span><span class="cx"> name: "sql",
</span><span class="cx"> client: { },
</span><del>- keywords: set("use select from using consistency where limit first reversed first and in insert into values using consistency ttl update set delete truncate begin batch apply create keyspace with columnfamily primary key index on drop alter type add any one quorum all local_quorum each_quorum"),
- builtin: set("ascii bigint blob boolean counter decimal double float int text timestamp uuid varchar varint"),
- atoms: set("false true"),
</del><ins>+ keywords: set("add all allow alter and any apply as asc authorize batch begin by clustering columnfamily compact consistency count create custom delete desc distinct drop each_quorum exists filtering from grant if in index insert into key keyspace keyspaces level limit local_one local_quorum modify nan norecursive nosuperuser not of on one order password permission permissions primary quorum rename revoke schema select set storage superuser table three to token truncate ttl two type unlogged update use user users using values where with writetime"),
+ builtin: set("ascii bigint blob boolean counter decimal double float frozen inet int list map static text timestamp timeuuid tuple uuid varchar varint"),
+ atoms: set("false true infinity NaN"),
</ins><span class="cx"> operatorChars: /^[<>=]/,
</span><span class="cx"> dateSQL: { },
</span><span class="cx"> support: set("commentSlashSlash decimallessFloat"),
</span><span class="lines">@@ -366,8 +367,6 @@
</span><span class="cx">
</span><span class="cx"> keywords:
</span><span class="cx"> A list of keywords you want to be highlighted.
</span><del>- functions:
- A list of function names you want to be highlighted.
</del><span class="cx"> builtin:
</span><span class="cx"> A list of builtin types you want to be highlighted (if you want types to be of class "builtin" instead of "keyword").
</span><span class="cx"> operatorChars:
</span><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/sql.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorxmljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/xml.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/xml.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/xml.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
</span><span class="cx"> 'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
</span><span class="cx"> 'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
</span><del>- 'track': true, 'wbr': true},
</del><ins>+ 'track': true, 'wbr': true, 'menuitem': true},
</ins><span class="cx"> implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
</span><span class="cx"> 'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
</span><span class="cx"> 'th': true, 'tr': true},
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> return null;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ inText.isInText = true;
</ins><span class="cx">
</span><span class="cx"> function inTag(stream, state) {
</span><span class="cx"> var ch = stream.next();
</span><span class="cx">Property changes on: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/xml.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.css (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.css 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.css 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> .css-style-text-editor > .CodeMirror pre {
</span><span class="cx"> /* Compensate for the checkboxes so properties line up with readonly styles that do not have checkboxes. */
</span><del>- padding: 1px 5px 1px 25px;
</del><ins>+ padding: 0 5px 0 25px;
</ins><span class="cx"> text-indent: -21px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -441,13 +441,12 @@
</span><span class="cx">
</span><span class="cx"> _handleMouseDown(event)
</span><span class="cx"> {
</span><del>- if (this._codeMirror.options.readOnly || this._codeMirror.state.focused)
</del><ins>+ if (this._codeMirror.options.readOnly)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- var cursor = this._codeMirror.coordsChar({left: event.x, top: event.y});
- var line = this._codeMirror.getLine(cursor.line);
- var trimmedLine = line.trimRight();
-
</del><ins>+ let cursor = this._codeMirror.coordsChar({left: event.x, top: event.y});
+ let line = this._codeMirror.getLine(cursor.line);
+ let trimmedLine = line.trimRight();
</ins><span class="cx"> if (!trimmedLine.trimLeft().length || cursor.ch !== trimmedLine.length)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -459,16 +458,19 @@
</span><span class="cx"> if (this._codeMirror.options.readOnly || !this._mouseDownCursorPosition)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var cursor = this._codeMirror.coordsChar({left: event.x, top: event.y});
- var line = this._codeMirror.getLine(cursor.line);
-
</del><ins>+ let cursor = this._codeMirror.coordsChar({left: event.x, top: event.y});
</ins><span class="cx"> if (this._mouseDownCursorPosition.line === cursor.line && this._mouseDownCursorPosition.ch === cursor.ch) {
</span><del>- var replacement = "\n";
</del><ins>+ let nextLine = this._codeMirror.getLine(cursor.line + 1);
+ if (cursor.line < this._codeMirror.lineCount() - 1 && (!nextLine || !nextLine.trim().length)) {
+ this._codeMirror.setCursor({line: cursor.line + 1, ch: 0});
+ } else {
+ let line = this._codeMirror.getLine(cursor.line);
+ let replacement = "\n";
+ if (!line.trimRight().endsWith(";") && !this._textAtCursorIsComment(this._codeMirror, cursor))
+ replacement = ";" + replacement;
</ins><span class="cx">
</span><del>- if (!line.trimRight().endsWith(";") && !this._textAtCursorIsComment(this._codeMirror, cursor))
- replacement = ";" + replacement;
-
- this._codeMirror.replaceRange(replacement, cursor);
</del><ins>+ this._codeMirror.replaceRange(replacement, cursor);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._mouseDownCursorPosition = null;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCodeMirrorFormattersjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> if (state.state === "prop") // -webkit-transform:rotate(...)translate(...);
</span><span class="cx"> return true;
</span><del>- if (state.state === "media" || state.state === "media_parens") // Space in "not(foo)and" but not at the end of "not(not(foo))"
</del><ins>+ if (state.state === "media" || state.state === "atBlock_parens") // Space in "not(foo)and" but not at the end of "not(not(foo))"
</ins><span class="cx"> return true;
</span><span class="cx"> return false; // color: rgb(...);
</span><span class="cx"> }
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if (/\bkeyword\b/.test(lastToken)) // media-query keywords
</span><del>- return state.state === "media" || state.state === "media_parens";
</del><ins>+ return state.state === "media" || (state.state === "atBlock_parens" && content !== ")");
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsComputedStyleDetailsPanelcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.css (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.css 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.css 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> display: none;
</span><span class="cx"> position: absolute;
</span><span class="cx"> width: 12px;
</span><del>- height: 10px;
</del><ins>+ height: 12px;
</ins><span class="cx"> vertical-align: text-bottom;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsHoverMenucss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/HoverMenu.css (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/HoverMenu.css 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/HoverMenu.css 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> height: 13px;
</span><span class="cx">
</span><span class="cx"> content: -webkit-image-set(url(../Images/HoverMenuButton.png) 1x, url(../Images/HoverMenuButton@2x.png) 2x);
</span><ins>+ transform: translateY(-1px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .hover-menu.visible > img {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.css (188324 => 188325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.css 2015-08-12 04:58:37 UTC (rev 188324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.css 2015-08-12 05:40:27 UTC (rev 188325)
</span><span class="lines">@@ -180,8 +180,7 @@
</span><span class="cx"> width: 16px;
</span><span class="cx"> height: 16px;
</span><span class="cx"> content: -webkit-image-set(url(../Images/ColorIcon.png) 1x, url(../Images/ColorIcon@2x.png) 2x);
</span><del>-
- -webkit-transform: translateY(1px);
</del><ins>+ transform: translateY(0.5px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @media (-webkit-min-device-pixel-ratio: 2) {
</span></span></pre>
</div>
</div>
</body>
</html>