Changeset 86768 in webkit

Timestamp:

May 18, 2011 8:52:57 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-05-18 Pavel Feldman <​pfeldman@google.com>

Reviewed by Yury Semikhatsky.

Web Inspector: [REGRESSION] Completion while on a breakpoint is not working.
​https://bugs.webkit.org/show_bug.cgi?id=60811

• inspector/debugger/debugger-completions-on-call-frame-expected.txt: Added.
• inspector/debugger/debugger-completions-on-call-frame.html: Added.

2011-05-18 Pavel Feldman <​pfeldman@google.com>

Reviewed by Yury Semikhatsky.

Web Inspector: [REGRESSION] Completion while on a breakpoint is not working.
​https://bugs.webkit.org/show_bug.cgi?id=60811

Test: inspector/debugger/debugger-completions-on-call-frame.html

• inspector/InjectedScriptSource.js:
• inspector/front-end/ConsoleView.js: (WebInspector.ConsoleView.prototype.completions.else.evaluated):
• inspector/front-end/DebuggerPresentationModel.js: (WebInspector.PresenationCallFrame.prototype.get variables):
• inspector/front-end/ScriptsPanel.js: (WebInspector.ScriptsPanel.prototype.selectedCallFrameVariables):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/debugger-completions-on-call-frame-expected.txt (added)
• LayoutTests/inspector/debugger/debugger-completions-on-call-frame.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/ConsoleView.js (modified) (3 diffs)
• Source/WebCore/inspector/front-end/RemoteObject.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/ScriptsPanel.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-18  Pavel Feldman  <pfeldman@google.com>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: [REGRESSION] Completion while on a breakpoint is not working.
+        https://bugs.webkit.org/show_bug.cgi?id=60811
+
+        * inspector/debugger/debugger-completions-on-call-frame-expected.txt: Added.
+        * inspector/debugger/debugger-completions-on-call-frame.html: Added.
+
 2011-05-18  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-18  Pavel Feldman  <pfeldman@google.com>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: [REGRESSION] Completion while on a breakpoint is not working.
+        https://bugs.webkit.org/show_bug.cgi?id=60811
+
+        Test: inspector/debugger/debugger-completions-on-call-frame.html
+
+        * inspector/InjectedScriptSource.js:
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleView.prototype.completions.else.evaluated):
+        * inspector/front-end/DebuggerPresentationModel.js:
+        (WebInspector.PresenationCallFrame.prototype.get variables):
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype.selectedCallFrameVariables):
+
 2011-05-18  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/inspector/front-end/ConsoleView.js

@@ -351 +351 @@
         var expressionRange = wordRange.startContainer.rangeOfWord(wordRange.startOffset, ExpressionStopCharacters, this.promptElement, "backward");
         var expressionString = expressionRange.toString();
+        var prefix = wordRange.toString();
+        this._completions(expressionString, prefix, bestMatchOnly, completionsReadyCallback);
+    },
+
+    _completions: function(expressionString, prefix, bestMatchOnly, completionsReadyCallback)
+    {
         var lastIndex = expressionString.length - 1;
 
@@ -359 +365 @@
             expressionString = expressionString.substr(0, lastIndex);
 
-        var prefix = wordRange.toString();
         if (!expressionString && !prefix)
             return;
 
-        this.evalInInspectedWindow(expressionString, "completion", true, evaluated.bind(this));
+        if (!expressionString && WebInspector.panels.scripts.paused)
+            WebInspector.panels.scripts.getSelectedCallFrameVariables(reportCompletions.bind(this));
+        else
+            this.evalInInspectedWindow(expressionString, "completion", true, evaluated.bind(this));
 
         function evaluated(result, wasThrown)
@@ -375 +383 @@
         {
             RuntimeAgent.releaseObjectGroup("completion");
-            var propertyNames = [];
+            var propertyNames = {};
             for (var i = 0; properties && i < properties.length; ++i)
-                propertyNames.push(properties[i].name);
-
+                propertyNames[properties[i].name] = true;
+            reportCompletions.call(this, propertyNames);
+        }
+
+        function reportCompletions(propertyNames)
+        {
             var includeCommandLineAPI = (!dotNotation && !bracketNotation);
-            if (includeCommandLineAPI)
-                propertyNames.splice(0, 0, "dir", "dirxml", "keys", "values", "profile", "profileEnd", "monitorEvents", "unmonitorEvents", "inspect", "copy", "clear");
-            this._reportCompletions(bestMatchOnly, completionsReadyCallback, dotNotation, bracketNotation, prefix, propertyNames);
+            if (includeCommandLineAPI) {
+                const commandLineAPI = ["dir", "dirxml", "keys", "values", "profile", "profileEnd", "monitorEvents", "unmonitorEvents", "inspect", "copy", "clear"];
+                for (var i = 0; i < commandLineAPI.length; ++i)
+                    propertyNames[commandLineAPI[i]] = true;
+            }
+            
+            this._reportCompletions(bestMatchOnly, completionsReadyCallback, dotNotation, bracketNotation, prefix, Object.keys(propertyNames));
         }
     },

trunk/Source/WebCore/inspector/front-end/RemoteObject.js

@@ -126 +126 @@
         function remoteObjectBinder(error, properties)
         {
-            if (error)
+            if (error) {
+                callback(null);
                 return;
+            }
             for (var i = 0; properties && i < properties.length; ++i)
                 properties[i].value = WebInspector.RemoteObject.fromPayload(properties[i].value);

trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js

@@ -377 +377 @@
     },
 
+    getSelectedCallFrameVariables: function(callback)
+    {
+        var result = { this: true };
+
+        var selectedCallFrame = this._presentationModel.selectedCallFrame;
+        if (!selectedCallFrame)
+            callback(result);
+
+        var pendingRequests = 0;
+
+        function propertiesCollected(properties)
+        {
+            for (var i = 0; properties && i < properties.length; ++i)
+                result[properties[i].name] = true;
+            if (--pendingRequests == 0)
+                callback(result);
+        }
+
+        for (var i = 0; i < selectedCallFrame.scopeChain.length; ++i) {
+            var scope = selectedCallFrame.scopeChain[i];
+            var object = WebInspector.RemoteObject.fromPayload(scope.object);
+            pendingRequests++;
+            object.getAllProperties(propertiesCollected);
+        }
+    },
+
     _debuggerPaused: function(event)
     {