Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RDART-992: Handle Identifer expression as well #1612

Merged
merged 2 commits into from
Apr 2, 2024
Merged

RDART-992: Handle Identifer expression as well #1612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fa2659
Handle Identifer expression as well
nielsenko Apr 2, 2024
90d33ff
Fix expected output for const_initializer test
nielsenko Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/realm_generator/lib/src/field_element_ex.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ extension FieldElementEx on FieldElement {
ParenthesizedExpression i => _isValidFieldInitializer(i.expression),
PrefixExpression e => _isValidFieldInitializer(e.operand),
BinaryExpression b => _isValidFieldInitializer(b.leftOperand) && _isValidFieldInitializer(b.rightOperand),
Identifier i => (i.staticElement as PropertyAccessorElement?)?.variable.isConst ?? false,
_ => false,
};
}
Expand Down
7 changes: 7 additions & 0 deletions packages/realm_generator/test/good_test_data/const_initializer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import 'package:realm_common/realm_common.dart';

part 'const_initializer.realm.dart';

const myConst = 1;

@RealmModel()
class _ConstInitializer {
int zero = 0;
Expand All @@ -10,6 +12,11 @@ class _ConstInitializer {
int parenthesis = (1);
int minusMinusOne = -(-1);
int add = 1 + 1;
int identifier = myConst;

double infinity = double.infinity;
double nan = double.nan;
double negativeInfinity = double.negativeInfinity;

String fooEnv = const String.fromEnvironment('FOO');
String fooLit = 'foo';
Expand Down
51 changes: 51 additions & 0 deletions packages/realm_generator/test/good_test_data/const_initializer.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ class ConstInitializer extends _ConstInitializer
int parenthesis = (1),
int minusMinusOne = -(-1),
int add = 1 + 1,
int identifier = myConst,
double infinity = double.infinity,
double nan = double.nan,
double negativeInfinity = double.negativeInfinity,
String fooEnv = const String.fromEnvironment('FOO'),
String fooLit = 'foo',
Iterable<int> constEmptyList = const [],
Expand All @@ -35,6 +39,10 @@ class ConstInitializer extends _ConstInitializer
'parenthesis': (1),
'minusMinusOne': -(-1),
'add': 1 + 1,
'identifier': myConst,
'infinity': double.infinity,
'nan': double.nan,
'negativeInfinity': double.negativeInfinity,
'fooEnv': const String.fromEnvironment('FOO'),
'fooLit': 'foo',
});
Expand All @@ -45,6 +53,10 @@ class ConstInitializer extends _ConstInitializer
RealmObjectBase.set(this, 'parenthesis', parenthesis);
RealmObjectBase.set(this, 'minusMinusOne', minusMinusOne);
RealmObjectBase.set(this, 'add', add);
RealmObjectBase.set(this, 'identifier', identifier);
RealmObjectBase.set(this, 'infinity', infinity);
RealmObjectBase.set(this, 'nan', nan);
RealmObjectBase.set(this, 'negativeInfinity', negativeInfinity);
RealmObjectBase.set(this, 'fooEnv', fooEnv);
RealmObjectBase.set(this, 'fooLit', fooLit);
RealmObjectBase.set<RealmList<int>>(
Expand Down Expand Up @@ -95,6 +107,29 @@ class ConstInitializer extends _ConstInitializer
@override
set add(int value) => RealmObjectBase.set(this, 'add', value);

@override
int get identifier => RealmObjectBase.get<int>(this, 'identifier') as int;
@override
set identifier(int value) => RealmObjectBase.set(this, 'identifier', value);

@override
double get infinity =>
RealmObjectBase.get<double>(this, 'infinity') as double;
@override
set infinity(double value) => RealmObjectBase.set(this, 'infinity', value);

@override
double get nan => RealmObjectBase.get<double>(this, 'nan') as double;
@override
set nan(double value) => RealmObjectBase.set(this, 'nan', value);

@override
double get negativeInfinity =>
RealmObjectBase.get<double>(this, 'negativeInfinity') as double;
@override
set negativeInfinity(double value) =>
RealmObjectBase.set(this, 'negativeInfinity', value);

@override
String get fooEnv => RealmObjectBase.get<String>(this, 'fooEnv') as String;
@override
Expand Down Expand Up @@ -163,6 +198,10 @@ class ConstInitializer extends _ConstInitializer
'parenthesis': parenthesis.toEJson(),
'minusMinusOne': minusMinusOne.toEJson(),
'add': add.toEJson(),
'identifier': identifier.toEJson(),
'infinity': infinity.toEJson(),
'nan': nan.toEJson(),
'negativeInfinity': negativeInfinity.toEJson(),
'fooEnv': fooEnv.toEJson(),
'fooLit': fooLit.toEJson(),
'constEmptyList': constEmptyList.toEJson(),
Expand All @@ -184,6 +223,10 @@ class ConstInitializer extends _ConstInitializer
'parenthesis': EJsonValue parenthesis,
'minusMinusOne': EJsonValue minusMinusOne,
'add': EJsonValue add,
'identifier': EJsonValue identifier,
'infinity': EJsonValue infinity,
'nan': EJsonValue nan,
'negativeInfinity': EJsonValue negativeInfinity,
'fooEnv': EJsonValue fooEnv,
'fooLit': EJsonValue fooLit,
'constEmptyList': EJsonValue constEmptyList,
Expand All @@ -200,6 +243,10 @@ class ConstInitializer extends _ConstInitializer
parenthesis: fromEJson(parenthesis),
minusMinusOne: fromEJson(minusMinusOne),
add: fromEJson(add),
identifier: fromEJson(identifier),
infinity: fromEJson(infinity),
nan: fromEJson(nan),
negativeInfinity: fromEJson(negativeInfinity),
fooEnv: fromEJson(fooEnv),
fooLit: fromEJson(fooLit),
constEmptyList: fromEJson(constEmptyList),
Expand All @@ -224,6 +271,10 @@ class ConstInitializer extends _ConstInitializer
SchemaProperty('parenthesis', RealmPropertyType.int),
SchemaProperty('minusMinusOne', RealmPropertyType.int),
SchemaProperty('add', RealmPropertyType.int),
SchemaProperty('identifier', RealmPropertyType.int),
SchemaProperty('infinity', RealmPropertyType.double),
SchemaProperty('nan', RealmPropertyType.double),
SchemaProperty('negativeInfinity', RealmPropertyType.double),
SchemaProperty('fooEnv', RealmPropertyType.string),
SchemaProperty('fooLit', RealmPropertyType.string),
SchemaProperty('constEmptyList', RealmPropertyType.int,
Expand Down
Loading