Changeset 249268 in webkit

Timestamp:

Aug 29, 2019, 6:11:15 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r249246 - Web Inspector: REGRESSION(r249078): JavaScript autocomplete doesn't work when evaluating properties of values
​https://bugs.webkit.org/show_bug.cgi?id=201226

Reviewed by Joseph Pecoraro.

r249078 modified WI.JavaScriptRuntimeCompletionProvider to use arrays of property names
instead of objects for completion, but a few code paths were missed.

• UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js:

(WI.JavaScriptRuntimeCompletionProvider.prototype.completionControllerCompletionsNeeded.evaluated):
(WI.JavaScriptRuntimeCompletionProvider.prototype.completionControllerCompletionsNeeded.receivedPropertyNamesFromEvaluate):
(WI.JavaScriptRuntimeCompletionProvider.prototype.completionControllerCompletionsNeeded.receivedObjectPropertyNames): Added.
(WI.JavaScriptRuntimeCompletionProvider.prototype.completionControllerCompletionsNeeded.receivedArrayPropertyNames):

• UserInterface/Models/CallFrame.js:

(WI.CallFrame.prototype.collectScopeChainVariableNames):
(WI.CallFrame.prototype.collectScopeChainVariableNames.propertiesCollected):

Location:

releases/WebKitGTK/webkit-2.26/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js (modified) (4 diffs)
• UserInterface/Models/CallFrame.js (modified) (2 diffs)

releases/WebKitGTK/webkit-2.26/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-08-28  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: REGRESSION(r249078): JavaScript autocomplete doesn't work when evaluating properties of values
+        https://bugs.webkit.org/show_bug.cgi?id=201226
+
+        Reviewed by Joseph Pecoraro.
+
+        r249078 modified `WI.JavaScriptRuntimeCompletionProvider` to use arrays of property names
+        instead of objects for completion, but a few code paths were missed.
+
+        * UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js:
+        (WI.JavaScriptRuntimeCompletionProvider.prototype.completionControllerCompletionsNeeded.evaluated):
+        (WI.JavaScriptRuntimeCompletionProvider.prototype.completionControllerCompletionsNeeded.receivedPropertyNamesFromEvaluate):
+        (WI.JavaScriptRuntimeCompletionProvider.prototype.completionControllerCompletionsNeeded.receivedObjectPropertyNames): Added.
+        (WI.JavaScriptRuntimeCompletionProvider.prototype.completionControllerCompletionsNeeded.receivedArrayPropertyNames):
+
+        * UserInterface/Models/CallFrame.js:
+        (WI.CallFrame.prototype.collectScopeChainVariableNames):
+        (WI.CallFrame.prototype.collectScopeChainVariableNames.propertiesCollected):
+
 2019-08-27  Devin Rousso  <drousso@apple.com>
 

releases/WebKitGTK/webkit-2.26/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js

@@ -166 +166 @@
                 WI.runtimeManager.activeExecutionContext.target.RuntimeAgent.releaseObjectGroup("completion");
 
-                updateLastPropertyNames.call(this, {});
+                updateLastPropertyNames.call(this, []);
                 completionController.updateCompletions(defaultCompletions);
 
@@ -227 +227 @@
                 result.callFunctionJSON(inspectedPage_evalResult_getArrayCompletions, undefined, receivedArrayPropertyNames.bind(this));
             else if (result.type === "object" || result.type === "function")
-                result.callFunctionJSON(inspectedPage_evalResult_getCompletions, undefined, receivedPropertyNames.bind(this));
+                result.callFunctionJSON(inspectedPage_evalResult_getCompletions, undefined, receivedObjectPropertyNames.bind(this));
             else if (result.type === "string" || result.type === "number" || result.type === "boolean" || result.type === "symbol") {
                 let options = {objectGroup: "completion", includeCommandLineAPI: false, doNotPauseOnExceptionsAndMuteConsole: true, returnByValue: true, generatePreview: false, saveResult: false};
@@ -237 +237 @@
         function receivedPropertyNamesFromEvaluate(object, wasThrown, result)
         {
-            receivedPropertyNames.call(this, result && !wasThrown ? result.value : null);
+            receivedPropertyNames.call(this, result && !wasThrown ? Object.keys(result.value) : null);
+        }
+
+        function receivedObjectPropertyNames(propertyNames)
+        {
+            receivedPropertyNames.call(this, Object.keys(propertyNames));
         }
 
@@ -251 +256 @@
             }
 
-            receivedPropertyNames.call(this, propertyNames);
+            receivedObjectPropertyNames.call(this, propertyNames);
         }
 
         function receivedPropertyNames(propertyNames)
         {
-            propertyNames = propertyNames ? Object.keys(propertyNames) : [];
+            console.assert(!propertyNames || Array.isArray(propertyNames));
+            propertyNames = propertyNames || [];
 
             updateLastPropertyNames.call(this, propertyNames);

releases/WebKitGTK/webkit-2.26/Source/WebInspectorUI/UserInterface/Models/CallFrame.js

@@ -71 +71 @@
     collectScopeChainVariableNames(callback)
     {
-        var result = {this: true, __proto__: null};
+        let result = ["this", "__proto__"];
 
         var pendingRequests = this._scopeChain.length;
@@ -78 +78 @@
         {
             for (var i = 0; properties && i < properties.length; ++i)
-                result[properties[i].name] = true;
+                result.push(properties[i].name);
 
             if (--pendingRequests)