<!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>[193194] branches/safari-601-branch/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/193194">193194</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:56:23 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/189190">r189190</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceControllersCodeMirrorTokenTrackingControllerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCodeMirrorAdditionsjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193193 => 193194)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:56:17 UTC (rev 193193)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:56:23 UTC (rev 193194)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r189190. rdar://problem/23221163
+
+ 2015-08-31 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Debugger Popovers should work for object literal shorthand variables
+ https://bugs.webkit.org/show_bug.cgi?id=148603
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Controllers/CodeMirrorTokenTrackingController.js:
+ (WebInspector.CodeMirrorTokenTrackingController.prototype._processJavaScriptExpression):
+ Allow debugger popovers for object property shorthands, because they
+ are actually variables that have values. Previously we ignored property
+ name literals, because they were just property names until ES6.
+
+ * UserInterface/Views/CodeMirrorAdditions.js:
+ Add a helper for walking through token types from a start position. It may be useful elsewhere.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r189189. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-31 Matt Baker <mattbaker@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceControllersCodeMirrorTokenTrackingControllerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js (193193 => 193194)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js 2015-12-03 18:56:17 UTC (rev 193193)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js 2015-12-03 18:56:23 UTC (rev 193194)
</span><span class="lines">@@ -452,11 +452,27 @@
</span><span class="cx"> if (!isProperty && !isKeyword && type.indexOf("variable") === -1 && type.indexOf("def") === -1)
</span><span class="cx"> return null;
</span><span class="cx">
</span><del>- // Not object literal properties.
</del><ins>+ // Not object literal property names, but yes if an object literal shorthand property, which is a variable.
</ins><span class="cx"> var state = this._hoveredTokenInfo.innerMode.state;
</span><del>- if (isProperty && state.lexical && state.lexical.type === "}")
- return null;
</del><ins>+ if (isProperty && state.lexical && state.lexical.type === "}") {
+ // Peek ahead to see if the next token is "}" or ",". If it is, we are a shorthand and therefore a variable.
+ var shorthand = false;
+ var mode = this._hoveredTokenInfo.innerMode.mode;
+ var position = {line: this._hoveredTokenInfo.position.line, ch: this._hoveredTokenInfo.token.end};
+ WebInspector.walkTokens(this._codeMirror, mode, position, function(tokenType, string) {
+ if (tokenType)
+ return false;
+ if (string === "," || string === "}") {
+ shorthand = true;
+ return false;
+ }
+ return true;
+ });
</ins><span class="cx">
</span><ins>+ if (!shorthand)
+ return null;
+ }
+
</ins><span class="cx"> // Only the "this" keyword.
</span><span class="cx"> if (isKeyword && this._hoveredTokenInfo.token.string !== "this")
</span><span class="cx"> return null;
</span><span class="lines">@@ -465,7 +481,7 @@
</span><span class="cx"> var expression = this._hoveredTokenInfo.token.string;
</span><span class="cx"> var expressionStartPosition = {line: this._hoveredTokenInfo.position.line, ch: this._hoveredTokenInfo.token.start};
</span><span class="cx"> while (true) {
</span><del>- var token = this._codeMirror.getTokenAt(expressionStartPosition);
</del><ins>+ var token = this._codeMirror.getTokenAt(expressionStartPosition);
</ins><span class="cx"> if (!token)
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCodeMirrorAdditionsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js (193193 => 193194)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js 2015-12-03 18:56:17 UTC (rev 193193)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js 2015-12-03 18:56:23 UTC (rev 193194)
</span><span class="lines">@@ -552,3 +552,30 @@
</span><span class="cx"> var bColumn = "ch" in b ? b.ch : Number.MAX_VALUE;
</span><span class="cx"> return aColumn - bColumn;
</span><span class="cx"> };
</span><ins>+
+WebInspector.walkTokens = function(cm, mode, initialPosition, callback)
+{
+ var state = CodeMirror.copyState(mode, cm.getTokenAt(initialPosition).state);
+ var lineCount = cm.lineCount();
+
+ var abort = false;
+ for (lineNumber = initialPosition.line; !abort && lineNumber < lineCount; ++lineNumber) {
+ var line = cm.getLine(lineNumber);
+ var stream = new CodeMirror.StringStream(line);
+ if (lineNumber === initialPosition.line)
+ stream.start = stream.pos = initialPosition.ch;
+
+ while (!stream.eol()) {
+ var innerMode = CodeMirror.innerMode(mode, state);
+ var tokenType = mode.token(stream, state);
+ if (!callback(tokenType, stream.current())) {
+ abort = true;
+ break;
+ }
+ stream.start = stream.pos;
+ }
+ }
+
+ if (!abort)
+ callback(null);
+}
</ins></span></pre>
</div>
</div>
</body>
</html>