fix(compiler): handle trailing comma in object literal (#49535)

crisbeto · atscott · commit c3cff3586964 · 2023-03-23T11:35:45.000-07:00
Fixes that the compiler wasn't parsing an object literal with a trailing comma correctly. Fixes #49534. PR Close #49535
diff --git a/packages/compiler/src/expression_parser/parser.ts b/packages/compiler/src/expression_parser/parser.ts
@@ -949,7 +949,8 @@ export class _ParseAST {
           values.push(new PropertyRead(
               span, sourceSpan, sourceSpan, new ImplicitReceiver(span, sourceSpan), key));
         }
-      } while (this.consumeOptionalCharacter(chars.$COMMA));
+      } while (this.consumeOptionalCharacter(chars.$COMMA) &&
+               !this.next.isCharacter(chars.$RBRACE));
       this.rbracesExpected--;
       this.expectCharacter(chars.$RBRACE);
     }
diff --git a/packages/compiler/test/expression_parser/parser_spec.ts b/packages/compiler/test/expression_parser/parser_spec.ts
@@ -116,6 +116,7 @@ describe('parser', () => {
         checkAction('{}');
         checkAction('{a: 1, "b": 2}[2]');
         checkAction('{}["a"]');
+        checkAction('{a: 1, b: 2,}', '{a: 1, b: 2}');
       });
 
       it('should only allow identifier, string, or keyword as map key', () => {

Original file line number	Diff line number	Diff line change
`@@ -949,7 +949,8 @@ export class _ParseAST {`
`949`	`949`	`values.push(new PropertyRead(`
`950`	`950`	`span, sourceSpan, sourceSpan, new ImplicitReceiver(span, sourceSpan), key));`
`951`	`951`	`}`
`952`		`- } while (this.consumeOptionalCharacter(chars.$COMMA));`
	`952`	`+ } while (this.consumeOptionalCharacter(chars.$COMMA) &&`
	`953`	`+ !this.next.isCharacter(chars.$RBRACE));`
`953`	`954`	`this.rbracesExpected--;`
`954`	`955`	`this.expectCharacter(chars.$RBRACE);`
`955`	`956`	`}`