Skip to content

Commit 7a185b8

Browse files
author
Robert Jackson
committed
Avoid errors when no predicate is present.
1 parent be26b5e commit 7a185b8

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
(true && !(true) && console.warn('This is deprecated'));
1+
(true && !(true) && console.warn('This is deprecated'));
2+
(true && !(false) && console.warn('Message without predicate'));
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { DEBUG } from '@ember/env-flags';
22
import { deprecate } from '@ember/debug-tools';
33

4-
deprecate('This is deprecated', true);
4+
deprecate('This is deprecated', true);
5+
deprecate('Message without predicate');

fixtures/ember-cli-babel-config/expectation.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ if (true) {
66

77
(true && Ember.warn('This is a warning'));
88
(true && !(foo) && Ember.assert('Hahahaha', false));
9+
(true && !(false) && Ember.assert('without predicate', false));
910
(true && !(true) && Ember.deprecate('This thing is donzo', false, {
1011
id: 'donzo',
1112
until: '4.0.0',

fixtures/ember-cli-babel-config/sample.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ if (DEBUG) {
88
warn('This is a warning');
99

1010
assert('Hahahaha', foo);
11+
assert('without predicate');
1112

1213
deprecate('This thing is donzo', true, {
1314
id: 'donzo',

src/lib/utils/builder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ export default class Builder {
122122
let prefixedIdentifiers = [];
123123

124124
if (options.predicate) {
125-
let predicate = options.predicate(expression, args);
125+
let predicate = options.predicate(expression, args) || t.identifier('false');
126126
let negatedPredicate = t.unaryExpression('!', t.parenthesizedExpression(predicate));
127127
prefixedIdentifiers.push(negatedPredicate);
128128
}

0 commit comments

Comments
 (0)