Changeset 35814 in webkit

Timestamp:

Aug 17, 2008 8:21:46 PM (16 years ago)

Author:

timothy@apple.com

Message:

Complete in scope variables in the Console when paused.

​https://bugs.webkit.org/show_bug.cgi?id=19115

Reviewed by Geoffrey Garen.

• page/inspector/Console.js: (WebInspector.Console.prototype.completions): If the expressionString is null or empty and the debugger is paused, call variablesInScopeForSelectedCallFrame to get an object that declares all the in scope variables. That way "top level" expressions are completed.
• page/inspector/ScriptsPanel.js: (WebInspector.ScriptsPanel.prototype.variablesInScopeForSelectedCallFrame): Return an object that has all the variables that are in scope for the selected call frame. The value of each property is just true. The return object is useful for quick lookups or auto completion.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/inspector/Console.js (modified) (2 diffs)
• page/inspector/ScriptsPanel.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-08-17  Timothy Hatcher  <timothy@apple.com>
+
+        Complete in scope variables in the Console when paused.
+
+        https://bugs.webkit.org/show_bug.cgi?id=19115
+
+        Reviewed by Geoffrey Garen.
+
+        * page/inspector/Console.js:
+        (WebInspector.Console.prototype.completions): If the expressionString
+        is null or empty and the debugger is paused, call variablesInScopeForSelectedCallFrame
+        to get an object that declares all the in scope variables. That way
+        "top level" expressions are completed.
+        * page/inspector/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype.variablesInScopeForSelectedCallFrame):
+        Return an object that has all the variables that are in scope for the
+        selected call frame. The value of each property is just true.
+        The return object is useful for quick lookups or auto completion.
+
 2008-08-17  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
 

trunk/WebCore/page/inspector/Console.js

@@ -201 +201 @@
             return;
 
-        var result = InspectorController.inspectedWindow();
+        var result;
         if (expressionString) {
             try {
@@ -208 +208 @@
                 // Do nothing, the prefix will be considered a window property.
             }
+        } else {
+            // There is no expressionString, so the completion should happen against global properties.
+            // Or if the debugger is paused, against properties in scope of the selected call frame.
+            if (WebInspector.panels.scripts.paused)
+                result = WebInspector.panels.scripts.variablesInScopeForSelectedCallFrame();
+            else
+                result = InspectorController.inspectedWindow();
         }
 

trunk/WebCore/page/inspector/ScriptsPanel.js

@@ -294 +294 @@
     },
 
+    variablesInScopeForSelectedCallFrame: function()
+    {
+        var selectedCallFrame = this.sidebarPanes.callstack.selectedCallFrame;
+        if (!this._paused || !selectedCallFrame)
+            return {};
+
+        var result = {};
+        var scopeChain = selectedCallFrame.scopeChain;
+        for (var i = 0; i < scopeChain.length; ++i) {
+            var scopeObject = scopeChain[i];
+            for (var property in scopeObject)
+                result[property] = true;
+        }
+
+        return result;
+    },
+
     debuggerPaused: function()
     {