Also fix matching against ifs on function name

Author: ramondantas-cp

spec/stacktrace-gps-spec.js

@@ -198,7 +198,7 @@ describe('StackTraceGPS', function() {
             }
         });
 
-        it('ignores special case involving class functions', function(done) {
+        it('ignores special case interpreting control structures as the function parameter list', function(done) {
             var source = 'if (a) { foo(); } else if (b) { bar(); }';
             jasmine.Ajax.stubRequest('http://localhost:9999/file.js').andReturn({responseText: source});
             var originalStackFrame = new StackFrame({functionName: '@test@', args: [], fileName: 'http://localhost:9999/file.js', lineNumber: 1, columnNumber: 0});
@@ -210,6 +210,18 @@ describe('StackTraceGPS', function() {
             }
         });
 
+        it('ignores special case interpreting control structures as the function name', function(done) {
+            var source = 'functionCall()\nif (condition) {';
+            jasmine.Ajax.stubRequest('http://localhost:9999/file.js').andReturn({responseText: source});
+            var originalStackFrame = new StackFrame({functionName: '@test@', args: [], fileName: 'http://localhost:9999/file.js', lineNumber: 2, columnNumber: 0});
+            new StackTraceGPS().findFunctionName(originalStackFrame).then(callback, done.fail);
+
+            function callback(stackframe) {
+                expect(stackframe).toEqual(originalStackFrame);
+                done();
+            }
+        });
+
         it('ignores commented out function definitions', function(done) {
             var source = 'var foo = function() {};\n//function bar() {}\nvar baz = eval("XXX")';
             jasmine.Ajax.stubRequest('http://localhost:9999/file.js').andReturn({responseText: source});

stacktrace-gps.js

@@ -71,7 +71,7 @@
             // {name} = eval()
             /['"]?([$_A-Za-z][$_A-Za-z0-9]*)['"]?\s*[:=]\s*(?:eval|new Function)\b/,
             // fn_name() {
-            /\b(?!(?:if|for|switch|while|with|catch)\b)(?:(?:static)\s+)?(\S+)\s*\([^)]*\)\s*\{/,
+            /\b(?!(?:if|for|switch|while|with|catch)\b)(?:(?:static)\s+)?([^('"`\s]+?)\s*\([^)]*\)\s*\{/,
             // {name} = () => {
             /['"]?([$_A-Za-z][$_A-Za-z0-9]*)['"]?\s*[:=]\s*\(.*?\)\s*=>/
         ];