<!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>[191419] 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/191419">191419</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-21 17:31:23 -0700 (Wed, 21 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Autocompletion previews in the CSS sidebar do not apply
https://bugs.webkit.org/show_bug.cgi?id=147720
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2015-10-21
Reviewed by Timothy Hatcher.
When autocompletion hints are added to styles or the console, the history
object used by CodeMirror was edited to remove the last entry. Instead of
using this method (which caused glitchy behaviour when undo-ing), call
CodeMirror.undo() and adjust accordingly. In addition, a marker was being
used as the completion hint instead of applying text, whereas these
changes use actual text, ensuring that completions are previewed in the page.
* UserInterface/Controllers/CodeMirrorCompletionController.js:
(WebInspector.CodeMirrorCompletionController):
(WebInspector.CodeMirrorCompletionController.prototype.close):
(WebInspector.CodeMirrorCompletionController.prototype._applyCompletionHint.update):
(WebInspector.CodeMirrorCompletionController.prototype._commitCompletionHint.update):
(WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint.update):
(WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint):
(WebInspector.CodeMirrorCompletionController.prototype._handleBeforeChange):
(WebInspector.CodeMirrorCompletionController.prototype._createCompletionHintMarker): Deleted.
(WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint.clearMarker): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersCodeMirrorCompletionControllerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (191418 => 191419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-10-22 00:29:51 UTC (rev 191418)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-10-22 00:31:23 UTC (rev 191419)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2015-10-21 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Autocompletion previews in the CSS sidebar do not apply
+ https://bugs.webkit.org/show_bug.cgi?id=147720
+
+ Reviewed by Timothy Hatcher.
+
+ When autocompletion hints are added to styles or the console, the history
+ object used by CodeMirror was edited to remove the last entry. Instead of
+ using this method (which caused glitchy behaviour when undo-ing), call
+ CodeMirror.undo() and adjust accordingly. In addition, a marker was being
+ used as the completion hint instead of applying text, whereas these
+ changes use actual text, ensuring that completions are previewed in the page.
+
+ * UserInterface/Controllers/CodeMirrorCompletionController.js:
+ (WebInspector.CodeMirrorCompletionController):
+ (WebInspector.CodeMirrorCompletionController.prototype.close):
+ (WebInspector.CodeMirrorCompletionController.prototype._applyCompletionHint.update):
+ (WebInspector.CodeMirrorCompletionController.prototype._commitCompletionHint.update):
+ (WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint.update):
+ (WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint):
+ (WebInspector.CodeMirrorCompletionController.prototype._handleBeforeChange):
+ (WebInspector.CodeMirrorCompletionController.prototype._createCompletionHintMarker): Deleted.
+ (WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint.clearMarker): Deleted.
+
+2015-10-21 Devin Rousso <dcrousso+webkit@gmail.com>
+
</ins><span class="cx"> Web Inspector: Add forgotten WebInspector.UIString from r190521
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150425
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersCodeMirrorCompletionControllerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js (191418 => 191419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js 2015-10-22 00:29:51 UTC (rev 191418)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js 2015-10-22 00:31:23 UTC (rev 191419)
</span><span class="lines">@@ -59,12 +59,14 @@
</span><span class="cx"> "Cmd-Y": this._handleHideKey.bind(this)
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ this._handleBeforeChangeListener = this._handleBeforeChange.bind(this);
</ins><span class="cx"> this._handleChangeListener = this._handleChange.bind(this);
</span><span class="cx"> this._handleCursorActivityListener = this._handleCursorActivity.bind(this);
</span><span class="cx"> this._handleHideActionListener = this._handleHideAction.bind(this);
</span><span class="cx">
</span><span class="cx"> this._codeMirror.addKeyMap(this._keyMap);
</span><span class="cx">
</span><ins>+ this._codeMirror.on("beforeChange", this._handleBeforeChangeListener);
</ins><span class="cx"> this._codeMirror.on("change", this._handleChangeListener);
</span><span class="cx"> this._codeMirror.on("cursorActivity", this._handleCursorActivityListener);
</span><span class="cx"> this._codeMirror.on("blur", this._handleHideActionListener);
</span><span class="lines">@@ -171,6 +173,7 @@
</span><span class="cx"> {
</span><span class="cx"> this._codeMirror.removeKeyMap(this._keyMap);
</span><span class="cx">
</span><ins>+ this._codeMirror.off("beforeChange", this._handleBeforeChangeListener);
</ins><span class="cx"> this._codeMirror.off("change", this._handleChangeListener);
</span><span class="cx"> this._codeMirror.off("cursorActivity", this._handleCursorActivityListener);
</span><span class="cx"> this._codeMirror.off("blur", this._handleHideActionListener);
</span><span class="lines">@@ -246,15 +249,6 @@
</span><span class="cx"> this._notifyCompletionsHiddenIfNeededTimeout = setTimeout(notify.bind(this), WebInspector.CodeMirrorCompletionController.CompletionsHiddenDelay);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _createCompletionHintMarker(position, text)
- {
- var container = document.createElement("span");
- container.classList.add(WebInspector.CodeMirrorCompletionController.CompletionHintStyleClassName);
- container.textContent = text;
-
- this._completionHintMarker = this._codeMirror.setUniqueBookmark(position, {widget: container, insertLeft: true});
- }
-
</del><span class="cx"> _applyCompletionHint(completionText)
</span><span class="cx"> {
</span><span class="cx"> console.assert(completionText);
</span><span class="lines">@@ -267,13 +261,17 @@
</span><span class="cx">
</span><span class="cx"> this._removeCompletionHint(true, true);
</span><span class="cx">
</span><del>- var replacementText = this._currentReplacementText;
</del><ins>+ let replacementText = this._currentReplacementText;
</ins><span class="cx">
</span><del>- var from = {line: this._lineNumber, ch: this._startOffset};
- var cursor = {line: this._lineNumber, ch: this._endOffset};
- var currentText = this._codeMirror.getRange(from, cursor);
</del><ins>+ let from = {line: this._lineNumber, ch: this._startOffset};
+ let cursor = {line: this._lineNumber, ch: this._endOffset};
+ let to = {line: this._lineNumber, ch: this._startOffset + replacementText.length};
</ins><span class="cx">
</span><del>- this._createCompletionHintMarker(cursor, replacementText.replace(currentText, ""));
</del><ins>+ this._codeMirror.replaceRange(replacementText, from, cursor, WebInspector.CodeMirrorCompletionController.CompletionOrigin);
+
+ this._codeMirror.setCursor(cursor);
+ if (cursor.ch !== to.ch)
+ this._completionHintMarker = this._codeMirror.markText(cursor, to, {className: WebInspector.CodeMirrorCompletionController.CompletionHintStyleClassName});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._ignoreChange = true;
</span><span class="lines">@@ -303,8 +301,6 @@
</span><span class="cx">
</span><span class="cx"> this._codeMirror.replaceRange(replacementText, from, cursor, WebInspector.CodeMirrorCompletionController.CompletionOrigin);
</span><span class="cx">
</span><del>- // Don't call _removeLastChangeFromHistory here to allow the committed completion to be undone.
-
</del><span class="cx"> this._codeMirror.setCursor(to);
</span><span class="cx">
</span><span class="cx"> this.hideCompletions();
</span><span class="lines">@@ -340,22 +336,16 @@
</span><span class="cx">
</span><span class="cx"> this._notifyCompletionsHiddenSoon();
</span><span class="cx">
</span><del>- function clearMarker(marker)
</del><ins>+ function update()
</ins><span class="cx"> {
</span><del>- if (!marker)
- return;
</del><ins>+ this._codeMirror.undo();
</ins><span class="cx">
</span><del>- var range = marker.find();
</del><ins>+ let range = this._completionHintMarker.find();
</ins><span class="cx"> if (range)
</span><del>- marker.clear();
</del><ins>+ this._completionHintMarker.clear();
</ins><span class="cx">
</span><del>- return null;
- }
</del><ins>+ this._completionHintMarker = null;
</ins><span class="cx">
</span><del>- function update()
- {
- this._completionHintMarker = clearMarker(this._completionHintMarker);
-
</del><span class="cx"> if (dontRestorePrefix)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -363,8 +353,8 @@
</span><span class="cx"> console.assert(!isNaN(this._endOffset));
</span><span class="cx"> console.assert(!isNaN(this._lineNumber));
</span><span class="cx">
</span><del>- var from = {line: this._lineNumber, ch: this._startOffset};
- var to = {line: this._lineNumber, ch: this._endOffset};
</del><ins>+ let from = {line: this._lineNumber, ch: this._startOffset};
+ let to = {line: this._lineNumber, ch: this._endOffset};
</ins><span class="cx">
</span><span class="cx"> this._codeMirror.replaceRange(this._prefix, from, to, WebInspector.CodeMirrorCompletionController.DeleteCompletionOrigin);
</span><span class="cx"> this._removeLastChangeFromHistory();
</span><span class="lines">@@ -800,6 +790,17 @@
</span><span class="cx"> this._applyCompletionHint(this._currentCompletion);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _handleBeforeChange(codeMirror, change)
+ {
+ if (this.isCompletionChange(change))
+ return;
+
+ this._ignoreNextCursorActivity = true;
+
+ if (this.isShowingCompletions())
+ this.hideCompletions();
+ }
+
</ins><span class="cx"> _handleChange(codeMirror, change)
</span><span class="cx"> {
</span><span class="cx"> if (this.isCompletionChange(change))
</span></span></pre>
</div>
</div>
</body>
</html>