From 60800da6c17bb20000a06d5c3374eeedf98235ee Mon Sep 17 00:00:00 2001 From: JoostK Date: Mon, 12 Nov 2018 00:46:02 +0100 Subject: [PATCH] fix(ivy): export elementContainerStart/End instructions (#27053) PR Close #27053 --- .../test/compliance/r3_compiler_compliance_spec.ts | 8 ++++---- packages/compiler/src/render3/r3_identifiers.ts | 6 ++++-- packages/core/src/core_render3_private_export.ts | 2 ++ packages/core/src/render3/jit/environment.ts | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts index 0e4f2a976d..9c0df84d5c 100644 --- a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts +++ b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts @@ -244,12 +244,12 @@ describe('compiler compliance', () => { … template: function MyComponent_Template(rf, ctx) { if (rf & 1) { - i0.ɵEC(0); + i0.ɵelementContainerStart(0); i0.ɵelementStart(1, "span"); i0.ɵtext(2, "in a "); i0.ɵelementEnd(); i0.ɵtext(3, "container"); - i0.ɵeC(); + i0.ɵelementContainerEnd(); } } `; @@ -281,8 +281,8 @@ describe('compiler compliance', () => { … template: function MyComponent_Template(rf, ctx) { if (rf & 1) { - i0.ɵEC(0); - i0.ɵeC(); + i0.ɵelementContainerStart(0); + i0.ɵelementContainerEnd(); } } `; diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts index ab4bfe494e..dc33e750a6 100644 --- a/packages/compiler/src/render3/r3_identifiers.ts +++ b/packages/compiler/src/render3/r3_identifiers.ts @@ -35,9 +35,11 @@ export class Identifiers { static elementClassProp: o.ExternalReference = {name: 'ɵelementClassProp', moduleName: CORE}; - static elementContainerStart: o.ExternalReference = {name: 'ɵEC', moduleName: CORE}; + static elementContainerStart: + o.ExternalReference = {name: 'ɵelementContainerStart', moduleName: CORE}; - static elementContainerEnd: o.ExternalReference = {name: 'ɵeC', moduleName: CORE}; + static elementContainerEnd: + o.ExternalReference = {name: 'ɵelementContainerEnd', moduleName: CORE}; static elementStyling: o.ExternalReference = {name: 'ɵelementStyling', moduleName: CORE}; diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts index 7c0952b012..228e36c58c 100644 --- a/packages/core/src/core_render3_private_export.ts +++ b/packages/core/src/core_render3_private_export.ts @@ -89,6 +89,8 @@ export { enableBindings as ɵenableBindings, disableBindings as ɵdisableBindings, elementAttribute as ɵelementAttribute, + elementContainerStart as ɵelementContainerStart, + elementContainerEnd as ɵelementContainerEnd, elementStyling as ɵelementStyling, elementStylingMap as ɵelementStylingMap, elementStyleProp as ɵelementStyleProp, diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts index 006020cf9f..e42e711305 100644 --- a/packages/core/src/render3/jit/environment.ts +++ b/packages/core/src/render3/jit/environment.ts @@ -49,8 +49,8 @@ export const angularCoreEnv: {[name: string]: Function} = { 'ɵelementStart': r3.elementStart, 'ɵelementEnd': r3.elementEnd, 'ɵelement': r3.element, - 'ɵEC': r3.elementContainerStart, - 'ɵeC': r3.elementContainerEnd, + 'ɵelementContainerStart': r3.elementContainerStart, + 'ɵelementContainerEnd': r3.elementContainerEnd, 'ɵpureFunction0': r3.pureFunction0, 'ɵpureFunction1': r3.pureFunction1, 'ɵpureFunction2': r3.pureFunction2,