Use specific messages for specific reasons the expansion stopped working

emberjs · May 8, 2017 · d9217ed · d9217ed
1 parent 9c00ab2
commit d9217ed
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/packages/ember-metal/lib/expand_properties.js b/packages/ember-metal/lib/expand_properties.js
@@ -64,8 +64,7 @@ export default function expandProperties(pattern, callback) {
     })(pattern));
 
   warn(
-    `You used the key "${pattern}" which is invalid and is not longer expanding on Ember 2.13.`,
-    ((str) => {
+    ...((str, opts) => {
       let inBrace = 0;
       let char;
       for (let i = 0; i < str.length; i++) {
@@ -76,16 +75,28 @@ export default function expandProperties(pattern, callback) {
         } else if (char === '}') {
           inBrace--;
         } else if (char === ',' && inBrace === 0) {
-          return false;
+          return [
+            `You are using a comma outside braces in ${str} that was unintentionally being expanded. This property will no longer expand on Ember 2.13.`,
+            false,
+            opts
+          ];
         }
 
         if (inBrace > 1 || inBrace < 0) {
-          return false;
+          return [
+            `You have nested or unbalanced properties in ${str} that was unintentionally being expanded. This property will no longer expand on Ember 2.13.`,
+            false,
+            opts
+          ];
         }
       }
 
-      return inBrace === 0;
-    })(pattern), { id: 'ember-metal.invalid-expand-properties' });
+      return [
+        `The property ${str} ended with unbalanced braces. This property will no longer expand on Ember 2.13.`,
+        inBrace === 0,
+        opts
+      ];
+    })(pattern, { id: 'ember-metal.invalid-expand-properties' }));
 
   let parts = pattern.split(SPLIT_REGEX);
   let properties = [parts];

diff --git a/packages/ember-metal/tests/expand_properties_test.js b/packages/ember-metal/tests/expand_properties_test.js
@@ -107,7 +107,7 @@ QUnit.test('unbalanced braces are warned', function() {
   invalidBraceProperties.forEach((invalidProperties) =>
     expectWarning(() => {
       expandProperties(invalidProperties, addProperty)
-    }, / which is invalid and is not longer expanding on Ember 2\.13\./)
+    }, / no longer expand on Ember 2\.13\./)
   );
 });