Updates

Author: mosuem

pkgs/intl_translation/CHANGELOG.md

@@ -1,7 +1,7 @@
 ## 0.21.0
   * BREAKING CHANGE: Update `dart_style` to `^3.0.0`
   * Allow analyzer `>=6.3.0 <8.0.0`
-  * Upgrade SDK constraint to `^3.7.0`.
+  * Upgrade SDK constraint to `^3.9.0`.
 
 ## 0.20.1
   * Add topics to `pubspec.yaml`

pkgs/intl_translation/bin/generate_from_arb.dart

@@ -275,17 +275,16 @@ void generateLocaleFile(
   MessageGeneration generation,
   Map<String, List<MainMessage>> messages,
 ) {
-  var translations =
-      localeData
-          .expand((jsonTranslations) {
-            return jsonTranslations.entries.map((e) {
-              var id = e.key;
-              var messageData = e.value;
-              return recreateIntlObjects(id, messageData, messages);
-            });
-          })
-          .whereType<TranslatedMessage>()
-          .toList();
+  var translations = localeData
+      .expand((jsonTranslations) {
+        return jsonTranslations.entries.map((e) {
+          var id = e.key;
+          var messageData = e.value;
+          return recreateIntlObjects(id, messageData, messages);
+        });
+      })
+      .whereType<TranslatedMessage>()
+      .toList();
   generation.generateIndividualMessageFile(locale, translations, targetDir);
 }
 

pkgs/intl_translation/bin/make_examples_const.dart

@@ -10,6 +10,7 @@ import 'dart:io';
 
 import 'package:args/args.dart';
 import 'package:dart_style/dart_style.dart';
+import 'package:intl_translation/src/language_version.dart';
 import 'package:intl_translation/src/message_rewriter.dart';
 import 'package:intl_translation/src/messages/main_message.dart';
 
@@ -37,7 +38,10 @@ Future<void> main(List<String> args) async {
       print('Writing new source to $outputFile');
       var out = File(outputFile);
 
-      var formatter = DartFormatter();
+      var languageVersion =
+          (await findPackageLanguageVersion(file)) ??
+          DartFormatter.latestLanguageVersion;
+      var formatter = DartFormatter(languageVersion: languageVersion);
 
       out.writeAsStringSync(formatter.format(newSource));
     }

pkgs/intl_translation/bin/rewrite_intl_messages.dart

@@ -16,6 +16,7 @@ import 'dart:io';
 
 import 'package:args/args.dart';
 import 'package:dart_style/dart_style.dart';
+import 'package:intl_translation/src/language_version.dart';
 import 'package:intl_translation/src/message_rewriter.dart';
 
 String? outputFileOption = 'transformed_output.dart';
@@ -81,7 +82,10 @@ Future<void> main(List<String> args) async {
       print('Writing new source to $outputFile');
       var out = File(outputFile!);
 
-      var formatter = DartFormatter();
+      var languageVersion =
+          (await findPackageLanguageVersion(file)) ??
+          DartFormatter.latestLanguageVersion;
+      var formatter = DartFormatter(languageVersion: languageVersion);
 
       out.writeAsStringSync(formatter.format(newSource));
     }

pkgs/intl_translation/lib/extract_messages.dart

@@ -129,9 +129,10 @@ class MessageExtraction {
       throwIfDiagnostics: false,
     );
 
