Bug 756681 - Scratchpad should display exceptions when throwing a string; r=rcampbell

browser/devtools/scratchpad/scratchpad.js

@@ -491,9 +491,24 @@ var Scratchpad = {
    */
   writeAsErrorComment: function SP_writeAsErrorComment(aError)
   {
-    let stack = aError.stack || aError.fileName + ":" + aError.lineNumber;
-    let newComment = "Exception: " + aError.message + "\n" + stack.replace(/\n$/, "");
+    let stack = "";
+    if (aError.stack) {
+      stack = aError.stack;
+    }
+    else if (aError.fileName) {
+      if (aError.lineNumber) {
+        stack = "@" + aError.fileName + ":" + aError.lineNumber;
+      }
+      else {
+        stack = "@" + aError.fileName;
+      }
+    }
+    else if (aError.lineNumber) {
+      stack = "@" + aError.lineNumber;
+    }
     
+    let newComment = "Exception: " + ( aError.message || aError) + ( stack == "" ? stack : "\n" + stack.replace(/\n$/, "") );
+
     this.writeAsComment(newComment);
   },
 

browser/devtools/scratchpad/test/Makefile.in

@@ -32,6 +32,7 @@ MOCHITEST_BROWSER_FILES = \
 		browser_scratchpad_bug714942_goto_line_ui.js \
 		browser_scratchpad_bug_650760_help_key.js \
 		browser_scratchpad_bug_651942_recent_files.js \
+		browser_scratchpad_bug756681_display_non_error_exceptions.js \
 		head.js \
 
 include $(topsrcdir)/config/rules.mk

browser/devtools/scratchpad/test/browser_scratchpad_bug756681_display_non_error_exceptions.js

@@ -0,0 +1,104 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function browserLoad() {
+    gBrowser.selectedBrowser.removeEventListener("load", browserLoad, true);
+    openScratchpad(runTests, {"state":{"text":""}});
+  }, true);
+
+  content.location = "data:text/html, test that exceptions are output as " +
+      "comments correctly in Scratchpad";
+}
+
+function runTests()
+{
+  var scratchpad = gScratchpadWindow.Scratchpad;
+
+  var message = "\"Hello World!\""
+  var openComment = "\n/*\n";
+  var closeComment = "\n*/";
+  var error1 = "throw new Error(\"Ouch!\")";
+  var error2 = "throw \"A thrown string\"";
+  var error3 = "throw {}";
+  var error4 = "document.body.appendChild(document.body)";
+  let messageArray = {};
+  let count = {};
+
+  // Display message
+  scratchpad.setText(message);
+  scratchpad.display();
+  is(scratchpad.getText(),
+      message + openComment + "Hello World!" + closeComment,
+      "message display output");
+
+  // Display error1, throw new Error("Ouch")
+  scratchpad.setText(error1);
+  scratchpad.display();
+  is(scratchpad.getText(),
+      error1 + openComment + "Exception: Ouch!\n@Scratchpad:1" + closeComment,
+      "error display output");
+
+  // Display error2, throw "A thrown string"
+  scratchpad.setText(error2);
+  scratchpad.display();
+  is(scratchpad.getText(),
+      error2 + openComment + "Exception: A thrown string" + closeComment,
+      "thrown string display output");
+
+  // Display error3, throw {}
+  scratchpad.setText(error3);
+  scratchpad.display();
+  is(scratchpad.getText(),
+      error3 + openComment + "Exception: [object Object]" + closeComment,
+      "thrown object display output");
+
+  // Display error4, document.body.appendChild(document.body)
+  scratchpad.setText(error4);
+  scratchpad.display();
+  is(scratchpad.getText(),
+      error4 + openComment + "Exception: Node cannot be inserted " +
+      "at the specified point in the hierarchy\n@1" + closeComment,
+      "Alternative format error display output");
+
+  // Run message
+  scratchpad.setText(message);
+  scratchpad.run();
+  is(scratchpad.getText(), message, "message run output");
+
+  // Run error1, throw new Error("Ouch")
+  scratchpad.setText(error1);
+  scratchpad.run();
+  is(scratchpad.getText(),
+      error1 + openComment + "Exception: Ouch!\n@Scratchpad:1" + closeComment,
+      "error run output");
+
+  // Run error2, throw "A thrown string"
+  scratchpad.setText(error2);
+  scratchpad.run();
+  is(scratchpad.getText(),
+      error2 + openComment + "Exception: A thrown string" + closeComment,
+      "thrown string run output");
+
+  // Run error3, throw {}
+  scratchpad.setText(error3);
+  scratchpad.run();
+  is(scratchpad.getText(),
+      error3 + openComment + "Exception: [object Object]" + closeComment,
+      "thrown object run output");
+
+  // Run error4, document.body.appendChild(document.body)
+  scratchpad.setText(error4);
+  scratchpad.run();
+  is(scratchpad.getText(),
+      error4 + openComment + "Exception: Node cannot be inserted " +
+      "at the specified point in the hierarchy\n@1" + closeComment,
+      "Alternative format error run output");
+
+  finish();
+}