From aec31a09933903345bff0bb25bc17c2f04ad32fc Mon Sep 17 00:00:00 2001
From: esarbanis <e.sarbanis@gmail.com>
Date: Fri, 27 Sep 2013 01:01:27 +0300
Subject: [PATCH] fix(parse): changed the functionCall method to parse filters

Added a condition to allow the parser to understand whether the parameter is a filter

Closes #4168
---
 src/ng/parse.js      |  2 +-
 test/ng/parseSpec.js | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/ng/parse.js b/src/ng/parse.js
index 1ae26404e610..07908aaef686 100644
--- a/src/ng/parse.js
+++ b/src/ng/parse.js
@@ -698,7 +698,7 @@ Parser.prototype = {
     var argsFn = [];
     if (this.peekToken().text !== ')') {
       do {
-        argsFn.push(this.expression());
+        argsFn.push(this.filterChain());
       } while (this.expect(','));
     }
     this.consume(')');
diff --git a/test/ng/parseSpec.js b/test/ng/parseSpec.js
index 7f1eeb64663d..07c9e89559c8 100644
--- a/test/ng/parseSpec.js
+++ b/test/ng/parseSpec.js
@@ -339,6 +339,47 @@ describe('parser', function() {
         expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
       });
 
+      it('should parse filters as method parameters', function() {
+        $filterProvider.register('substring', valueFn(function(input, start, end) {
+          return input.substring(start, end);
+        }));
+
+        scope.offset =  3;
+
+        scope.echo1 = function(substring) {
+          return substring;
+        };
+
+        expect(scope.$eval("echo1(('abcd'|substring:1:offset))")).toEqual("bc");
+        expect(scope.$eval("echo1('abcd'|substring:1:offset)")).toEqual("bc");
+
+        scope.echo2 = function(lowercaseSubstring,uppercaseSubstring) {
+          return lowercaseSubstring+uppercaseSubstring;
+        };
+
+        expect(scope.$eval("echo2(('abcd'|substring:1:offset),('abcd'|substring:1:3|uppercase))")).toEqual("bcBC");
+        expect(scope.$eval("echo2('abcd'|substring:1:offset,'abcd'|substring:1:3|uppercase)")).toEqual("bcBC");
+
+        expect(scope.$eval("echo2('',('abcd'|substring:1:3|uppercase))")).toEqual("BC");
+        expect(scope.$eval("echo2('','abcd'|substring:1:3|uppercase)")).toEqual("BC");
+
+        expect(scope.$eval("echo2(null,('abcd'|substring:1:3|uppercase))")).toEqual("nullBC");
+        expect(scope.$eval("echo2(null,'abcd'|substring:1:3|uppercase)")).toEqual("nullBC");
+
+        expect(scope.$eval("echo2(undefined,('abcd'|substring:1:3|uppercase))")).toEqual("undefinedBC");
+        expect(scope.$eval("echo2(undefined,'abcd'|substring:1:3|uppercase)")).toEqual("undefinedBC");
+
+        expect(scope.$eval("echo2(('abcd'|substring:1:offset),null)")).toEqual("bcnull");
+        expect(scope.$eval("echo2('abcd'|substring:1:offset,null)")).toEqual("bcnull");
+
+        expect(scope.$eval("echo2(('abcd'|substring:1:offset),undefined)")).toEqual("bcundefined");
+        expect(scope.$eval("echo2('abcd'|substring:1:offset,undefined)")).toEqual("bcundefined");
+
+        scope.date = new Date();
+        expect(scope.$eval("echo1((date|date:'yyyy'))")).toEqual(scope.date.getFullYear().toString());
+        expect(scope.$eval("echo1(date|date:'yyyy')")).toEqual(scope.date.getFullYear().toString());
+      });
+
       it('should access scope', function() {
         scope.a =  123;
         scope.b = {c: 456};