Changeset 269201 in webkit

Timestamp:

Oct 30, 2020 11:06:27 AM (21 months ago)

Author:

Nikita Vasilyev

Message:

Web Inspector: Extra closing parenthesis added after var in styles panel
​https://bugs.webkit.org/show_bug.cgi?id=218295
<rdar://problem/70771314>

Reviewed by Devin Rousso.

• UserInterface/Views/SpreadsheetStyleProperty.js:

(WI.SpreadsheetStyleProperty.prototype._addVariableTokens):
Remove contents.push(token) which was adding ). The closing parenthesis that was already
included in rawTokens above.
Drive-by: rawTokens.slice() should never include i as the 2nd argument. i is an index of an item
in the tokens - a different array.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/SpreadsheetStyleProperty.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2020-10-30  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        Web Inspector: Extra closing parenthesis added after var in styles panel
+        https://bugs.webkit.org/show_bug.cgi?id=218295
+        <rdar://problem/70771314>
+
+        Reviewed by Devin Rousso.
+
+        * UserInterface/Views/SpreadsheetStyleProperty.js:
+        (WI.SpreadsheetStyleProperty.prototype._addVariableTokens):
+        Remove `contents.push(token)` which was adding `)`. The closing parenthesis that was already
+        included in rawTokens above.
+        Drive-by: rawTokens.slice() should never include `i` as the 2nd argument. `i` is an index of an item
+        in the `tokens` - a different array.
+
 2020-10-29  Federico Bucchi  <fbucchi@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/SpreadsheetStyleProperty.js

@@ -815 +815 @@
                         contents.pushAll(rawTokens.slice(variableNameIndex + 1, fallbackStartIndex));
 
-                        let fallbackTokens = rawTokens.slice(fallbackStartIndex, i);
+                        let fallbackTokens = rawTokens.slice(fallbackStartIndex);
                         fallbackTokens = this._addBoxShadowTokens(fallbackTokens);
                         fallbackTokens = this._addGradientTokens(fallbackTokens);
@@ -824 +824 @@
                         contents.pushAll(fallbackTokens);
                     } else
-                        contents.pushAll(rawTokens.slice(variableNameIndex + 1, i));
-                    contents.push(token);
+                        contents.pushAll(rawTokens.slice(variableNameIndex + 1));
 
                     let text = rawTokens.reduce((accumulator, token) => accumulator + token.value, "");