Attachment 361363 Details for Bug 182523 – Patch

[patch] Patch

patch.txt (text/plain), 7.51 KB, created by Nikita Vasilyev on 2019-02-06 19:03:26 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Nikita Vasilyev

Created: 2019-02-06 19:03:26 PST

Size: 7.51 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 395610b7ad6..6814a7a5598 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-02-06  Nikita Vasilyev  <nvasilyev@apple.com>
>+
>+        Web Inspector: Styles: close unbalanced quotes and parenthesis when editing values
>+        https://bugs.webkit.org/show_bug.cgi?id=182523
>+        <rdar://problem/37260209>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test common cases of unmatched quotes, parenthesis, comments, and trailing backslashes.
>+
>+        * inspector/unit-tests/css-completion-expected.txt: Added.
>+        * inspector/unit-tests/css-completion.html: Added.
>+
> 2019-02-01  Antoine Quint  <graouts@apple.com>
> 
>         Dispatch pointercancel events when content is panned or zoomed on iOS
>diff --git a/LayoutTests/inspector/unit-tests/css-completion-expected.txt b/LayoutTests/inspector/unit-tests/css-completion-expected.txt
>new file mode 100644
>index 00000000000..0c5b3bc265e
>--- /dev/null
>+++ b/LayoutTests/inspector/unit-tests/css-completion-expected.txt
>@@ -0,0 +1,35 @@
>+Testing CSS completion.
>+
>+
>+== Running test suite: CSSCompletion
>+-- Running test case: fixUnbalancedCharacters
>+url(|)
>+url()|
>+rgb(1|)
>+rgb(1,2,3)|
>+calc(var(--foo|))
>+'|'
>+''|
>+'foo|'
>+'foo'|
>+"|"
>+""|
>+"bar|"
>+"bar"|
>+/*|*/
>+/**/|
>+/* "foo */|
>+/* 'foo */|
>+/* (foo */|
>+('foo"|')
>+('foo")|')
>+("bar"')|')
>+("bar")|
>+\|\
>+\\|
>+\\\|\
>+"\"|"
>+'\'|'
>+(\)|)
>+/*\*/|*/
>+
>diff --git a/LayoutTests/inspector/unit-tests/css-completion.html b/LayoutTests/inspector/unit-tests/css-completion.html
>new file mode 100644
>index 00000000000..00d6b785f67
>--- /dev/null
>+++ b/LayoutTests/inspector/unit-tests/css-completion.html
>@@ -0,0 +1,65 @@
>+<!doctype html>
>+<html>
>+<head>
>+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
>+<script>
>+function test()
>+{
>+    let suite = InspectorTest.createSyncSuite("CSSCompletion");
>+
>+    suite.addTestCase({
>+        name: "fixUnbalancedCharacters",
>+        test() {
>+            function log(cssValue) {
>+                let suffix = WI.CSSCompletions.fixUnbalancedCharacters(cssValue);
>+                InspectorTest.log(cssValue + "|" + suffix);
>+            }
>+
>+            log(`url(`);
>+            log(`url()`);
>+            log(`rgb(1`);
>+            log(`rgb(1,2,3)`);
>+            log(`calc(var(--foo`);
>+
>+            log(`'`);
>+            log(`''`);
>+            log(`'foo`);
>+            log(`'foo'`);
>+
>+            log(`"`);
>+            log(`""`);
>+            log(`"bar`);
>+            log(`"bar"`);
>+
>+            log(`/*`);
>+            log(`/**/`);
>+            log(`/* "foo */`);
>+            log(`/* 'foo */`);
>+            log(`/* (foo */`);
>+
>+            log(`('foo"`);
>+            log(`('foo")`);
>+            log(`("bar"')`);
>+            log(`("bar")`);
>+
>+            log(`\\`);
>+            log(`\\\\`);
>+            log(`\\\\\\`);
>+
>+            log(`"\\"`);
>+            log(`'\\'`);
>+            log(`(\\)`);
>+            log(`/*\\*/`);
>+
>+            return true;
>+        }
>+    });
>+
>+    suite.runTestCasesAndFinish();
>+}
>+</script>
>+</head>
>+<body onload="runTest()">
>+    <p>Testing CSS completion.</p>
>+</body>
>+</html>
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 08a49fed285..07a604aab82 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-02-06  Nikita Vasilyev  <nvasilyev@apple.com>
>+
>+        Web Inspector: Styles: close unbalanced quotes and parenthesis when editing values
>+        https://bugs.webkit.org/show_bug.cgi?id=182523
>+        <rdar://problem/37260209>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Close CSS comments, append missing closed quotes and right parenthesis.
>+
>+        * UserInterface/Models/CSSCompletions.js:
>+        (WI.CSSCompletions.fixUnbalancedCharacters):
>+        * UserInterface/Models/CSSProperty.js:
>+        (WI.CSSProperty.prototype.set rawValue):
>+
> 2019-02-01  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         Web Inspector: Make WI.ColumnChart a WI.View subclass
>diff --git a/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js b/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js
>index 09d61048421..0b169f1c1a2 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js
>@@ -171,6 +171,92 @@ WI.CSSCompletions = class CSSCompletions
>             target.CSSAgent.getSupportedSystemFontFamilyNames(fontFamilyNamesCallback);
>     }
> 
>+    static fixUnbalancedCharacters(value)
>+    {
>+        const State = {
>+            Data: 0,
>+            SingleQuoteString: 2,
>+            DoubleQuoteString: 3,
>+            Comment: 4
>+        };
>+
>+        let state = State.Data;
>+        let parenthesisUnclosedCount = 0;
>+        let trailingBackslash = false;
>+        let length = value.length;
>+
>+        for (let i = 0; i < length; ++i) {
>+            switch (value[i]) {
>+            case "'":
>+                if (state === State.Data)
>+                    state = State.SingleQuoteString;
>+                else if (state === State.SingleQuoteString)
>+                    state = State.Data;
>+                break;
>+
>+            case "\"":
>+                if (state === State.Data)
>+                    state = State.DoubleQuoteString;
>+                else if (state === State.DoubleQuoteString)
>+                    state = State.Data;
>+                break;
>+
>+            case "(":
>+                if (state === State.Data)
>+                    ++parenthesisUnclosedCount;
>+                break;
>+
>+            case ")":
>+                if (state === State.Data && parenthesisUnclosedCount)
>+                    --parenthesisUnclosedCount;
>+                break;
>+
>+            case "/":
>+                if (state === State.Data) {
>+                    if (i + 1 < length && value[i + 1] === "*")
>+                        state = State.Comment;
>+                }
>+                break;
>+
>+            case "\\":
>+                if (i === length - 1)
>+                    trailingBackslash = true;
>+                else
>+                    ++i; // Skip next character.
>+                break;
>+
>+            case "*":
>+                if (state === State.Comment) {
>+                    if (i + 1 < length && value[i + 1] === "/")
>+                        state = State.Data;
>+                }
>+                break;
>+            }
>+        }
>+
>+        let suffix = "";
>+
>+        if (trailingBackslash)
>+            suffix = "\\";
>+
>+        switch (state) {
>+        case State.SingleQuoteString:
>+            suffix += "'";
>+            break;
>+        case State.DoubleQuoteString:
>+            suffix += "\"";
>+            break;
>+        case State.Comment:
>+            suffix += "*/";
>+            break;
>+        }
>+
>+        if (parenthesisUnclosedCount)
>+            suffix += ")".repeat(parenthesisUnclosedCount);
>+
>+        return suffix;
>+    }
>+
>     // Public
> 
>     get values()
>diff --git a/Source/WebInspectorUI/UserInterface/Models/CSSProperty.js b/Source/WebInspectorUI/UserInterface/Models/CSSProperty.js
>index 1be38e5d5fe..10a299227d7 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/CSSProperty.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/CSSProperty.js
>@@ -230,6 +230,10 @@ WI.CSSProperty = class CSSProperty extends WI.Object
> 
>         this._markModified();
> 
>+        let suffix = WI.CSSCompletions.fixUnbalancedCharacters(value);
>+        if (suffix)
>+            value += suffix;
>+
>         this._rawValue = value;
>         this._value = undefined;
>         this._updateStyleText();

Flags:

hi: review+
hi: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 182523: 333149 | 361144 | 361146 | 361363 | 361367 | 361521