Skip to content

Commit 96b4f50

Browse files
committed
refactor: improve code formatting and readability
1 parent d11447b commit 96b4f50

File tree

5 files changed

+21
-15
lines changed

5 files changed

+21
-15
lines changed

packages/dogs_generator/lib/analyze/built_interop.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,9 @@ Future<void> writeBuiltInteropConverter(ClassElement2 element,
204204
..body = Code(
205205
"return (${typeRef}Builder()\n${builderElement.getters2.where((element) => element.isPublic && !element.isStatic).mapIndexed((i, e) {
206206
if (listBuilderChecker.isAssignableFromType(e.returnType)) {
207-
var innerType =
208-
e.returnType.asInstanceOf2(listBuilderInterface)!.typeArguments[0];
207+
var innerType = e.returnType
208+
.asInstanceOf2(listBuilderInterface)!
209+
.typeArguments[0];
209210
return "..${e.displayName} = list[$i] == null ? null : gen.ListBuilder<${codeContext.typeName(innerType)}>(list[$i])";
210211
} else if (setBuilderChecker.isAssignableFromType(e.returnType)) {
211212
var innerType =

packages/dogs_generator/lib/analyze/introspect.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ String getStructureMetadataSourceArray(Element2 element) {
6767
throw ArgumentError.value(element, "element", "Element is not Annotatable");
6868
}
6969
var annotatable = element as Annotatable;
70-
for (var value in annotatable.metadata2.annotations.whereTypeChecker(conditionChecker)) {
70+
for (var value
71+
in annotatable.metadata2.annotations.whereTypeChecker(conditionChecker)) {
7172
annotations.add(value.toSource().substring(1));
7273
}
7374
return "[${annotations.join(", ")}]";
@@ -83,7 +84,8 @@ String getStructureMetadataSourceArrayAliased(
8384
var annotatable = element as Annotatable;
8485

8586
var annotations = <String>[];
86-
for (var value in annotatable.metadata2.annotations.whereTypeChecker(conditionChecker)) {
87+
for (var value
88+
in annotatable.metadata2.annotations.whereTypeChecker(conditionChecker)) {
8789
var cszp = "$szPrefix${counter.getAndIncrement()}";
8890
var import = AliasImport.library(
8991
(value.element2 as ConstructorElement2).library2, cszp);

packages/dogs_generator/lib/analyze/structurize.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ Future<StructurizeResult> structurizeConstructor(
142142
fieldType = e.type;
143143
fieldElement = e.field2;
144144
} else if (e is SuperFormalParameterElement2) {
145-
FieldFormalParameterElement2 resolveUntilFieldFormal(FormalParameterElement e) {
145+
FieldFormalParameterElement2 resolveUntilFieldFormal(
146+
FormalParameterElement e) {
146147
if (e is FieldFormalParameterElement2) return e;
147148
if (e is SuperFormalParameterElement2) {
148149
return resolveUntilFieldFormal(e.superConstructorParameter2!);
@@ -157,7 +158,8 @@ Future<StructurizeResult> structurizeConstructor(
157158
} else {
158159
var parameterType = e.type;
159160
var namedField = element.getField2(e.displayName);
160-
var namedGetter = element.lookUpGetter2(name: e.displayName, library: element.library2);
161+
var namedGetter =
162+
element.lookUpGetter2(name: e.displayName, library: element.library2);
161163
if (namedField != null && namedGetter == null) {
162164
fieldName = e.displayName;
163165
fieldType = namedField.type;

packages/dogs_generator/lib/builders/converter_builder.dart

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,13 @@ class ConverterBuilder extends DogsAdapter<Serializable> {
3030
var emitter = DartEmitter();
3131
var converterName = "${element.displayName}Converter";
3232

33-
String serialName = element.displayName!;
33+
String serialName = element.displayName;
3434
serialName = settings.nameCase.recase(serialName);
3535

3636
var serializableValue = serializableChecker.firstAnnotationOf(element);
3737
if (serializableValue != null) {
38-
var serialNameOverride = serializableValue.getField("serialName")?.toStringValue();
38+
var serialNameOverride =
39+
serializableValue.getField("serialName")?.toStringValue();
3940
if (serialNameOverride != null) serialName = serialNameOverride;
4041
}
4142

@@ -71,8 +72,8 @@ class ConverterBuilder extends DogsAdapter<Serializable> {
7172
"$genAlias.GeneratedEnumDogConverter<${codeContext.typeName(element.thisType)}>");
7273

7374
builder.constructors.add(Constructor((builder) => builder
74-
..initializers.add(Code(
75-
"super.structured(serialName: '$serialName')"))));
75+
..initializers
76+
.add(Code("super.structured(serialName: '$serialName')"))));
7677

7778
builder.methods.add(Method((builder) => builder
7879
..name = "values"
@@ -134,13 +135,13 @@ class ConverterBuilder extends DogsAdapter<Serializable> {
134135
StructurizeResult structurized;
135136
if (constructor != null && constructor.formalParameters.isNotEmpty) {
136137
// Create constructor based serializable
137-
structurized = await structurizeConstructor(
138-
element.thisType, settings, constructor, genContext, codeContext.cachedCounter);
138+
structurized = await structurizeConstructor(element.thisType, settings,
139+
constructor, genContext, codeContext.cachedCounter);
139140
codeContext.additionalImports.addAll(structurized.imports);
140141
} else if (constructor != null) {
141142
// Create bean like property based serializable
142-
structurized = await structurizeBean(
143-
element.thisType, settings, element, genContext, codeContext.cachedCounter);
143+
structurized = await structurizeBean(element.thisType, settings, element,
144+
genContext, codeContext.cachedCounter);
144145
codeContext.additionalImports.addAll(structurized.imports);
145146
writeBeanFactory(element, structurized, codeContext);
146147
} else {

packages/dogs_generator/lib/settings.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,4 @@ enum CasingType {
9191
return ReCase(input).paramCase;
9292
}
9393
}
94-
}
94+
}

0 commit comments

Comments
 (0)