-    final errors = List.of(result.errors)..removeWhere(
-      (e) => ignoredErrorCodes.contains(e.errorCode.name.toLowerCase()),
-    );
+    final errors = List.of(result.errors)
+      ..removeWhere(
+        (e) => ignoredErrorCodes.contains(e.diagnosticCode.name.toLowerCase()),
+      );
     if (errors.isNotEmpty) {
       print('Error in parsing $origin, no messages extracted.');
       throw ArgumentError('Parsing errors in $origin');

pkgs/intl_translation/lib/generate_localized.dart

@@ -108,10 +108,9 @@ class MessageGeneration {
     // Exclude messages with no translation and translations with no matching
     // original message (e.g. if we're using some messages from a larger
     // catalog)
-    var usableTranslations =
-        translations
-            .where((translation) => translation.originalMessages.isNotEmpty)
-            .toList();
+    var usableTranslations = translations
+        .where((translation) => translation.originalMessages.isNotEmpty)
+        .toList();
     for (var translation in usableTranslations) {
       for (var original in translation.originalMessages) {
         original.addTranslation(locale, translation.message);
@@ -136,8 +135,10 @@ class MessageGeneration {
     for (var translation in usableTranslations) {
       // Some messages we generate as methods in this class. Simpler ones
       // we inline in the map from names to messages.
-      var messagesThatNeedMethods =
-          translation.originalMessages.where(_hasArguments).toSet().toList();
+      var messagesThatNeedMethods = translation.originalMessages
+          .where(_hasArguments)
+          .toSet()
+          .toList();
       for (var original in messagesThatNeedMethods) {
         output
           ..write('  ')
@@ -151,17 +152,18 @@ class MessageGeneration {
 
     // Now write the map of names to either the direct translation or to a
     // method.
-    var names = (usableTranslations
-            .expand((translation) => translation.originalMessages)
-            .toSet()
-            .toList()
-          ..sort((a, b) => a.name.compareTo(b.name)))
-        .map(
-          (original) =>
-              "    '${Message.escapeString(original.name)}'"
-              ': ${_mapReference(original, locale)}',
-        )
-        .join(',\n');
+    var names =
+        (usableTranslations
+                .expand((translation) => translation.originalMessages)
+                .toSet()
+                .toList()
+              ..sort((a, b) => a.name.compareTo(b.name)))
+            .map(
+              (original) =>
+                  "    '${Message.escapeString(original.name)}'"
+                  ': ${_mapReference(original, locale)}',
+            )
+            .join(',\n');
     output
       ..write(names)
       ..write('\n  };\n}\n');
@@ -184,7 +186,8 @@ class MessageGeneration {
 
   /// [generateIndividualMessageFile] for the beginning of the file,
   /// parameterized by [locale].
-  String prologue(String locale) => '''
+  String prologue(String locale) =>
+      '''
 // DO NOT EDIT. This is code generated via package:intl/generate_localized.dart
 // This is a library that provides messages for a $locale locale. All the
 // messages from the main program should be duplicated here with the same
@@ -250,10 +253,9 @@ ${releaseMode ? overrideLookup() : ''}''';
     output.write('Map<String, LibraryLoader> _deferredLibraries = {\n');
     for (var rawLocale in allLocales) {
       var locale = Intl.canonicalizedLocale(rawLocale);
-      var loadOperation =
-          (useDeferredLoading)
-              ? "  '$locale': ${libraryName(locale)}.loadLibrary,\n"
-              : "  '$locale': () => Future.value(null),\n";
+      var loadOperation = (useDeferredLoading)
+          ? "  '$locale': ${libraryName(locale)}.loadLibrary,\n"
+          : "  '$locale': () => Future.value(null),\n";
       output.write(loadOperation);
     }
     output.write('};\n');
@@ -273,7 +275,8 @@ ${releaseMode ? overrideLookup() : ''}''';
 
   /// Constant string used in [generateLocalesImportFile] for the beginning of
   /// the file.
-  String get localesPrologue => """
+  String get localesPrologue =>
+      """
 // DO NOT EDIT. This is code generated via package:intl/generate_localized.dart
 // This is a library that looks up messages for specific locales by
 // delegating to the appropriate library.
@@ -373,7 +376,8 @@ abstract class DataMapMessageGeneration extends MessageGeneration {
   /// We import the main file so as to get the shared code to evaluate
   /// the JSON data.
   @override
-  String get extraImports => '''
+  String get extraImports =>
+      '''
 import 'dart:convert';
 
 import '${generatedFilePrefix}messages_all.dart' show evaluateJsonTemplate;
@@ -393,7 +397,8 @@ import '${generatedFilePrefix}messages_all.dart' show evaluateJsonTemplate;
   );
 
   @override
-  String get mainPrologue => """${super.mainPrologue}
+  String get mainPrologue =>
+      """${super.mainPrologue}
 import 'package:$intlImportPath/intl.dart';
 """;
 
@@ -472,7 +477,8 @@ String? evaluateJsonTemplate(dynamic input, List<dynamic> args) {
 
   /// Constant string used in [generateFlutterImportFile] for the beginning of
   /// the file.
-  String get flutterPrologue => """
+  String get flutterPrologue =>
+      """
 // DO NOT EDIT. This is code generated via package:intl/generate_localized.dart
 // This is a library that looks up messages for specific locales by
 // delegating to the appropriate library.
@@ -619,7 +625,8 @@ class JsonMessageGeneration extends DataMapMessageGeneration {
 /// Message generator that stores translations in a constant map.
 class CodeMapMessageGeneration extends JsonMessageGeneration {
   @override
-  String get extraImports => '''
+  String get extraImports =>
+      '''
 ${super.extraImports}
 import 'dart:collection';
 ''';
@@ -753,10 +760,9 @@ class TranslatedMessage {
 
   /// For backward compatibility, we still have the originalMessage API.
   MainMessage get originalMessage => originalMessages.first;
-  set originalMessage(MainMessage m) =>
-      originalMessages
-        ..clear()
-        ..add(m);
+  set originalMessage(MainMessage m) => originalMessages
+    ..clear()
+    ..add(m);
 
   TranslatedMessage(this.id, this.translated, this.originalMessages);
 

pkgs/intl_translation/lib/src/language_version.dart

@@ -0,0 +1,25 @@
+// Copyright (c) 2024, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+import 'dart:async';
+import 'dart:io';
+
+import 'package:package_config/package_config.dart';
+import 'package:pub_semver/pub_semver.dart';
+
+/// Looks for a package surrounding [file] and, if found, returns the default
+/// language version specified by that package.
+Future<Version?> findPackageLanguageVersion(File file) async {
+  try {
+    var config = await findPackageConfig(file.parent);
+    if (config?.packageOf(file.absolute.uri)?.languageVersion
+        case var languageVersion?) {
+      return Version(languageVersion.major, languageVersion.minor, 0);
+    }
+  } catch (error) {
+    // If we fail to find or read a config, just silently do nothing and
+    // default to the latest language version.
+  }
+
+  return null;
+}

pkgs/intl_translation/lib/src/message_parser.dart

@@ -117,10 +117,9 @@ class _ParserUtil {
   }
 
   /// Match a simple string
-  At<LiteralString>? matchString(int at, String t) =>
-      input.startsWith(t, at)
-          ? At(LiteralString(t, null), at + t.length)
-          : null;
+  At<LiteralString>? matchString(int at, String t) => input.startsWith(t, at)
+      ? At(LiteralString(t, null), at + t.length)
+      : null;
 
   /// Match any of the given keywords
   At<LiteralString>? asKeywords(Map<String, RegExp> keywordsToRegex, int at) {
@@ -136,13 +135,9 @@ class _ParserUtil {
   }
 
   /// Parse whitespace
-  At<LiteralString> trimAt(int at) =>
-      at < input.length
-          ? At(
-            LiteralString(input),
-            RegExp(r'\s*').matchAsPrefix(input, at)!.end,
-          )
-          : At(LiteralString(''), at);
+  At<LiteralString> trimAt(int at) => at < input.length
+      ? At(LiteralString(input), RegExp(r'\s*').matchAsPrefix(input, at)!.end)
+      : At(LiteralString(''), at);
 
   Pattern matchUnescaped(String curly) => RegExp("(?:^|''|[^'])($curly)");
 
@@ -293,18 +288,19 @@ class _ParserUtil {
 
   At<CompositeMessage>? genderClause(int at) {
     return oneOrMore(
-      (s1) => and([
-        (s) => trimAt(s),
-        (s) => genderKeyword(s),
-        (s) => openCurly(s),
-        (s) => interiorText(s),
-        (s) => closeCurly(s),
-        (s) => trimAt(s),
-      ], s1)?.mapResult((compMsg) {
-        var genderKeyword = compMsg.pieces[1] as LiteralString;
-        var interiorText = compMsg.pieces[3];
-        return PairMessage(genderKeyword, interiorText);
-      }),
+      (s1) =>
+          and([
+            (s) => trimAt(s),
+            (s) => genderKeyword(s),
+            (s) => openCurly(s),
+            (s) => interiorText(s),
+            (s) => closeCurly(s),
+            (s) => trimAt(s),
+          ], s1)?.mapResult((compMsg) {
+            var genderKeyword = compMsg.pieces[1] as LiteralString;
+            var interiorText = compMsg.pieces[3];
+            return PairMessage(genderKeyword, interiorText);
+          }),
       at,
     );
   }
@@ -327,16 +323,17 @@ class _ParserUtil {
 
   At<CompositeMessage>? selectClause(int at) {
     return oneOrMore(
-      (s1) => and([
-        (s) => id(s),
-        (s) => openCurly(s),
-        (s) => interiorText(s),
-        (s) => closeCurly(s),
-      ], s1)?.mapResult((compMsg) {
-        var id = compMsg.pieces[0] as LiteralString;
-        var interiorText = compMsg.pieces[2];
-        return PairMessage(id, interiorText);
-      }),
+      (s1) =>
+          and([
+            (s) => id(s),
+            (s) => openCurly(s),
+            (s) => interiorText(s),
+            (s) => closeCurly(s),
+          ], s1)?.mapResult((compMsg) {
+            var id = compMsg.pieces[0] as LiteralString;
+            var interiorText = compMsg.pieces[2];
+            return PairMessage(id, interiorText);
+          }),
       at,
     );
   }

pkgs/intl_translation/lib/src/messages/constant_evaluator.dart

@@ -48,10 +48,8 @@ Constant<Map>? evaluateConstStringMap(SetOrMapLiteral map) {
     return null;
   }
   final evaluatedEntries = map.elements.whereType<MapLiteralEntry>().map(
-    (literalEntry) => (
-      evaluate(literalEntry.key),
-      evaluate(literalEntry.value),
-    ),
+    (literalEntry) =>
+        (evaluate(literalEntry.key), evaluate(literalEntry.value)),
   );
   if (evaluatedEntries.any(
     (element) => element.$1 == null || element.$2 == null,

pkgs/intl_translation/lib/src/messages/main_message.dart

@@ -142,13 +142,12 @@ class MainMessage extends ComplexMessage {
   /// Generate code for this message, expecting it to be part of a map
   /// keyed by name with values the function that calls Intl.message.
   String toCodeForLocale(String locale, String name) {
-    var out =
-        StringBuffer()
-          ..write('static $name(')
-          ..write(arguments.join(', '))
-          ..write(') => "')
-          ..write(translations[locale])
-          ..write('";');
+    var out = StringBuffer()
+      ..write('static $name(')
+      ..write(arguments.join(', '))
+      ..write(') => "')
+      ..write(translations[locale])
+      ..write('";');
     return out.toString();
   }