<!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>[207481] 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/207481">207481</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-18 13:21:02 -0700 (Tue, 18 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: CSS Autocompletion sometimes adds extra unexpected characters
https://bugs.webkit.org/show_bug.cgi?id=163612
<rdar://problem/28829557>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-10-18
Reviewed by Timothy Hatcher.
* UserInterface/Controllers/CodeMirrorCompletionController.js:
(WebInspector.CodeMirrorCompletionController.prototype._generateCSSCompletions):
Better handle completions in cases where we are in the middle of a property
to avoid orphaned characters, or at the end of a function name to avoid creating
duplicate parenthesis.</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 (207480 => 207481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-10-18 20:17:10 UTC (rev 207480)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-10-18 20:21:02 UTC (rev 207481)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-10-18 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: CSS Autocompletion sometimes adds extra unexpected characters
+ https://bugs.webkit.org/show_bug.cgi?id=163612
+ <rdar://problem/28829557>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Controllers/CodeMirrorCompletionController.js:
+ (WebInspector.CodeMirrorCompletionController.prototype._generateCSSCompletions):
+ Better handle completions in cases where we are in the middle of a property
+ to avoid orphaned characters, or at the end of a function name to avoid creating
+ duplicate parenthesis.
+
+2016-10-18 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> REGRESSION(r201171): Web Inspector: Timeline Recording playhead should always start immediately, not wait until first event
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163583
</span><span class="cx"> <rdar://problem/28815882>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersCodeMirrorCompletionControllerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js (207480 => 207481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js 2016-10-18 20:17:10 UTC (rev 207480)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js 2016-10-18 20:21:02 UTC (rev 207481)
</span><span class="lines">@@ -537,6 +537,10 @@
</span><span class="cx"> if (mainToken.state.state === "media" || mainToken.state.state === "top" || mainToken.state.state === "parens")
</span><span class="cx"> return [];
</span><span class="cx">
</span><ins>+ // Don't complete in the middle of a property name.
+ if (/^[a-z]/i.test(suffix))
+ return [];
+
</ins><span class="cx"> var token = mainToken;
</span><span class="cx"> var lineNumber = this._lineNumber;
</span><span class="cx">
</span><span class="lines">@@ -561,14 +565,24 @@
</span><span class="cx"> var propertyName = token.string;
</span><span class="cx">
</span><span class="cx"> // If there is a suffix and it isn't a semicolon, then we should use a space since
</span><del>- // the user is editing in the middle.
- this._implicitSuffix = suffix && suffix !== ";" ? " " : (this._noEndingSemicolon ? "" : ";");
</del><ins>+ // the user is editing in the middle. Likewise if the suffix starts with an open
+ // paren we are changing a function name so don't add a suffix.
+ this._implicitSuffix = " ";
+ if (suffix === ";")
+ this._implicitSuffix = this._noEndingSemicolon ? "" : ";";
+ else if (suffix.startsWith("("))
+ this._implicitSuffix = "";
</ins><span class="cx">
</span><span class="cx"> // Don't use an implicit suffix if it would be the same as the existing suffix.
</span><span class="cx"> if (this._implicitSuffix === suffix)
</span><span class="cx"> this._implicitSuffix = "";
</span><span class="cx">
</span><del>- return WebInspector.CSSKeywordCompletions.forProperty(propertyName).startsWith(this._prefix);
</del><ins>+ let completions = WebInspector.CSSKeywordCompletions.forProperty(propertyName).startsWith(this._prefix);
+
+ if (suffix.startsWith("("))
+ completions = completions.map((x) => x.replace(/\(\)$/, ""));
+
+ return completions;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._implicitSuffix = suffix !== ":" ? ": " : "";
</span></span></pre>
</div>
</div>
</body>
</html>