From 19f9556dcdb538326e4a7b6fdd4ed262218bc812 Mon Sep 17 00:00:00 2001 From: kwado-tech <47870274+kwado-tech@users.noreply.github.com> Date: Sat, 1 Feb 2025 14:46:51 +0200 Subject: [PATCH] Refactor code formatting and minor improvements in l10n mapper generator --- l10n_mapper_generator/core/logger.dart | 3 +-- .../core/models/l10n_mapper_config.dart | 20 ++++++------------- .../lib/l10n_mapper_generator.dart | 13 +++++++----- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/l10n_mapper_generator/core/logger.dart b/l10n_mapper_generator/core/logger.dart index 969d8ca..7eca0e8 100644 --- a/l10n_mapper_generator/core/logger.dart +++ b/l10n_mapper_generator/core/logger.dart @@ -22,8 +22,7 @@ class LogType { int get hashCode => _value.hashCode; } -void logger(String log, T Function()? callback, - {LogType type = LogType.none}) { +void logger(String log, T Function()? callback, {LogType type = LogType.none}) { if (type != LogType.none) { // ignore: avoid_print print('${type.toString()}: $log'); diff --git a/l10n_mapper_generator/core/models/l10n_mapper_config.dart b/l10n_mapper_generator/core/models/l10n_mapper_config.dart index 2f30095..0a5f218 100644 --- a/l10n_mapper_generator/core/models/l10n_mapper_config.dart +++ b/l10n_mapper_generator/core/models/l10n_mapper_config.dart @@ -26,11 +26,9 @@ class TranslationOptions { final Option input; final Option output; - const TranslationOptions( - {required this.locale, required this.input, required this.output}); + const TranslationOptions({required this.locale, required this.input, required this.output}); - factory TranslationOptions.none() => - TranslationOptions(locale: none(), input: none(), output: none()); + factory TranslationOptions.none() => TranslationOptions(locale: none(), input: none(), output: none()); factory TranslationOptions.fromJson(Map json) { return TranslationOptions( @@ -44,18 +42,14 @@ class TranslationOptions { bool operator ==(Object other) { if (identical(this, other)) return true; - return other is TranslationOptions && - other.locale == locale && - other.input == input && - other.output == output; + return other is TranslationOptions && other.locale == locale && other.input == input && other.output == output; } @override int get hashCode => locale.hashCode ^ input.hashCode ^ output.hashCode; @override - String toString() => - 'TranslationOptions(locale: $locale, input: $input, output: $output)'; + String toString() => 'TranslationOptions(locale: $locale, input: $input, output: $output)'; } class FormatterOptions { @@ -89,12 +83,10 @@ class FormatterOptions { inputPath: optionOf(json['inputPath'] as String?), outputPath: optionOf(json['outputPath'] as String?), translations: (json['translations'] as List?) - ?.map( - (e) => TranslationOptions.fromJson(e as Map)) + ?.map((e) => TranslationOptions.fromJson(e as Map)) .toList() ?? [], - keyPredicateMatch: - optionOf(json['keyPredicateMatch'] as Map?), + keyPredicateMatch: optionOf(json['keyPredicateMatch'] as Map?), ); } diff --git a/l10n_mapper_generator/lib/l10n_mapper_generator.dart b/l10n_mapper_generator/lib/l10n_mapper_generator.dart index 210a27c..ae9022b 100644 --- a/l10n_mapper_generator/lib/l10n_mapper_generator.dart +++ b/l10n_mapper_generator/lib/l10n_mapper_generator.dart @@ -50,7 +50,8 @@ class L10nMapperGenerator extends Generator { final bufferL10nHelper = StringBuffer(); bufferBuildContextExtension.writeln('extension $buildContextExtensionName on BuildContext {'); - bufferAppLocalizationsExtension.writeln('extension $appLocalizationsExtensionName on ${classElement.displayName} {'); + bufferAppLocalizationsExtension + .writeln('extension $appLocalizationsExtensionName on ${classElement.displayName} {'); bufferBuildContextExtension.writeln(' $className get _localizations => $className.of(this)!;'); @@ -69,14 +70,17 @@ class L10nMapperGenerator extends Generator { "${nullable ? 'String?' : 'String'} parseL10n(String translationKey, {List? arguments}) {"); bufferBuildContextExtension.writeln('final localizations = $className.of(this)!;'); - bufferBuildContextExtension.writeln('return L10nHelper.parseL10n(localizations, translationKey, arguments: arguments);'); - bufferAppLocalizationsExtension.writeln('return L10nHelper.parseL10n(this, translationKey, arguments: arguments);'); + bufferBuildContextExtension + .writeln('return L10nHelper.parseL10n(localizations, translationKey, arguments: arguments);'); + bufferAppLocalizationsExtension + .writeln('return L10nHelper.parseL10n(this, translationKey, arguments: arguments);'); bufferBuildContextExtension.writeln('}'); bufferAppLocalizationsExtension.writeln('}'); bufferL10nHelper.writeln('class L10nHelper {'); - bufferL10nHelper.writeln('static String parseL10n(AppLocalizations localizations, String translationKey, {List? arguments}) {'); + bufferL10nHelper.writeln( + 'static String parseL10n(AppLocalizations localizations, String translationKey, {List? arguments}) {'); bufferL10nHelper.writeln('const mapper = $mapperName();'); bufferL10nHelper.writeln('final object = mapper.toLocalizationMap(localizations)[translationKey];'); @@ -108,7 +112,6 @@ class L10nMapperGenerator extends Generator { ..write(bufferL10nHelper.toString()); } - // end of extension // generate class