style: format

Tienisto · Tienisto · commit 3b0b224c8220 · 2025-11-18T19:22:37.000+01:00
diff --git a/slang/example/lib/i18n/strings_de.g.dart b/slang/example/lib/i18n/strings_de.g.dart
@@ -67,10 +67,6 @@ class _TranslationsMainScreenDe implements TranslationsMainScreenEn {
 /// so the map is split into smaller functions (512 entries each).
 extension on TranslationsDe {
 	dynamic _flatMapFunction(String path) {
-		return _flatMapFunction$0(path);
-	}
-
-	dynamic _flatMapFunction$0(String path) {
 		return switch (path) {
 			'mainScreen.title' => 'Ein deutscher Titel',
 			'mainScreen.counter' => ({required num n}) => (_root.$meta.cardinalResolver ?? PluralResolvers.cardinal('de'))(n, one: 'Du hast einmal gedrückt.', other: 'Du hast ${n} mal gedrückt.', ), 
@@ -82,4 +78,3 @@ extension on TranslationsDe {
 		};
 	}
 }
-
diff --git a/slang/example/lib/i18n/strings_en.g.dart b/slang/example/lib/i18n/strings_en.g.dart
@@ -76,10 +76,6 @@ class TranslationsMainScreenEn {
 /// so the map is split into smaller functions (512 entries each).
 extension on Translations {
 	dynamic _flatMapFunction(String path) {
-		return _flatMapFunction$0(path);
-	}
-
-	dynamic _flatMapFunction$0(String path) {
 		return switch (path) {
 			'mainScreen.title' => 'An English Title',
 			'mainScreen.counter' => ({required num n}) => (_root.$meta.cardinalResolver ?? PluralResolvers.cardinal('en'))(n, one: 'You pressed ${n} time.', other: 'You pressed ${n} times.', ), 
@@ -91,4 +87,3 @@ extension on Translations {
 		};
 	}
 }
-
diff --git a/slang/example/lib/i18n/strings_fr_FR.g.dart b/slang/example/lib/i18n/strings_fr_FR.g.dart
@@ -67,10 +67,6 @@ class _TranslationsMainScreenFrFr implements TranslationsMainScreenEn {
 /// so the map is split into smaller functions (512 entries each).
 extension on TranslationsFrFr {
 	dynamic _flatMapFunction(String path) {
-		return _flatMapFunction$0(path);
-	}
-
-	dynamic _flatMapFunction$0(String path) {
 		return switch (path) {
 			'mainScreen.title' => 'Le titre français',
 			'mainScreen.counter' => ({required num n}) => (_root.$meta.cardinalResolver ?? PluralResolvers.cardinal('fr'))(n, one: 'Vous avez appuyé une fois.', other: 'Vous avez appuyé ${n} fois.', ), 
@@ -82,4 +78,3 @@ extension on TranslationsFrFr {
 		};
 	}
 }
-
diff --git a/slang/lib/src/builder/generator/generate_translation_map.dart b/slang/lib/src/builder/generator/generate_translation_map.dart
@@ -34,9 +34,13 @@ String generateTranslationMap(
 
   // Generate split functions
   for (var i = 0; i < flatListSplits.length; i++) {
-    final returnOrIfNull = switch (i) { 0 => '\t\treturn', _ => ' ??' };
+    if (i == 0) {
+      buffer.write('\t\treturn ');
+    } else {
+      buffer.write(' ?? ');
+    }
 
-    buffer.writeln('$returnOrIfNull switch (path) {');
+    buffer.writeln('switch (path) {');
 
     _generateTranslationMap(
       buffer: buffer,
@@ -45,14 +49,13 @@ String generateTranslationMap(
       language: localeData.locale.language,
     );
 
-    buffer.write('\t\t\t_ => null}');
+    buffer.write('\t\t\t_ => null,\n\t\t}');
   }
 
   buffer.writeln(';');
 
   buffer.writeln('\t}');
-  buffer.writeln('}');
-  buffer.writeln('');
+  buffer.write('}');
 
   return buffer.toString();
 }
diff --git a/slang/test/integration/resources/main/_expected_de.output b/slang/test/integration/resources/main/_expected_de.output
@@ -217,8 +217,7 @@ extension on TranslationsDe {
 			'end.pages.1.with space' => 'Ein Fehler',
 			'end.pages.1.with second space' => 'Ein 2. Fehler',
 			'advancedPlural' => ({required num count, required InlineSpan Function(num) countBuilder, required GenderContext gender}) => RichPluralResolvers.bridge( n: count, resolver: _root.$meta.cardinalResolver ?? PluralResolvers.cardinal('de'), one: () => TextSpan(children: [ const TextSpan(text: 'Eins'), ]), other: () => TextSpan(children: [ const TextSpan(text: 'Andere '), countBuilder(count), TextSpan(text: ', ${_root.onboarding.greet2(gender: gender)}'), ]), ), 
-			_ => null};
+			_ => null,
+		};
 	}
 }
-
-
diff --git a/slang/test/integration/resources/main/_expected_en.output b/slang/test/integration/resources/main/_expected_en.output
@@ -262,8 +262,7 @@ extension on Translations {
 			'end.pages.1.with space' => 'An Error',
 			'end.pages.1.with second space' => 'An 2nd Error',
 			'advancedPlural' => ({required num count, required InlineSpan Function(num) countBuilder, required GenderContext gender}) => RichPluralResolvers.bridge( n: count, resolver: _root.$meta.cardinalResolver ?? PluralResolvers.cardinal('en'), one: () => TextSpan(children: [ const TextSpan(text: 'One'), ]), other: () => TextSpan(children: [ const TextSpan(text: 'Other '), countBuilder(count), TextSpan(text: ', ${_root.onboarding.greet2(gender: gender)}'), ]), ), 
-			_ => null};
+			_ => null,
+		};
 	}
 }
-
-
diff --git a/slang/test/integration/resources/main/_expected_fallback_base_locale_de.output b/slang/test/integration/resources/main/_expected_fallback_base_locale_de.output
@@ -219,8 +219,7 @@ extension on TranslationsDe {
 			'end.pages.1.with space' => 'Ein Fehler',
 			'end.pages.1.with second space' => 'Ein 2. Fehler',
 			'advancedPlural' => ({required num count, required InlineSpan Function(num) countBuilder, required GenderContext gender}) => RichPluralResolvers.bridge( n: count, resolver: _root.$meta.cardinalResolver ?? PluralResolvers.cardinal('de'), one: () => TextSpan(children: [ const TextSpan(text: 'Eins'), ]), other: () => TextSpan(children: [ const TextSpan(text: 'Andere '), countBuilder(count), TextSpan(text: ', ${_root.onboarding.greet2(gender: gender)}'), ]), ), 
-			_ => null};
+			_ => null,
+		};
 	}
 }
