<!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>[208774] 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/208774">208774</a></dd>
<dt>Author</dt> <dd>nvasilyev@apple.com</dd>
<dt>Date</dt> <dd>2016-11-15 17:03:24 -0800 (Tue, 15 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/208248">r208248</a>): Web Inspector: Pressing Left Arrow breaks autocomplete
https://bugs.webkit.org/show_bug.cgi?id=164391
<rdar://problem/29102408>
Reviewed by Matt Baker.
Unroll <a href="http://trac.webkit.org/projects/webkit/changeset/208248">r208248</a>.
* UserInterface/Controllers/CodeMirrorCompletionController.js:
(WebInspector.CodeMirrorCompletionController):
(WebInspector.CodeMirrorCompletionController.prototype.updateCompletions):
(WebInspector.CodeMirrorCompletionController.prototype.isCompletionChange):
(WebInspector.CodeMirrorCompletionController.prototype.hideCompletions):
(WebInspector.CodeMirrorCompletionController.prototype.close):
(WebInspector.CodeMirrorCompletionController.prototype.completionSuggestionsSelectedCompletion):
(WebInspector.CodeMirrorCompletionController.prototype._createCompletionHintMarker):
(WebInspector.CodeMirrorCompletionController.prototype._applyCompletionHint.update):
(WebInspector.CodeMirrorCompletionController.prototype._applyCompletionHint):
(WebInspector.CodeMirrorCompletionController.prototype._commitCompletionHint.update):
(WebInspector.CodeMirrorCompletionController.prototype._commitCompletionHint):
(WebInspector.CodeMirrorCompletionController.prototype._removeLastChangeFromHistory):
(WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint.clearMarker):
(WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint.update):
(WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint):
(WebInspector.CodeMirrorCompletionController.prototype._completeAtCurrentPosition):
(WebInspector.CodeMirrorCompletionController.prototype._generateJavaScriptCompletions):</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 (208773 => 208774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-11-16 01:01:52 UTC (rev 208773)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-11-16 01:03:24 UTC (rev 208774)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-11-15 Nikita Vasilyev <nvasilyev@apple.com>
+
+ REGRESSION (r208248): Web Inspector: Pressing Left Arrow breaks autocomplete
+ https://bugs.webkit.org/show_bug.cgi?id=164391
+ <rdar://problem/29102408>
+
+ Reviewed by Matt Baker.
+
+ Unroll r208248.
+
+ * UserInterface/Controllers/CodeMirrorCompletionController.js:
+ (WebInspector.CodeMirrorCompletionController):
+ (WebInspector.CodeMirrorCompletionController.prototype.updateCompletions):
+ (WebInspector.CodeMirrorCompletionController.prototype.isCompletionChange):
+ (WebInspector.CodeMirrorCompletionController.prototype.hideCompletions):
+ (WebInspector.CodeMirrorCompletionController.prototype.close):
+ (WebInspector.CodeMirrorCompletionController.prototype.completionSuggestionsSelectedCompletion):
+ (WebInspector.CodeMirrorCompletionController.prototype._createCompletionHintMarker):
+ (WebInspector.CodeMirrorCompletionController.prototype._applyCompletionHint.update):
+ (WebInspector.CodeMirrorCompletionController.prototype._applyCompletionHint):
+ (WebInspector.CodeMirrorCompletionController.prototype._commitCompletionHint.update):
+ (WebInspector.CodeMirrorCompletionController.prototype._commitCompletionHint):
+ (WebInspector.CodeMirrorCompletionController.prototype._removeLastChangeFromHistory):
+ (WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint.clearMarker):
+ (WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint.update):
+ (WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint):
+ (WebInspector.CodeMirrorCompletionController.prototype._completeAtCurrentPosition):
+ (WebInspector.CodeMirrorCompletionController.prototype._generateJavaScriptCompletions):
+
</ins><span class="cx"> 2016-11-15 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove unused and untested Page.setTouchEmulationEnabled command
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersCodeMirrorCompletionControllerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js (208773 => 208774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js 2016-11-16 01:01:52 UTC (rev 208773)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js 2016-11-16 01:03:24 UTC (rev 208774)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> "Cmd-Y": this._handleHideKey.bind(this)
</span><span class="cx"> };
</span><span class="cx">
</span><del>- this._handleBeforeChangeListener = this._handleBeforeChange.bind(this);
</del><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="lines">@@ -65,7 +64,6 @@
</span><span class="cx">
</span><span class="cx"> this._codeMirror.addKeyMap(this._keyMap);
</span><span class="cx">
</span><del>- this._codeMirror.on("beforeChange", this._handleBeforeChangeListener);
</del><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">@@ -72,12 +70,6 @@
</span><span class="cx"> this._codeMirror.on("scroll", this._handleHideActionListener);
</span><span class="cx">
</span><span class="cx"> this._updatePromise = null;
</span><del>-
- this._currentCompletion = null;
- this._ignoreChange = false;
- this._ignoreNextCursorActivity = false;
- this._ignoreNextUndo = false;
- this._inCompletionActivity = false;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="lines">@@ -94,10 +86,8 @@
</span><span class="cx">
</span><span class="cx"> updateCompletions(completions, implicitSuffix)
</span><span class="cx"> {
</span><del>- if (isNaN(this._startOffset) || isNaN(this._endOffset) || isNaN(this._lineNumber)) {
- this._inCompletionActivity = false;
</del><ins>+ if (isNaN(this._startOffset) || isNaN(this._endOffset) || isNaN(this._lineNumber))
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> if (!completions || !completions.length) {
</span><span class="cx"> this.hideCompletions();
</span><span class="lines">@@ -143,7 +133,7 @@
</span><span class="cx">
</span><span class="cx"> isCompletionChange(change)
</span><span class="cx"> {
</span><del>- return this._ignoreChange || this._ignoreNextUndo || change.origin === WebInspector.CodeMirrorCompletionController.CompletionOrigin || change.origin === WebInspector.CodeMirrorCompletionController.DeleteCompletionOrigin;
</del><ins>+ return this._ignoreChange || change.origin === WebInspector.CodeMirrorCompletionController.CompletionOrigin || change.origin === WebInspector.CodeMirrorCompletionController.DeleteCompletionOrigin;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> isShowingCompletions()
</span><span class="lines">@@ -170,9 +160,8 @@
</span><span class="cx"> this._implicitSuffix = "";
</span><span class="cx"> this._forced = false;
</span><span class="cx">
</span><del>- this._currentCompletion = null;
- this._ignoreNextCursorActivity = false;
- this._inCompletionActivity = false;
</del><ins>+ delete this._currentCompletion;
+ delete this._ignoreNextCursorActivity;
</ins><span class="cx">
</span><span class="cx"> this._resolveUpdatePromise(WebInspector.CodeMirrorCompletionController.UpdatePromise.NoCompletionsFound);
</span><span class="cx"> }
</span><span class="lines">@@ -181,7 +170,6 @@
</span><span class="cx"> {
</span><span class="cx"> this._codeMirror.removeKeyMap(this._keyMap);
</span><span class="cx">
</span><del>- this._codeMirror.off("beforeChange", this._handleBeforeChangeListener);
</del><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">@@ -203,8 +191,6 @@
</span><span class="cx">
</span><span class="cx"> completionSuggestionsSelectedCompletion(suggestionsView, completionText)
</span><span class="cx"> {
</span><del>- this._ignoreNextUndo = true;
-
</del><span class="cx"> this._applyCompletionHint(completionText);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -259,6 +245,15 @@
</span><span class="cx"> this._notifyCompletionsHiddenIfNeededTimeout = setTimeout(notify.bind(this), WebInspector.CodeMirrorCompletionController.CompletionsHiddenDelay);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _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});
+ }
+
</ins><span class="cx"> _applyCompletionHint(completionText)
</span><span class="cx"> {
</span><span class="cx"> console.assert(completionText);
</span><span class="lines">@@ -267,26 +262,17 @@
</span><span class="cx">
</span><span class="cx"> function update()
</span><span class="cx"> {
</span><del>- if (!this._inCompletionActivity) {
- this._inCompletionActivity = true;
- this._codeMirror.changeGeneration(true);
- }
-
</del><span class="cx"> this._currentCompletion = completionText;
</span><span class="cx">
</span><del>- this._removeCompletionHint(true);
</del><ins>+ this._removeCompletionHint(true, true);
</ins><span class="cx">
</span><del>- let replacementText = this._currentReplacementText;
</del><ins>+ var replacementText = this._currentReplacementText;
</ins><span class="cx">
</span><del>- 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};
</del><ins>+ var from = {line: this._lineNumber, ch: this._startOffset};
+ var cursor = {line: this._lineNumber, ch: this._endOffset};
+ var currentText = this._codeMirror.getRange(from, cursor);
</ins><span class="cx">
</span><del>- 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});
</del><ins>+ this._createCompletionHintMarker(cursor, replacementText.replace(currentText, ""));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._ignoreChange = true;
</span><span class="lines">@@ -294,7 +280,7 @@
</span><span class="cx">
</span><span class="cx"> this._codeMirror.operation(update.bind(this));
</span><span class="cx">
</span><del>- this._ignoreChange = false;
</del><ins>+ delete this._ignoreChange;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _commitCompletionHint()
</span><span class="lines">@@ -301,7 +287,7 @@
</span><span class="cx"> {
</span><span class="cx"> function update()
</span><span class="cx"> {
</span><del>- this._removeCompletionHint(true);
</del><ins>+ this._removeCompletionHint(true, true);
</ins><span class="cx">
</span><span class="cx"> var replacementText = this._currentReplacementText;
</span><span class="cx">
</span><span class="lines">@@ -316,6 +302,8 @@
</span><span class="cx">
</span><span class="cx"> this._codeMirror.replaceRange(replacementText, from, cursor, WebInspector.CodeMirrorCompletionController.CompletionOrigin);
</span><span class="cx">
</span><ins>+ // Don't call _removeLastChangeFromHistory here to allow the committed completion to be undone.
+
</ins><span class="cx"> this._codeMirror.setCursor(to);
</span><span class="cx">
</span><span class="cx"> this.hideCompletions();
</span><span class="lines">@@ -326,35 +314,71 @@
</span><span class="cx">
</span><span class="cx"> this._codeMirror.operation(update.bind(this));
</span><span class="cx">
</span><del>- this._ignoreChange = false;
</del><ins>+ delete this._ignoreChange;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- _removeCompletionHint(nonatomic)
</del><ins>+ _removeLastChangeFromHistory()
</ins><span class="cx"> {
</span><ins>+ var history = this._codeMirror.getHistory();
+
+ // We don't expect a undone history. But if there is one clear it. If could lead to undefined behavior.
+ console.assert(!history.undone.length);
+ history.undone = [];
+
+ // Pop the last item from the done history.
+ console.assert(history.done.length);
+ history.done.pop();
+
+ this._codeMirror.setHistory(history);
+ }
+
+ _removeCompletionHint(nonatomic, dontRestorePrefix)
+ {
</ins><span class="cx"> if (!this._completionHintMarker)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._notifyCompletionsHiddenSoon();
</span><span class="cx">
</span><del>- function update()
</del><ins>+ function clearMarker(marker)
</ins><span class="cx"> {
</span><del>- this._codeMirror.undo();
</del><ins>+ if (!marker)
+ return;
</ins><span class="cx">
</span><del>- let range = this._completionHintMarker.find();
</del><ins>+ var range = marker.find();
</ins><span class="cx"> if (range)
</span><del>- this._completionHintMarker.clear();
</del><ins>+ marker.clear();
</ins><span class="cx">
</span><del>- this._completionHintMarker = null;
</del><ins>+ return null;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- this._ignoreChange = true;
</del><ins>+ function update()
+ {
+ this._completionHintMarker = clearMarker(this._completionHintMarker);
</ins><span class="cx">
</span><del>- if (nonatomic)
</del><ins>+ if (dontRestorePrefix)
+ return;
+
+ console.assert(!isNaN(this._startOffset));
+ console.assert(!isNaN(this._endOffset));
+ console.assert(!isNaN(this._lineNumber));
+
+ var from = {line: this._lineNumber, ch: this._startOffset};
+ var to = {line: this._lineNumber, ch: this._endOffset};
+
+ this._codeMirror.replaceRange(this._prefix, from, to, WebInspector.CodeMirrorCompletionController.DeleteCompletionOrigin);
+ this._removeLastChangeFromHistory();
+ }
+
+ if (nonatomic) {
</ins><span class="cx"> update.call(this);
</span><del>- else
- this._codeMirror.operation(update.bind(this));
</del><ins>+ return;
+ }
</ins><span class="cx">
</span><del>- this._ignoreChange = false;
</del><ins>+ this._ignoreChange = true;
+
+ this._codeMirror.operation(update.bind(this));
+
+ delete this._ignoreChange;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _scanStringForExpression(modeName, string, startOffset, direction, allowMiddleAndEmpty, includeStopCharacter, ignoreInitialUnmatchedOpenBracket, stopCharactersRegex)
</span><span class="lines">@@ -438,7 +462,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- this._removeCompletionHint(true);
</del><ins>+ this._removeCompletionHint(true, true);
</ins><span class="cx">
</span><span class="cx"> var cursor = this._codeMirror.getCursor();
</span><span class="cx"> var token = this._codeMirror.getTokenAt(cursor);
</span><span class="lines">@@ -783,17 +807,6 @@
</span><span class="cx"> this._applyCompletionHint(this._currentCompletion);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _handleBeforeChange(codeMirror, change)
- {
- if (this.isCompletionChange(change))
- return;
-
- this._ignoreNextCursorActivity = true;
-
- if (this.isShowingCompletions())
- this.hideCompletions();
- }
-
</del><span class="cx"> _handleChange(codeMirror, change)
</span><span class="cx"> {
</span><span class="cx"> if (this.isCompletionChange(change))
</span><span class="lines">@@ -801,11 +814,6 @@
</span><span class="cx">
</span><span class="cx"> this._ignoreNextCursorActivity = true;
</span><span class="cx">
</span><del>- if (this._ignoreNextUndo && change.origin === "undo") {
- this._ignoreNextUndo = false;
- return;
- }
-
</del><span class="cx"> if (!change.origin || change.origin.charAt(0) !== "+") {
</span><span class="cx"> this.hideCompletions();
</span><span class="cx"> return;
</span><span class="lines">@@ -824,7 +832,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (this._ignoreNextCursorActivity) {
</span><del>- this._ignoreNextCursorActivity = false;
</del><ins>+ delete this._ignoreNextCursorActivity;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>