From 3cc1d76ee7e64fee74931bb3f07b69765a7b679b Mon Sep 17 00:00:00 2001 From: Chuck Jazdzewski Date: Wed, 31 Jan 2018 13:11:07 -0800 Subject: [PATCH] fix(ivy): generate correct interpolations (#21946) Ivy compile would generate the an incorrect interpolation if there were more than 8 interpolations in a text block. Fixes: #21927 PR Close #21946 --- .../compiler/src/render3/r3_view_compiler.ts | 4 +-- .../test/render3/r3_view_compiler_spec.ts | 31 ++++++++++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/packages/compiler/src/render3/r3_view_compiler.ts b/packages/compiler/src/render3/r3_view_compiler.ts index 4b60e9048f..3b9f74a8f2 100644 --- a/packages/compiler/src/render3/r3_view_compiler.ts +++ b/packages/compiler/src/render3/r3_view_compiler.ts @@ -174,9 +174,9 @@ function interpolate(args: o.Expression[]): o.Expression { case 17: return o.importExpr(R3.bind8).callFn(args); } - (args.length > 19 && args.length % 2 == 1) || + (args.length >= 19 && args.length % 2 == 1) || error(`Invalid interpolation argument length ${args.length}`); - return o.importExpr(R3.bindV).callFn(args); + return o.importExpr(R3.bindV).callFn([o.literalArr(args)]); } class BindingScope { diff --git a/packages/compiler/test/render3/r3_view_compiler_spec.ts b/packages/compiler/test/render3/r3_view_compiler_spec.ts index 478bb86145..1c9ec8afce 100644 --- a/packages/compiler/test/render3/r3_view_compiler_spec.ts +++ b/packages/compiler/test/render3/r3_view_compiler_spec.ts @@ -100,6 +100,35 @@ describe('r3_view_compiler', () => { expect(result.source).toContain('@angular/core'); }); + describe('interpolations', () => { + // Regression #21927 + it('should generate a correct call to bV with more than 8 interpolations', () => { + const files: MockDirectory = { + app: { + 'example.ts': ` + import {Component, NgModule} from '@angular/core'; + + @Component({ + selector: 'my-app', + template: ' {{list[0]}} {{list[1]}} {{list[2]}} {{list[3]}} {{list[4]}} {{list[5]}} {{list[6]}} {{list[7]}} {{list[8]}} ' + }) + export class MyApp implements OnInit { + list: any[] = []; + } + + @NgModule({declarations: [MyApp]}) + export class MyModule {}` + } + }; + + const bV_call = `IDENT.ɵbV([' ',ctx.list[0],' ',ctx.list[1],' ',ctx.list[2],' ',ctx.list[3], + ' ',ctx.list[4],' ',ctx.list[5],' ',ctx.list[6],' ',ctx.list[7],' ',ctx.list[8], + ' '])`; + const result = compile(files, angularFiles); + expectEmit(result.source, bV_call, 'Incorrect bV call'); + }); + }); + /* These tests are codified version of the tests in compiler_canonical_spec.ts. Every * test in compiler_canonical_spec.ts should have a corresponding test here. */ @@ -696,7 +725,7 @@ function expectEmit(source: string, emitted: string, description: string) { } } fail( - 'Test helper failure: Expected expression failed but the reporting logic could not find where it failed'); + `Test helper failure: Expected expression failed but the reporting logic could not find where it failed in: ${source}`); } }