-
-
diff --git a/slang/test/integration/resources/main/_expected_fallback_base_locale_en.output b/slang/test/integration/resources/main/_expected_fallback_base_locale_en.output
@@ -262,8 +262,7 @@ extension on Translations {
 			'end.pages.1.with space' => 'An Error',
 			'end.pages.1.with second space' => 'An 2nd Error',
 			'advancedPlural' => ({required num count, required InlineSpan Function(num) countBuilder, required GenderContext gender}) => RichPluralResolvers.bridge( n: count, resolver: _root.$meta.cardinalResolver ?? PluralResolvers.cardinal('en'), one: () => TextSpan(children: [ const TextSpan(text: 'One'), ]), other: () => TextSpan(children: [ const TextSpan(text: 'Other '), countBuilder(count), TextSpan(text: ', ${_root.onboarding.greet2(gender: gender)}'), ]), ), 
-			_ => null};
+			_ => null,
+		};
 	}
 }
-
-
diff --git a/slang/test/integration/resources/main/_expected_fallback_base_locale_special_de.output b/slang/test/integration/resources/main/_expected_fallback_base_locale_special_de.output
@@ -58,8 +58,7 @@ extension on TranslationsDe {
 	dynamic _flatMapFunction(String path) {
 		return switch (path) {
 			'greet' => ({required Gender context}) { switch (context) { case Gender.male: return 'Hallo Herr'; case Gender.female: return 'Hello Mrs'; } }, 
-			_ => null};
+			_ => null,
+		};
 	}
 }
-
-
diff --git a/slang/test/integration/resources/main/_expected_fallback_base_locale_special_en.output b/slang/test/integration/resources/main/_expected_fallback_base_locale_special_en.output
@@ -61,8 +61,7 @@ extension on Translations {
 	dynamic _flatMapFunction(String path) {
 		return switch (path) {
 			'greet' => ({required Gender context}) { switch (context) { case Gender.male: return 'Hello Mr'; case Gender.female: return 'Hello Mrs'; } }, 
-			_ => null};
+			_ => null,
+		};
 	}
 }
-
-
diff --git a/slang/test/integration/resources/main/_expected_obfuscation_de.output b/slang/test/integration/resources/main/_expected_obfuscation_de.output
@@ -219,8 +219,7 @@ extension on TranslationsDe {
 			'end.pages.1.with space' => _root.$meta.d([30, 50, 53, 123, 29, 62, 51, 55, 62, 41]),
 			'end.pages.1.with second space' => _root.$meta.d([30, 50, 53, 123, 105, 117, 123, 29, 62, 51, 55, 62, 41]),
 			'advancedPlural' => ({required num count, required InlineSpan Function(num) countBuilder, required GenderContext gender}) => RichPluralResolvers.bridge( n: count, resolver: _root.$meta.cardinalResolver ?? PluralResolvers.cardinal('de'), one: () => TextSpan(children: [ TextSpan(text: _root.$meta.d([30, 50, 53, 40])), ]), other: () => TextSpan(children: [ TextSpan(text: _root.$meta.d([26, 53, 63, 62, 41, 62, 123])), countBuilder(count), TextSpan(text: _root.$meta.d([119, 123]) + _root.onboarding.greet2(gender: gender)), ]), ), 
-			_ => null};
+			_ => null,
+		};
 	}
 }
