refactor(ivy): rename stylingProp => styleProp (angular#26149)

matsko · alxhub · commit c51331689f45 · 2018-10-01T09:35:22.000-07:00
PR Close angular#26149
diff --git a/modules/benchmarks/src/largetable/render3/table.ts b/modules/benchmarks/src/largetable/render3/table.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ɵRenderFlags, ɵbind, ɵcontainer, ɵcontainerRefreshEnd, ɵcontainerRefreshStart, ɵdefineComponent, ɵdetectChanges, ɵelementEnd, ɵelementStart, ɵelementStyling, ɵelementStylingProp, ɵembeddedViewEnd, ɵembeddedViewStart, ɵtext, ɵtextBinding as ɵtextBinding} from '@angular/core';
+import {ɵRenderFlags, ɵbind, ɵcontainer, ɵcontainerRefreshEnd, ɵcontainerRefreshStart, ɵdefineComponent, ɵdetectChanges, ɵelementEnd, ɵelementStart, ɵelementStyleProp, ɵelementStyling, ɵembeddedViewEnd, ɵembeddedViewStart, ɵtext, ɵtextBinding as ɵtextBinding} from '@angular/core';
 import {ComponentDefInternal} from '@angular/core/src/render3/interfaces/definition';
 
 import {TableCell, buildTable, emptyTable} from '../util';
@@ -55,7 +55,7 @@ export class LargeTableComponent {
                         ɵelementEnd();
                       }
                       if (rf2 & ɵRenderFlags.Update) {
-                        ɵelementStylingProp(0, 0, null, cell.row % 2 ? '' : 'grey');
+                        ɵelementStyleProp(0, 0, null, cell.row % 2 ? '' : 'grey');
                         ɵtextBinding(1, ɵbind(cell.value));
                       }
                     }
diff --git a/modules/benchmarks/src/tree/render3/tree.ts b/modules/benchmarks/src/tree/render3/tree.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ɵRenderFlags, ɵbind, ɵcontainer, ɵcontainerRefreshEnd, ɵcontainerRefreshStart, ɵdefineComponent, ɵdetectChanges, ɵelementEnd, ɵelementProperty, ɵelementStart, ɵelementStyling as s, ɵelementStylingProp, ɵembeddedViewEnd, ɵembeddedViewStart, ɵinterpolation1, ɵtext, ɵtextBinding as ɵtextBinding} from '@angular/core';
+import {ɵRenderFlags, ɵbind, ɵcontainer, ɵcontainerRefreshEnd, ɵcontainerRefreshStart, ɵdefineComponent, ɵdetectChanges, ɵelementEnd, ɵelementProperty, ɵelementStart, ɵelementStyleProp, ɵelementStyling as s, ɵembeddedViewEnd, ɵembeddedViewStart, ɵinterpolation1, ɵtext, ɵtextBinding as ɵtextBinding} from '@angular/core';
 
 import {TreeNode, buildTree, emptyTree} from '../util';
 
