fix($injector): ensure functions with overridden toString() are annotated properly

a510 · gkalpak · commit a0b5e1a85893 · 2016-04-11T12:58:50.000+03:00
Closes angular#14361
diff --git a/src/auto/injector.js b/src/auto/injector.js
@@ -71,7 +71,7 @@ var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
 var $injectorMinErr = minErr('$injector');
 
 function extractArgs(fn) {
-  var fnText = fn.toString().replace(STRIP_COMMENTS, ''),
+  var fnText = Function.prototype.toString.call(fn).replace(STRIP_COMMENTS, ''),
       args = fnText.match(ARROW_ARG) || fnText.match(FN_ARGS);
   return args;
 }
diff --git a/test/auto/injectorSpec.js b/test/auto/injectorSpec.js
@@ -241,6 +241,12 @@ describe('injector', function() {
       expect($f_n0.$inject).toEqual(['$a_']);
     });
 
+    it('should handle functions with overridden toString', function() {
+      function fn(a) {}
+      fn.toString = function() { return 'fn'; };
+      expect(annotate(fn)).toEqual(['a']);
+      expect(fn.$inject).toEqual(['a']);
+    });
 
     it('should throw on non function arg', function() {
       expect(function() {

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ var STRIP_COMMENTS = /((\/\/.$)\|(\/\[\s\S]?\\/))/mg;`
`71`	`71`	`var $injectorMinErr = minErr('$injector');`
`72`	`72`
`73`	`73`	`function extractArgs(fn) {`
`74`		`- var fnText = fn.toString().replace(STRIP_COMMENTS, ''),`
	`74`	`+ var fnText = Function.prototype.toString.call(fn).replace(STRIP_COMMENTS, ''),`
`75`	`75`	`args = fnText.match(ARROW_ARG) \|\| fnText.match(FN_ARGS);`
`76`	`76`	`return args;`
`77`	`77`	`}`