-
-
diff --git a/slang/test/integration/resources/main/_expected_obfuscation_en.output b/slang/test/integration/resources/main/_expected_obfuscation_en.output
@@ -263,8 +263,7 @@ extension on Translations {
 			'end.pages.1.with space' => _root.$meta.d([26, 53, 123, 30, 41, 41, 52, 41]),
 			'end.pages.1.with second space' => _root.$meta.d([26, 53, 123, 105, 53, 63, 123, 30, 41, 41, 52, 41]),
 			'advancedPlural' => ({required num count, required InlineSpan Function(num) countBuilder, required GenderContext gender}) => RichPluralResolvers.bridge( n: count, resolver: _root.$meta.cardinalResolver ?? PluralResolvers.cardinal('en'), one: () => TextSpan(children: [ TextSpan(text: _root.$meta.d([20, 53, 62])), ]), other: () => TextSpan(children: [ TextSpan(text: _root.$meta.d([20, 47, 51, 62, 41, 123])), countBuilder(count), TextSpan(text: _root.$meta.d([119, 123]) + _root.onboarding.greet2(gender: gender)), ]), ), 
-			_ => null};
+			_ => null,
+		};
 	}
 }
-
-
diff --git a/slang/test/integration/resources/main/_expected_rich_text.output b/slang/test/integration/resources/main/_expected_rich_text.output
@@ -186,8 +186,7 @@ extension on Translations {
 			'contextWithParameter' => ({required Animal context}) { switch (context) { case Animal.cat: return 'Miaw'; case Animal.dog: return 'Woof ${context}'; } }, 
 			'simpleRichContext' => ({required Animal context}) { switch (context) { case Animal.cat: return TextSpan(children: [ const TextSpan(text: 'Miaw'), ]); case Animal.dog: return TextSpan(children: [ const TextSpan(text: 'Woof'), ]); } }, 
 			'richContextWithParameter' => ({required Animal context, required InlineSpan Function(Animal) contextBuilder}) { switch (context) { case Animal.cat: return TextSpan(children: [ const TextSpan(text: 'Miaw'), ]); case Animal.dog: return TextSpan(children: [ const TextSpan(text: 'Woof '), contextBuilder(context), ]); } }, 
-			_ => null};
+			_ => null,
+		};
 	}
 }
-
-
diff --git a/slang/test/integration/resources/main/_expected_translation_overrides_de.output b/slang/test/integration/resources/main/_expected_translation_overrides_de.output
@@ -226,8 +226,7 @@ extension on TranslationsDe {
 			'end.pages.1.with space' => TranslationOverrides.string(_root.$meta, 'end.pages.1.with space', {}) ?? 'Ein Fehler',
 			'end.pages.1.with second space' => TranslationOverrides.string(_root.$meta, 'end.pages.1.with second space', {}) ?? 'Ein 2. Fehler',
 			'advancedPlural' => ({required num count, required InlineSpan Function(num) countBuilder, required GenderContext gender}) => TranslationOverridesFlutter.richPlural(_root.$meta, 'advancedPlural', {'gender': gender, 'count': count, 'countBuilder': countBuilder}) ?? RichPluralResolvers.bridge( n: count, resolver: _root.$meta.cardinalResolver ?? PluralResolvers.cardinal('de'), one: () => TextSpan(children: [ const TextSpan(text: 'Eins'), ]), other: () => TextSpan(children: [ const TextSpan(text: 'Andere '), countBuilder(count), TextSpan(text: ', ${_root.onboarding.greet2(gender: gender)}'), ]), ), 
-			_ => null};
+			_ => null,
+		};
 	}
 }
-
-
diff --git a/slang/test/integration/resources/main/_expected_translation_overrides_en.output b/slang/test/integration/resources/main/_expected_translation_overrides_en.output
@@ -270,8 +270,7 @@ extension on Translations {
 			'end.pages.1.with space' => TranslationOverrides.string(_root.$meta, 'end.pages.1.with space', {}) ?? 'An Error',
 			'end.pages.1.with second space' => TranslationOverrides.string(_root.$meta, 'end.pages.1.with second space', {}) ?? 'An 2nd Error',
 			'advancedPlural' => ({required num count, required InlineSpan Function(num) countBuilder, required GenderContext gender}) => TranslationOverridesFlutter.richPlural(_root.$meta, 'advancedPlural', {'gender': gender, 'count': count, 'countBuilder': countBuilder}) ?? RichPluralResolvers.bridge( n: count, resolver: _root.$meta.cardinalResolver ?? PluralResolvers.cardinal('en'), one: () => TextSpan(children: [ const TextSpan(text: 'One'), ]), other: () => TextSpan(children: [ const TextSpan(text: 'Other '), countBuilder(count), TextSpan(text: ', ${_root.onboarding.greet2(gender: gender)}'), ]), ), 
-			_ => null};
+			_ => null,
+		};
 	}
 }
