From a418397174eeaef869730d3c9270196cf5f0e28d Mon Sep 17 00:00:00 2001
From: Misko Hevery <misko@hevery.com>
Date: Thu, 21 May 2015 12:17:46 -0700
Subject: [PATCH] fix: corrected var/# parsing in template

Closes #2084
---
 .../src/change_detection/parser/parser.ts     | 22 +++++++++----------
 .../change_detection/parser/parser_spec.ts    | 16 +++++++++-----
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/modules/angular2/src/change_detection/parser/parser.ts b/modules/angular2/src/change_detection/parser/parser.ts
index 3099f3ae46..b34a73015c 100644
--- a/modules/angular2/src/change_detection/parser/parser.ts
+++ b/modules/angular2/src/change_detection/parser/parser.ts
@@ -538,19 +538,17 @@ class _ParseAST {
       this.optionalCharacter($COLON);
       var name = null;
       var expression = null;
-      if (this.next !== EOF) {
-        if (keyIsVar) {
-          if (this.optionalOperator("=")) {
-            name = this.expectTemplateBindingKey();
-          } else {
-            name = '\$implicit';
-          }
-        } else if (!this.peekKeywordVar()) {
-          var start = this.inputIndex;
-          var ast = this.parsePipe();
-          var source = this.input.substring(start, this.inputIndex);
-          expression = new ASTWithSource(ast, source, this.location);
+      if (keyIsVar) {
+        if (this.optionalOperator("=")) {
+          name = this.expectTemplateBindingKey();
+        } else {
+          name = '\$implicit';
         }
+      } else if (this.next !== EOF && !this.peekKeywordVar()) {
+        var start = this.inputIndex;
+        var ast = this.parsePipe();
+        var source = this.input.substring(start, this.inputIndex);
+        expression = new ASTWithSource(ast, source, this.location);
       }
       ListWrapper.push(bindings, new TemplateBinding(key, keyIsVar, name, expression));
       if (!this.optionalCharacter($SEMICOLON)) {
diff --git a/modules/angular2/test/change_detection/parser/parser_spec.ts b/modules/angular2/test/change_detection/parser/parser_spec.ts
index dd3f640a83..7136291909 100644
--- a/modules/angular2/test/change_detection/parser/parser_spec.ts
+++ b/modules/angular2/test/change_detection/parser/parser_spec.ts
@@ -447,7 +447,7 @@ export function main() {
       function keyValues(templateBindings) {
         return ListWrapper.map(templateBindings, (binding) => {
           if (binding.keyIsVar) {
-            return '#' + binding.key + (isBlank(binding.name) ? '' : '=' + binding.name);
+            return '#' + binding.key + (isBlank(binding.name) ? '=null' : '=' + binding.name);
           } else {
             return binding.key + (isBlank(binding.expression) ? '' : `=${binding.expression}`)
           }
@@ -471,7 +471,7 @@ export function main() {
         expect(bindings).toEqual([]);
       });
 
-      iit('should parse a string without a value', () => {
+      it('should parse a string without a value', () => {
         var bindings = parseTemplateBindings('a');
         expect(keys(bindings)).toEqual(['a']);
       });
@@ -508,7 +508,7 @@ export function main() {
 
       it('should detect names as value', () => {
         var bindings = parseTemplateBindings("a:#b");
-        expect(keyValues(bindings)).toEqual(['a', '#b']);
+        expect(keyValues(bindings)).toEqual(['a', '#b=\$implicit']);
       });
 
       it('should allow space and colon as separators', () => {
@@ -540,10 +540,16 @@ export function main() {
 
       it('should support var/# notation', () => {
         var bindings = parseTemplateBindings("var i");
-        expect(keyValues(bindings)).toEqual(['#i']);
+        expect(keyValues(bindings)).toEqual(['#i=\$implicit']);
 
         bindings = parseTemplateBindings("#i");
-        expect(keyValues(bindings)).toEqual(['#i']);
+        expect(keyValues(bindings)).toEqual(['#i=\$implicit']);
+
+        bindings = parseTemplateBindings("var a; var b");
+        expect(keyValues(bindings)).toEqual(['#a=\$implicit', '#b=\$implicit']);
+
+        bindings = parseTemplateBindings("#a; #b;");
+        expect(keyValues(bindings)).toEqual(['#a=\$implicit', '#b=\$implicit']);
 
         bindings = parseTemplateBindings("var i-a = k-a");
         expect(keyValues(bindings)).toEqual(['#i-a=k-a']);