Changeset 207481 in webkit

Timestamp:

Oct 18, 2016 1:21:02 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

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 <Joseph Pecoraro> 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.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Controllers/CodeMirrorCompletionController.js (modified) (3 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-10-18  Joseph Pecoraro  <pecoraro@apple.com>
+
+        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>
 

trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js

@@ -538 +538 @@
             return [];
 
+        // Don't complete in the middle of a property name.
+        if (/^[a-z]/i.test(suffix))
+            return [];
+
         var token = mainToken;
         var lineNumber = this._lineNumber;
@@ -562 +566 @@
 
             // If there is a suffix and it isn't a semicolon, then we should use a space since
-            // the user is editing in the middle.
-            this._implicitSuffix = suffix && suffix !== ";" ? " " : (this._noEndingSemicolon ? "" : ";");
+            // 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 = "";
 
             // Don't use an implicit suffix if it would be the same as the existing suffix.
@@ -569 +578 @@
                 this._implicitSuffix = "";
 
-            return WebInspector.CSSKeywordCompletions.forProperty(propertyName).startsWith(this._prefix);
+            let completions = WebInspector.CSSKeywordCompletions.forProperty(propertyName).startsWith(this._prefix);
+
+            if (suffix.startsWith("("))
+                completions = completions.map((x) => x.replace(/\(\)$/, ""));
+
+            return completions;
         }