Skip to content

Commit 5960541

Browse files
committed
refactor(nextcloud): Generate correctly formatted WebDAV props code
Signed-off-by: provokateurin <kate@provokateurin.de>
1 parent f7dddf9 commit 5960541

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

packages/nextcloud/generate_props.dart

+18-7
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,21 @@ void main() {
5050

5151
final namespaceVariable = convertNamespace(namespacePrefix);
5252
final variable = namespacePrefix + name.toLowerCase().replaceAll(RegExp('[^a-z]'), '');
53-
valueProps.add(
54-
"@annotation.XmlElement(name: '$name', namespace: $namespaceVariable, includeIfNull: false,)\n final $type? $variable;",
55-
);
56-
findProps.add(
57-
"@annotation.XmlElement(name: '$name', namespace: $namespaceVariable, includeIfNull: true, isSelfClosing: true,)\n final List<String?>? $variable;",
58-
);
53+
valueProps.add('''
54+
@annotation.XmlElement(
55+
name: '$name',
56+
namespace: $namespaceVariable,
57+
includeIfNull: false,
58+
)
59+
final $type? $variable;''');
60+
findProps.add('''
61+
@annotation.XmlElement(
62+
name: '$name',
63+
namespace: $namespaceVariable,
64+
includeIfNull: true,
65+
isSelfClosing: true,
66+
)
67+
final List<String?>? $variable;''');
5968
variables.add(variable);
6069
}
6170
}
@@ -77,6 +86,7 @@ void main() {
7786
variables,
7887
isPropfind: true,
7988
),
89+
'',
8090
...generateClass(
8191
'WebDavProp',
8292
'prop',
@@ -85,6 +95,7 @@ void main() {
8595
variables,
8696
isPropfind: false,
8797
),
98+
'',
8899
...generateClass(
89100
'WebDavOcFilterRules',
90101
'filter-rules',
@@ -118,7 +129,7 @@ List<String> generateClass(
118129
if (isPropfind) ...[
119130
' const $name.fromBools({',
120131
...variables.map((variable) => ' bool $variable = false,'),
121-
' }) : ${variables.map((variable) => '$variable = $variable ? const [null] : null').join(', ')};',
132+
' }) : ${variables.map((variable) => '$variable = $variable ? const [null] : null').join(',\n ')};',
122133
'',
123134
],
124135
' factory $name.fromXmlElement(XmlElement element) => _\$${name}FromXmlElement(element);',

0 commit comments

Comments
 (0)