@@ -50,7 +50,7 @@ export class TreeComponent {
         ɵcontainer(3);
       }
       if (rf & ɵRenderFlags.Update) {
-        ɵelementStylingProp(0, 0, ctx.data.depth % 2 ? '' : 'grey');
+        ɵelementStyleProp(0, 0, ctx.data.depth % 2 ? '' : 'grey');
         ɵtextBinding(1, ɵinterpolation1(' ', ctx.data.value, ' '));
         ɵcontainerRefreshStart(2);
         {
@@ -127,7 +127,7 @@ export function TreeTpl(rf: ɵRenderFlags, ctx: TreeNode) {
     ɵelementEnd();
   }
   if (rf & ɵRenderFlags.Update) {
-    ɵelementStylingProp(1, 0, ctx.depth % 2 ? '' : 'grey');
+    ɵelementStyleProp(1, 0, ctx.depth % 2 ? '' : 'grey');
     ɵtextBinding(2, ɵinterpolation1(' ', ctx.value, ' '));
     ɵcontainerRefreshStart(3);
     {
diff --git a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
@@ -425,7 +425,7 @@ describe('compiler compliance', () => {
                 $r3$.ɵelementEnd();
               }
               if (rf & 2) {
-                $r3$.ɵelementStylingProp(0, 0, ctx.color);
+                $r3$.ɵelementStyleProp(0, 0, ctx.color);
                 $r3$.ɵelementClassProp(0, 0, ctx.error);
                 $r3$.ɵelementStylingApply(0);
               }
@@ -674,10 +674,10 @@ describe('compiler compliance', () => {
         MyComponent.ngComponentDef = $r3$.ɵdefineComponent({
           type: MyComponent,
           selectors: [["my-component"]],
-          factory: function MyComponent_Factory(t) { 
+          factory: function MyComponent_Factory(t) {
              return new (t || MyComponent)(
-                $r3$.ɵdirectiveInject(ElementRef), $r3$.ɵdirectiveInject(ViewContainerRef), 
-                $r3$.ɵdirectiveInject(ChangeDetectorRef)); 
+                $r3$.ɵdirectiveInject(ElementRef), $r3$.ɵdirectiveInject(ViewContainerRef),
+                $r3$.ɵdirectiveInject(ChangeDetectorRef));
           },
           features: [$r3$.ɵPublicFeature],
           consts: 0,
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
@@ -315,8 +315,8 @@ describe('compiler compliance: styling', () => {
                 }
                 if (rf & 2) {
                   $r3$.ɵelementStylingMap(0, null, $ctx$.myStyleExp);
-                  $r3$.ɵelementStylingProp(0, 1, $ctx$.myWidth);
-                  $r3$.ɵelementStylingProp(0, 2, $ctx$.myHeight);
+                  $r3$.ɵelementStyleProp(0, 1, $ctx$.myWidth);
+                  $r3$.ɵelementStyleProp(0, 2, $ctx$.myHeight);
                   $r3$.ɵelementStylingApply(0);
                   $r3$.ɵelementAttribute(0, "style", $r3$.ɵbind("border-width: 10px"), $r3$.ɵsanitizeStyle);
                 }
@@ -373,7 +373,7 @@ describe('compiler compliance: styling', () => {
                 $r3$.ɵelementEnd();
               }
               if (rf & 2) {
-                $r3$.ɵelementStylingProp(0, 0, ctx.myImage);
+                $r3$.ɵelementStyleProp(0, 0, ctx.myImage);
                 $r3$.ɵelementStylingApply(0);
               }
             }
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
@@ -43,7 +43,7 @@ export class Identifiers {
 
   static elementStylingMap: o.ExternalReference = {name: 'ɵelementStylingMap', moduleName: CORE};
 
-  static elementStyleProp: o.ExternalReference = {name: 'ɵelementStylingProp', moduleName: CORE};
+  static elementStyleProp: o.ExternalReference = {name: 'ɵelementStyleProp', moduleName: CORE};
 
   static elementStylingApply:
       o.ExternalReference = {name: 'ɵelementStylingApply', moduleName: CORE};
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
@@ -89,7 +89,7 @@ export {
   elementAttribute as ɵelementAttribute,
   elementStyling as ɵelementStyling,
   elementStylingMap as ɵelementStylingMap,
-  elementStyleProp as ɵelementStylingProp,
+  elementStyleProp as ɵelementStyleProp,
   elementStylingApply as ɵelementStylingApply,
   elementClassProp as ɵelementClassProp,
   textBinding as ɵtextBinding,
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
@@ -92,7 +92,7 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵreference': r3.reference,
   'ɵelementStyling': r3.elementStyling,
   'ɵelementStylingMap': r3.elementStylingMap,
-  'ɵelementStylingProp': r3.elementStyleProp,
+  'ɵelementStyleProp': r3.elementStyleProp,
   'ɵelementStylingApply': r3.elementStylingApply,
   'ɵtemplate': r3.template,
   'ɵtext': r3.text,
diff --git a/packages/core/test/render3/compiler_canonical/elements_spec.ts b/packages/core/test/render3/compiler_canonical/elements_spec.ts
@@ -345,8 +345,8 @@ describe('elements', () => {
               $r3$.ɵelementEnd();
             }
             if (rf & 2) {
-              $r3$.ɵelementStylingProp(0, 0, ctx.someColor);
-              $r3$.ɵelementStylingProp(0, 1, ctx.someWidth, 'px');
+              $r3$.ɵelementStyleProp(0, 0, ctx.someColor);
+              $r3$.ɵelementStyleProp(0, 1, ctx.someWidth, 'px');
               $r3$.ɵelementStylingApply(0);
             }
           }
diff --git a/packages/core/test/render3/compiler_canonical/sanitize_spec.ts b/packages/core/test/render3/compiler_canonical/sanitize_spec.ts
@@ -53,7 +53,7 @@ describe('compiler sanitization', () => {
           if (rf & 2) {
             $r3$.ɵelementProperty(0, 'innerHTML', $r3$.ɵbind(ctx.innerHTML), $r3$.ɵsanitizeHtml);
             $r3$.ɵelementProperty(0, 'hidden', $r3$.ɵbind(ctx.hidden));
-            $r3$.ɵelementStylingProp(0, 0, ctx.style);
+            $r3$.ɵelementStyleProp(0, 0, ctx.style);
             $r3$.ɵelementStylingApply(0);
             $r3$.ɵelementProperty(1, 'src', $r3$.ɵbind(ctx.url), $r3$.ɵsanitizeUrl);
             $r3$.ɵelementAttribute(1, 'srcset', $r3$.ɵbind(ctx.url), $r3$.ɵsanitizeUrl);

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* found in the LICENSE file at https://angular.io/license`
`7`	`7`	`*/`
`8`	`8`
`9`		`-import {ɵRenderFlags, ɵbind, ɵcontainer, ɵcontainerRefreshEnd, ɵcontainerRefreshStart, ɵdefineComponent, ɵdetectChanges, ɵelementEnd, ɵelementStart, ɵelementStyling, ɵelementStylingProp, ɵembeddedViewEnd, ɵembeddedViewStart, ɵtext, ɵtextBinding as ɵtextBinding} from '@angular/core';`
	`9`	`+import {ɵRenderFlags, ɵbind, ɵcontainer, ɵcontainerRefreshEnd, ɵcontainerRefreshStart, ɵdefineComponent, ɵdetectChanges, ɵelementEnd, ɵelementStart, ɵelementStyleProp, ɵelementStyling, ɵembeddedViewEnd, ɵembeddedViewStart, ɵtext, ɵtextBinding as ɵtextBinding} from '@angular/core';`
`10`	`10`	`import {ComponentDefInternal} from '@angular/core/src/render3/interfaces/definition';`
`11`	`11`
`12`	`12`	`import {TableCell, buildTable, emptyTable} from '../util';`
`@@ -55,7 +55,7 @@ export class LargeTableComponent {`
`55`	`55`	`ɵelementEnd();`
`56`	`56`	`}`
`57`	`57`	`if (rf2 & ɵRenderFlags.Update) {`
`58`		`- ɵelementStylingProp(0, 0, null, cell.row % 2 ? '' : 'grey');`
	`58`	`+ ɵelementStyleProp(0, 0, null, cell.row % 2 ? '' : 'grey');`
`59`	`59`	`ɵtextBinding(1, ɵbind(cell.value));`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -315,8 +315,8 @@ describe('compiler compliance: styling', () => {`
`315`	`315`	`}`
`316`	`316`	`if (rf & 2) {`
`317`	`317`	`$r3$.ɵelementStylingMap(0, null, $ctx$.myStyleExp);`
`318`		`- $r3$.ɵelementStylingProp(0, 1, $ctx$.myWidth);`
`319`		`- $r3$.ɵelementStylingProp(0, 2, $ctx$.myHeight);`
	`318`	`+ $r3$.ɵelementStyleProp(0, 1, $ctx$.myWidth);`
	`319`	`+ $r3$.ɵelementStyleProp(0, 2, $ctx$.myHeight);`
`320`	`320`	`$r3$.ɵelementStylingApply(0);`
`321`	`321`	`$r3$.ɵelementAttribute(0, "style", $r3$.ɵbind("border-width: 10px"), $r3$.ɵsanitizeStyle);`
`322`	`322`	`}`
`@@ -373,7 +373,7 @@ describe('compiler compliance: styling', () => {`
`373`	`373`	`$r3$.ɵelementEnd();`
`374`	`374`	`}`
`375`	`375`	`if (rf & 2) {`
`376`		`- $r3$.ɵelementStylingProp(0, 0, ctx.myImage);`
	`376`	`+ $r3$.ɵelementStyleProp(0, 0, ctx.myImage);`
`377`	`377`	`$r3$.ɵelementStylingApply(0);`
`378`	`378`	`}`
`379`	`379`	`}`
Original file line number	Diff line number	Diff line change
`@@ -345,8 +345,8 @@ describe('elements', () => {`
`345`	`345`	`$r3$.ɵelementEnd();`
`346`	`346`	`}`
`347`	`347`	`if (rf & 2) {`
`348`		`- $r3$.ɵelementStylingProp(0, 0, ctx.someColor);`
`349`		`- $r3$.ɵelementStylingProp(0, 1, ctx.someWidth, 'px');`
	`348`	`+ $r3$.ɵelementStyleProp(0, 0, ctx.someColor);`
	`349`	`+ $r3$.ɵelementStyleProp(0, 1, ctx.someWidth, 'px');`
`350`	`350`	`$r3$.ɵelementStylingApply(0);`
`351`	`351`	`}`
`352`	`352`	`}`