Bug in findFunctionName with commented code

homyakov · homyakov · commit 4d72b5cd98d4 · 2011-11-11T11:04:53.000+03:00
diff --git a/stacktrace.js b/stacktrace.js
@@ -383,10 +383,12 @@ printStackTrace.implementation.prototype = {
         var reFunctionEvaluation = /['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*(?:eval|new Function)\b/;
         // Walk backwards in the source lines until we find
         // the line which matches one of the patterns above
-        var code = "", line, maxLines = 10, m;
+        var code = "", line, maxLines = 20, m;
         for (var i = 0; i < maxLines; ++i) {
-            // FIXME lineNo is 1-based, source[] is 0-based
-            line = source[lineNo - i];
+            // lineNo is 1-based, source[] is 0-based
+            line = source[lineNo - i - 1];
+            // line.replace(/(.*)\/\//, '$1')
+            // FIXME skip/clean comments? Commented code may lead to false positive
             if (line) {
                 code = line + code;
                 m = reFunctionExpression.exec(code);
diff --git a/test/TestStacktrace.js b/test/TestStacktrace.js
@@ -563,7 +563,7 @@
     equals(pst.findFunctionName(['var a = function aa() {', 'var b = 2;', '};'], 2), 'a');
     equals(pst.findFunctionName(['var a = function () {', 'var b = 2;', '};'], 2), 'a');
     equals(pst.findFunctionName(['var a = function() {', 'var b = 2;', '};'], 2), 'a');
-    // FIXME: currently failing becuase we don't have a way to distinguish which fn is being sought
+    // FIXME: currently failing because we don't have a way to distinguish which fn is being sought
     // equals(pst.findFunctionName(['a:function(){},b:function(){', '};'], 1), 'b');
     equals(pst.findFunctionName(['"a": function(){', '};'], 1), 'a');
 
@@ -577,6 +577,8 @@
     equals(pst.findFunctionName(['var data = new Function("s,r",', '"return s + r;");'], 1), 'data');
 
     equals(pst.findFunctionName(['var a = 1;', 'var b = 2;', 'var c = 3;'], 2), '(?)');
+
+    equals(pst.findFunctionName(['function a() {', '  // function commented()', '  error here', '}'], 3), 'a');
   });
 
   test("getSource cache miss", function() {
