Merge pull request #865 from bmish/refactor-rename-ember-extend-object

Rename util function to `isExtendObject`
ember-cli · Jun 22, 2020 · 73016a9 · 73016a9
2 parents 52e0989 + c35c84a
commit 73016a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/lib/rules/avoid-leaking-state-in-ember-objects.js b/lib/rules/avoid-leaking-state-in-ember-objects.js
@@ -80,7 +80,7 @@ module.exports = {
 
     return {
       CallExpression(node) {
-        if (!(ember.isEmberObject(node) || ember.isReopenObject(node))) {
+        if (!(ember.isExtendObject(node) || ember.isReopenObject(node))) {
           return;
         }
 

diff --git a/lib/utils/ember.js b/lib/utils/ember.js
@@ -55,8 +55,7 @@ module.exports = {
   unwrapBraceExpressions,
   hasDuplicateDependentKeys,
 
-  isEmberObject,
-
+  isExtendObject,
   isReopenObject,
   isReopenClassObject,
 
@@ -78,7 +77,7 @@ const CORE_MODULE_IMPORT_PATHS = {
 };
 
 function isClassicEmberCoreModule(node, module, filePath) {
-  const isExtended = isEmberObject(node);
+  const isExtended = isExtendObject(node);
   let isModuleByPath;
 
   if (filePath) {
@@ -143,7 +142,7 @@ function isModule(node, element, module) {
 }
 
 function isDSModel(node, filePath) {
-  const isExtended = isEmberObject(node);
+  const isExtended = isExtendObject(node);
   let isModuleByPath = false;
 
   if (filePath && isExtended) {
@@ -182,7 +181,7 @@ function isMirageConfig(fileName) {
   return fileName.endsWith(path.join('mirage', 'config.js'));
 }
 
-function isEmberObject(node) {
+function isExtendObject(node) {
   return (
     node.callee.property &&
     (node.callee.property.name === 'extend' || node.callee.property.value === 'extend')
@@ -535,7 +534,7 @@ function unwrapBraceExpressions(dependentKeys) {
 
 function isEmberObjectImplementingUnknownProperty(node) {
   if (types.isCallExpression(node)) {
-    if (!isEmberObject(node) && !isReopenObject(node)) {
+    if (!isExtendObject(node) && !isReopenObject(node)) {
       return false;
     }
     // Classic class.