Reviewed by Tim H.

        Fixes: http://bugs.webkit.org/show_bug.cgi?id=9596
        Bug 9596: [Drosera] add a function popup to the source pane

        * Drosera/debugger.css: Added styles for function popup
        * Drosera/debugger.html: Added function popup button and select
        * Drosera/debugger.js: Added function popup functionality

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17583 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2f150c1f4e2a6161e4312d96bdfa4a46ead9a728..6ebe00de0dead5aa6bfbaf3d4e6e1576a6f7ea91 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2006-11-03  Vladimir Olexa  <vladimir.olexa@gmail.com>
+
+        Reviewed by Tim H.
+
+        Fixes: http://bugs.webkit.org/show_bug.cgi?id=9596
+        Bug 9596: [Drosera] add a function popup to the source pane
+
+        * Drosera/debugger.css: Added styles for function popup
+        * Drosera/debugger.html: Added function popup button and select
+        * Drosera/debugger.js: Added function popup functionality
+
 2006-11-03  Michael Emmel  <mike.emmel@gmail.com>
 
         Reviewed by Maciej.

diff --git a/WebKitTools/Drosera/debugger.css b/WebKitTools/Drosera/debugger.css
index 0b511a62f4a885d1d6e81f9f9b7598342cc0a546..d0d7ddb055c15bf4bcbacf1bbb7057affdfb2de2 100644 (file)
--- a/WebKitTools/Drosera/debugger.css
+++ b/WebKitTools/Drosera/debugger.css
@@ -102,7 +102,7 @@ body { margin: 0; padding: 0; overflow: hidden; }
     background-color: white;
 }
 
-#files {
+#files, #functions {
     opacity: 0;
     position: absolute;
     top: -2px;
@@ -129,7 +129,7 @@ button.popup {
     max-width: 350px;
 }
 
-#filesPopupButtonContent {
+#filesPopupButtonContent, #functionButtonContent {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;

diff --git a/WebKitTools/Drosera/debugger.html b/WebKitTools/Drosera/debugger.html
index 195a9df14ea89ef0734bb16bb483c0163aad13bc..21b41d6a89d9189e52c5852c1e3046fc460203a6 100644 (file)
--- a/WebKitTools/Drosera/debugger.html
+++ b/WebKitTools/Drosera/debugger.html
@@ -81,8 +81,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <div id="header">
 <button id="navFileLeftButton" class="nav left" disabled onclick="navFilePrevious(this)"></button><button id="navFileRightButton" class="nav right" disabled onclick="navFileNext(this)"></button>
 <button class="popup"><select size="1" id="files" onchange="switchFile()"></select><div id="filesPopupButtonContent"><span class="placeholder">no files loaded</span></div></button>
+<button class="popup" id="functionNamesPopup" style="display: none"><select size="1" id="functions" onchange="switchFunction(this.selectedIndex)"></select><div id="functionPopupButtonContent"><span class="placeholder">&lt;No selected symbol&gt;</span></div></button>
 </div>
-<div id="sourcesContainer"><iframe id="sources" src="viewer.html"></iframe></div>
+<div id="sourcesContainer"><iframe name="sourcesFrame" id="sources" src="viewer.html"></iframe></div>
 <div class="footer"></div>
 </div>
 </div>

diff --git a/WebKitTools/Drosera/debugger.js b/WebKitTools/Drosera/debugger.js
index e117095531091f7cc103d603f23f858e7c316228..62d8aaa6c8bf672a03346e12b89a3deeef848383 100644 (file)
--- a/WebKitTools/Drosera/debugger.js
+++ b/WebKitTools/Drosera/debugger.js
@@ -375,6 +375,12 @@ Element.prototype.query = function(query)
     return document.evaluate(query, this, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
 }
 
+Element.prototype.removeChildren = function()
+{
+    while (this.firstChild) 
+        this.removeChild(this.firstChild);        
+}
+
 function breakpointAction(event)
 {
     var file = files[currentFile];
@@ -665,7 +671,7 @@ function switchFile()
     loadFile(filesSelect.options[filesSelect.selectedIndex].value, true);
 }
 