-
-

Original file line number	Diff line number	Diff line change
`@@ -217,8 +217,7 @@ extension on TranslationsDe {`
`217`	`217`	`'end.pages.1.with space' => 'Ein Fehler',`
`218`	`218`	`'end.pages.1.with second space' => 'Ein 2. Fehler',`
`219`	`219`	`'advancedPlural' => ({required num count, required InlineSpan Function(num) countBuilder, required GenderContext gender}) => RichPluralResolvers.bridge( n: count, resolver: _root.$meta.cardinalResolver ?? PluralResolvers.cardinal('de'), one: () => TextSpan(children: [ const TextSpan(text: 'Eins'), ]), other: () => TextSpan(children: [ const TextSpan(text: 'Andere '), countBuilder(count), TextSpan(text: ', ${_root.onboarding.greet2(gender: gender)}'), ]), ),`
`220`		`- _ => null};`
	`220`	`+ _ => null,`
	`221`	`+ };`
`221`	`222`	`}`
`222`	`223`	`}`
`223`		`-`
`224`		`-`
Original file line number	Diff line number	Diff line change
`@@ -262,8 +262,7 @@ extension on Translations {`
`262`	`262`	`'end.pages.1.with space' => 'An Error',`
`263`	`263`	`'end.pages.1.with second space' => 'An 2nd Error',`
`264`	`264`	`'advancedPlural' => ({required num count, required InlineSpan Function(num) countBuilder, required GenderContext gender}) => RichPluralResolvers.bridge( n: count, resolver: _root.$meta.cardinalResolver ?? PluralResolvers.cardinal('en'), one: () => TextSpan(children: [ const TextSpan(text: 'One'), ]), other: () => TextSpan(children: [ const TextSpan(text: 'Other '), countBuilder(count), TextSpan(text: ', ${_root.onboarding.greet2(gender: gender)}'), ]), ),`
`265`		`- _ => null};`
	`265`	`+ _ => null,`
	`266`	`+ };`
`266`	`267`	`}`
`267`	`268`	`}`
`268`		`-`
`269`		`-`
Original file line number	Diff line number	Diff line change
`@@ -219,8 +219,7 @@ extension on TranslationsDe {`
`219`	`219`	`'end.pages.1.with space' => 'Ein Fehler',`
`220`	`220`	`'end.pages.1.with second space' => 'Ein 2. Fehler',`
`221`	`221`	`'advancedPlural' => ({required num count, required InlineSpan Function(num) countBuilder, required GenderContext gender}) => RichPluralResolvers.bridge( n: count, resolver: _root.$meta.cardinalResolver ?? PluralResolvers.cardinal('de'), one: () => TextSpan(children: [ const TextSpan(text: 'Eins'), ]), other: () => TextSpan(children: [ const TextSpan(text: 'Andere '), countBuilder(count), TextSpan(text: ', ${_root.onboarding.greet2(gender: gender)}'), ]), ),`
`222`		`- _ => null};`
	`222`	`+ _ => null,`
	`223`	`+ };`
`223`	`224`	`}`
`224`	`225`	`}`
`225`		`-`
`226`		`-`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,7 @@ extension on TranslationsDe {`
`58`	`58`	`dynamic _flatMapFunction(String path) {`
`59`	`59`	`return switch (path) {`
`60`	`60`	`'greet' => ({required Gender context}) { switch (context) { case Gender.male: return 'Hallo Herr'; case Gender.female: return 'Hello Mrs'; } },`
`61`		`- _ => null};`
	`61`	`+ _ => null,`
	`62`	`+ };`
`62`	`63`	`}`
`63`	`64`	`}`
`64`		`-`
`65`		`-`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,7 @@ extension on Translations {`
`61`	`61`	`dynamic _flatMapFunction(String path) {`
`62`	`62`	`return switch (path) {`
`63`	`63`	`'greet' => ({required Gender context}) { switch (context) { case Gender.male: return 'Hello Mr'; case Gender.female: return 'Hello Mrs'; } },`
`64`		`- _ => null};`
	`64`	`+ _ => null,`
	`65`	`+ };`
`65`	`66`	`}`
`66`	`67`	`}`
`67`		`-`
`68`		`-`