fix($injector): more conservative annotation parsing

angular · Sep 6, 2012 · d9eff86 · d9eff86
1 parent 8cb9c99
commit d9eff86
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/auto/injector.js b/src/auto/injector.js
@@ -40,7 +40,7 @@
 
 var FN_ARGS = /^function\s*[^\(]*\(\s*([^\)]*)\)/m;
 var FN_ARG_SPLIT = /,/;
-var FN_ARG = /^\s*(_?)(.+?)\1\s*$/;
+var FN_ARG = /^\s*(_?)(\S+?)\1\s*$/;
 var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
 function annotate(fn) {
   var $inject,

diff --git a/test/auto/injectorSpec.js b/test/auto/injectorSpec.js
@@ -143,7 +143,7 @@ describe('injector', function() {
       function $f_n0 /*
           */(
           $a, // x, <-- looks like an arg but it is a comment
-          b_, /* z, <-- looks like an arg but it is a
+          b_ , /* z, <-- looks like an arg but it is a
                  multi-line comment
                  function (a, b) {}
                  */