<!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>[193100] 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/193100">193100</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:46:48 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188427">r188427</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.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 (193099 => 193100)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:46:44 UTC (rev 193099)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:46:48 UTC (rev 193100)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188427. rdar://problem/23221163
+
+ 2015-08-13 Devin Rousso <drousso@apple.com>
+
+ REGRESSION (r184000): Web Inspector: Stripped whitespace after editing CSS in Styles sidebar
+ https://bugs.webkit.org/show_bug.cgi?id=145679
+
+ Reviewed by Timothy Hatcher.
+
+ The formatter will now calculate the number of beginning spaces before the first line in a rule
+ and duplicate them in front of every other line. If there is no new line at the beginning or are
+ no spaces, assume 4 spaces and a new line for each property.
+ Also cleaned up the code for _resetContent a bit.
+
+ * UserInterface/Views/CSSStyleDeclarationTextEditor.js:
+ (WebInspector.CSSStyleDeclarationTextEditor):
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._resetContent.update.set get this):
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._resetContent.update.get this):
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._resetContent.update):
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._resetContent):
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188408. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-13 Matt Baker <mattbaker@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js (193099 => 193100)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-12-03 18:46:44 UTC (rev 193099)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-12-03 18:46:48 UTC (rev 193100)
</span><span class="lines">@@ -43,8 +43,8 @@
</span><span class="cx"> this._filterResultPropertyNames = null;
</span><span class="cx"> this._sortProperties = false;
</span><span class="cx">
</span><del>- this._prefixWhitespace = "";
- this._suffixWhitespace = "";
</del><ins>+ this._prefixWhitespace = "\n";
+ this._suffixWhitespace = "\n";
</ins><span class="cx"> this._linePrefixWhitespace = "";
</span><span class="cx">
</span><span class="cx"> this._delegate = delegate || null;
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> lineWrapping: true,
</span><span class="cx"> mode: "css-rule",
</span><span class="cx"> electricChars: false,
</span><del>- indentWithTabs: true,
</del><ins>+ indentWithTabs: false,
</ins><span class="cx"> indentUnit: 4,
</span><span class="cx"> smartIndent: false,
</span><span class="cx"> matchBrackets: true,
</span><span class="lines">@@ -1606,7 +1606,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (this._commitChangesTimeout) {
</span><span class="cx"> clearTimeout(this._commitChangesTimeout);
</span><del>- delete this._commitChangesTimeout;
</del><ins>+ this._commitChangesTimeout = null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._removeEditingLineClasses();
</span><span class="lines">@@ -1627,28 +1627,24 @@
</span><span class="cx"> this._ignoreCodeMirrorContentDidChangeEvent = true;
</span><span class="cx">
</span><span class="cx"> this._clearTextMarkers(false, true);
</span><del>-
</del><span class="cx"> this._codeMirror.setValue("");
</span><span class="cx"> this._codeMirror.clearHistory();
</span><span class="cx"> this._codeMirror.markClean();
</span><span class="cx">
</span><del>- delete this._ignoreCodeMirrorContentDidChangeEvent;
-
</del><ins>+ this._ignoreCodeMirrorContentDidChangeEvent = false;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function update()
</span><span class="cx"> {
</span><span class="cx"> // Remember the cursor position/selection.
</span><del>- var selectionAnchor = this._codeMirror.getCursor("anchor");
- var selectionHead = this._codeMirror.getCursor("head");
</del><span class="cx"> var isEditorReadOnly = this._codeMirror.getOption("readOnly");
</span><del>- var styleText = this._style.text.trim();
- var findWhitespace = /\s+/g;
</del><ins>+ var styleText = this._style.text;
+ var trimmedStyleText = styleText.trim();
</ins><span class="cx">
</span><span class="cx"> // We only need to format non-empty styles, but prepare checkbox placeholders
</span><span class="cx"> // in any case because that will indent the cursor when the User starts typing.
</span><del>- if (!styleText && !isEditorReadOnly) {
</del><ins>+ if (!trimmedStyleText && !isEditorReadOnly) {
</ins><span class="cx"> this._markLinesWithCheckboxPlaceholder();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1668,8 +1664,25 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ var selectionAnchor = this._codeMirror.getCursor("anchor");
+ var selectionHead = this._codeMirror.getCursor("head");
+ var whitespaceRegex = /\s+/g;
+
+ // FIXME: <rdar://problem/10593948> Provide a way to change the tab width in the Web Inspector
+ this._linePrefixWhitespace = " ";
+ var styleTextPrefixWhitespace = styleText.match(/^\s*/);
+
+ // If there is a match and the style text contains a newline, attempt to pull out the prefix whitespace
+ // in front of the first line of CSS to use for every line. If there is no newline, we want to avoid
+ // adding multiple spaces to a single line CSS rule and instead format it on multiple lines.
+ if (styleTextPrefixWhitespace && trimmedStyleText.includes("\n")) {
+ var linePrefixWhitespaceMatch = styleTextPrefixWhitespace[0].match(/[^\S\n]+$/);
+ if (linePrefixWhitespaceMatch)
+ this._linePrefixWhitespace = linePrefixWhitespaceMatch[0];
+ }
+
</ins><span class="cx"> // Set non-optimized, valid and invalid styles in preparation for the Formatter.
</span><del>- this._codeMirror.setValue(styleText);
</del><ins>+ this._codeMirror.setValue(trimmedStyleText);
</ins><span class="cx">
</span><span class="cx"> // Now the Formatter pretty prints the styles.
</span><span class="cx"> this._codeMirror.setValue(this._formattedContentFromEditor());
</span><span class="lines">@@ -1682,7 +1695,7 @@
</span><span class="cx"> this._iterateOverProperties(false, function(cssProperty) {
</span><span class="cx"> cssProperty.__refreshedAfterBlur = false;
</span><span class="cx">
</span><del>- var propertyTextSansWhitespace = cssProperty.text.replace(findWhitespace, "");
</del><ins>+ var propertyTextSansWhitespace = cssProperty.text.replace(whitespaceRegex, "");
</ins><span class="cx"> var existingProperties = cssPropertiesMap.get(propertyTextSansWhitespace) || [];
</span><span class="cx"> existingProperties.push(cssProperty);
</span><span class="cx">
</span><span class="lines">@@ -1693,24 +1706,21 @@
</span><span class="cx"> // CSSProperty instance for that property exists. If not, then don't create a TextMarker.
</span><span class="cx"> this._codeMirror.eachLine(function(lineHandler) {
</span><span class="cx"> var lineNumber = lineHandler.lineNo();
</span><del>- var lineContentSansWhitespace = lineHandler.text.replace(findWhitespace, "");
</del><ins>+ var lineContentSansWhitespace = lineHandler.text.replace(whitespaceRegex, "");
</ins><span class="cx"> var properties = cssPropertiesMap.get(lineContentSansWhitespace);
</span><del>-
</del><span class="cx"> if (!properties) {
</span><span class="cx"> this._createCommentedCheckboxMarker(lineHandler);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (var property of properties) {
</del><ins>+ for (let property of properties) {
</ins><span class="cx"> if (property.__refreshedAfterBlur)
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> var from = {line: lineNumber, ch: 0};
</span><span class="cx"> var to = {line: lineNumber};
</span><del>-
</del><span class="cx"> this._createTextMarkerForPropertyIfNeeded(from, to, property);
</span><span class="cx"> property.__refreshedAfterBlur = true;
</span><del>-
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }.bind(this));
</span><span class="lines">@@ -1737,7 +1747,7 @@
</span><span class="cx">
</span><span class="cx"> this._ignoreCodeMirrorContentDidChangeEvent = true;
</span><span class="cx"> this._codeMirror.operation(update.bind(this));
</span><del>- delete this._ignoreCodeMirrorContentDidChangeEvent;
</del><ins>+ this._ignoreCodeMirrorContentDidChangeEvent = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _updateJumpToSymbolTrackingMode()
</span></span></pre>
</div>
</div>
</body>
</html>