-function syntaxHighlight(code)
+function syntaxHighlight(code, file)
 {
     var keywords = { 'abstract': 1, 'boolean': 1, 'break': 1, 'byte': 1, 'case': 1, 'catch': 1, 'char': 1, 'class': 1, 'const': 1, 'continue': 1, 'debugger': 1, 'default': 1, 'delete': 1, 'do': 1, 'double': 1, 'else': 1, 'enum': 1, 'export': 1, 'extends': 1, 'false': 1, 'final': 1, 'finally': 1, 'float': 1, 'for': 1, 'function': 1, 'goto': 1, 'if': 1, 'implements': 1, 'import': 1, 'in': 1, 'instanceof': 1, 'int': 1, 'interface': 1, 'long': 1, 'native': 1, 'new': 1, 'null': 1, 'package': 1, 'private': 1, 'protected': 1, 'public': 1, 'return': 1, 'short': 1, 'static': 1, 'super': 1, 'switch': 1, 'synchronized': 1, 'this': 1, 'throw': 1, 'throws': 1, 'transient': 1, 'true': 1, 'try': 1, 'typeof': 1, 'var': 1, 'void': 1, 'volatile': 1, 'while': 1, 'with': 1 };
 
@@ -793,15 +799,51 @@ function syntaxHighlight(code)
             }
 
             if (keywords[keyword]) {
-                result += "<span class=\"keyword\">" + keyword + "</span>";
-                i += keyword.length - 1;
+                var functionName = "";
+                if (keyword == "function") {
+                    var functionKeywordOffset = 8;
+                    var functionNameChar = "";
+                    
+                    if (code.charAt(i + functionKeywordOffset) == " ") { 
+                        functionNameChar = code.charAt(i + functionKeywordOffset + 1);
+                        functionKeywordOffset++;
+                    } else
+                        functionNameChar = code.charAt(i + functionKeywordOffset);
+                    
+                    if (functionNameChar == "(") {
+                        functionName = "function";
+                        file.functionNames.push(functionName);
+                    } else {
+                        while (functionNameChar != "(") {
+                            functionName += functionNameChar;                        
+                            functionKeywordOffset++;
+                            functionNameChar = code.charAt(i + functionKeywordOffset);
+                            if ((i + functionKeywordOffset) >= code.length || functionNameChar == " " || functionNameChar == "\n") break;
+                        }
+                    }
+                }
+
+                var fileIndex = filesLookup[file.url];
+
+                if (functionName == "function") 
+                    result += "<span class=\"keyword\"><a name=\"function-" + fileIndex + "-" + file.functionNames.length + "\" id=\"" + fileIndex + "-" + file.functionNames.length + "\">" + keyword + "</a></span>";
+                else
+                    result += "<span class=\"keyword\">" + keyword + "</span>";
+                
+                if (functionName.length > 0 && functionName != "function") {
+                    file.functionNames.push(functionName);
+                    result += " <a name=\"function-" + fileIndex + "-" + file.functionNames.length + "\" id=\"" + fileIndex + "-" + file.functionNames.length + "\">" + functionName + "</a>";
+                    i += keyword.length + functionName.length;
+                } else
+                    i += keyword.length - 1;
+                
                 continue;
             }
         }
 
         echoChar(c);
     }
-
+        
     return result;
 }
 
@@ -883,6 +925,28 @@ function selectVariable(event)
     this.addStyleClass("current");
 }
 
+function switchFunction(index, shouldResetPopup)
+{
+    if (shouldResetPopup === undefined) shouldResetPopup = false;
+    var sourcesFrame = window.frames['sourcesFrame'];
+    
+    if (shouldResetPopup || index == 0) {
+        document.getElementById("functionPopupButtonContent").innerHTML = '<span class="placeholder">&lt;No selected symbol&gt;</span>';
+        return;
+    }
+
+    var functionSelect = document.getElementById("functions");
+    var selectedFunction = functionSelect.childNodes[index];
+    var selection = sourcesFrame.getSelection();
+    var currentFunction = selectedFunction.value;     
+    var currentFunctionElement = sourcesFrame.document.getElementById(currentFunction);
+    
+    sourcesFrame.focus();
+    selection.setBaseAndExtent(currentFunctionElement, 0, currentFunctionElement, 1);
+    sourcesFrame.location.hash = "#function-" + selectedFunction.value;
+    document.getElementById("functionPopupButtonContent").innerText = selectedFunction.innerText;
+}
+
 function loadFile(fileIndex, manageNavLists)
 {
     var file = files[fileIndex];
@@ -904,7 +968,7 @@ function loadFile(fileIndex, manageNavLists)
         sourceDiv.appendChild(table);
 
         var normalizedSource = file.source.replace(/\r\n|\r/, "\n"); // normalize line endings
-        var lines = syntaxHighlight(normalizedSource).split("\n");
+        var lines = syntaxHighlight(normalizedSource, file).split("\n");
         for( var i = 0; i < lines.length; i++ ) {
             var tr = sourcesDocument.createElement("tr");
             var td = sourcesDocument.createElement("td");
@@ -921,7 +985,7 @@ function loadFile(fileIndex, manageNavLists)
             tr.appendChild(td);
             table.appendChild(tr);
         }
-
+        
         file.loaded = true;
     }
 
@@ -936,7 +1000,28 @@ function loadFile(fileIndex, manageNavLists)
             break;
         }
     }
-    
+
+    // Populate the function names pop-up
+    if (file.functionNames.length > 0) {
+        var functionSelect = document.getElementById("functions");
+        var functionOption = document.createElement("option");
+        
+        document.getElementById("functionNamesPopup").style.display = "inline";
+        switchFunction(0, true);
+        
+        functionSelect.removeChildren();
+        functionOption.value = null;
+        functionOption.text = "< no selected symbol >";
+        functionSelect.appendChild(functionOption);
+        
+        for (var i = 0; i < file.functionNames.length; i++) {
+            functionOption = document.createElement("option");
+            functionOption.value = fileIndex + "-" + (i+1);
+            functionOption.text = file.functionNames[i] + "()";
+            functionSelect.appendChild(functionOption);
+        }
+    } else
+        document.getElementById("functionNamesPopup").style.display = "none";
     
     if (manageNavLists) {
         nextFiles = new Array();
@@ -1102,6 +1187,7 @@ function didParseScript(source, fileSource, url, sourceId, baseLineNumber)
         file = new Object();
         file.scripts = new Array();
         file.breakpoints = new Array();
+        file.functionNames = new Array();
         file.source = (fileSource.length ? fileSource : source);
         file.url = (url.length ? url : null);
         file.loaded = false;