No public description

PiperOrigin-RevId: 781060912

Author: Googler

pkgs/intl_translation/CHANGELOG.md

@@ -1,12 +1,6 @@
-## 0.21.0-wip
-  * BREAKING CHANGE: Update `dart_style` to `^3.0.0`
-  * Allow analyzer `>=6.3.0 <8.0.0`
-  * Throw if the main argument in plurals and selects does not match the argument list.
-  * Fix constant evaluator.
-
 ## 0.20.1
   * Add topics to `pubspec.yaml`
-  * Update to `dart_style` `2.3.7`. `bin/make_examples_const.dart` and
+  * Update to `dart_style `2.3.7`. `bin/make_examples_const.dart` and
     `rewrite_intl_messages.dart` will now look for a surrounding
     `.dart_tool/package_config.json` file to infer the language version of the
     files updated by the script.

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

@@ -33,7 +33,7 @@ class MainMessage extends ComplexMessage {
   /// Verify that this looks like a correct Intl.message invocation.
   static void checkValidity(
     MethodInvocation node,
-    List<Expression> arguments,
+    List arguments,
     String? outerName,
     List<FormalParameter> outerArgs, {
     bool nameAndArgsGenerated = false,

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

@@ -35,10 +35,11 @@ library intl_message;
 import 'dart:convert';
 
 import 'package:analyzer/dart/ast/ast.dart';
+// ignore: implementation_imports
+import 'package:analyzer/src/dart/ast/constant_evaluator.dart';
 
 import 'complex_message.dart';
 import 'composite_message.dart';
-import 'constant_evaluator.dart';
 import 'literal_string_message.dart';
 import 'message_extraction_exception.dart';
 import 'variable_substitution_message.dart';
@@ -74,6 +75,26 @@ abstract class Message {
   /// The name of the top-level [MainMessage].
   String get name => parent == null ? '<unnamed>' : parent!.name;
 
+  static final _evaluator = ConstantEvaluator();
+
+  static String? _evaluateAsString(expression) {
+    var result = expression.accept(_evaluator);
+    if (result == ConstantEvaluator.NOT_A_CONSTANT || result is! String) {
+      return null;
+    } else {
+      return result;
+    }
+  }
+
+  static Map? _evaluateAsMap(Expression expression) {
+    var result = expression.accept(_evaluator);
+    if (result == ConstantEvaluator.NOT_A_CONSTANT || result is! Map) {
+      return null;
+    } else {
+      return result;
+    }
+  }
+
   /// Verify that the args argument matches the method parameters and
   /// isn't, e.g. passing string names instead of the argument values.
   static bool checkArgs(NamedExpression? args, List<String> parameterNames) {
@@ -120,7 +141,7 @@ abstract class Message {
   /// for messages with parameters.
   static void checkValidity(
     MethodInvocation node,
-    List<Expression> arguments,
+    List arguments,
     String? outerName,
     List<FormalParameter> outerArgs, {
     bool nameAndArgsGenerated = false,
@@ -144,7 +165,7 @@ abstract class Message {
           ' e.g. args: $parameterNames');
     }
 
-    final nameNamedExps = arguments
+    var nameNamedExps = arguments
         .whereType<NamedExpression>()
         .where((arg) => arg.name.label.name == 'name')
         .map((e) => e.expression);
@@ -156,7 +177,7 @@ abstract class Message {
     if (nameNamedExps.isEmpty) {
       if (!hasParameters) {
         // No name supplied, no parameters. Use the message as the name.
-        var name = evaluateConstString(arguments[0]);
+        var name = _evaluateAsString(arguments[0]);
         messageName = name;
         outerName = name;
       } else {
@@ -174,7 +195,7 @@ abstract class Message {
       }
     } else {
       // Name argument is supplied, use it.
-      var name = evaluateConstString(nameNamedExps.first);
+      var name = _evaluateAsString(nameNamedExps.first);
       messageName = name;
       givenName = name;
     }
@@ -206,7 +227,7 @@ abstract class Message {
         .map((each) => each.expression)
         .toList();
     for (var arg in values) {
-      if (evaluateConstString(arg) == null) {
+      if (_evaluateAsString(arg) == null) {
         throw MessageExtractionException(
             'Intl.message arguments must be string literals: $arg');
       }
@@ -224,7 +245,8 @@ abstract class Message {
       if (examples.isNotEmpty) {
         var example = examples.first;
         if (example is SetOrMapLiteral) {
-          if (evaluateConstStringMap(example) == null) {
+          var map = _evaluateAsMap(example);
+          if (map == null) {
             throw MessageExtractionException(
                 'Examples must be a const Map literal.');
           } else if (example.constKeyword == null) {

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

@@ -95,14 +95,7 @@ abstract class SubMessage extends ComplexMessage {
   List toJson() {
     var json = [];
     json.add(dartMessageName);
-    var indexOf = arguments.indexOf(mainArgument);
-    if (indexOf == -1) {
-      // This is an error as this should have been checked in
-      // lib/visitors/plural_gender_visitor.dart already.
-      throw ArgumentError('The argument `$mainArgument` could not be found in '
-          '`$arguments`.');
-    }
-    json.add(indexOf);
+    json.add(arguments.indexOf(mainArgument));
     for (var arg in codeAttributeNames) {
       json.add(this[arg]?.toJson());
     }

pkgs/intl_translation/lib/src/messages/submessages/submessage.dart

@@ -4,9 +4,10 @@
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
+// ignore: implementation_imports
+import 'package:analyzer/src/dart/ast/constant_evaluator.dart';
 
 import '../extract_messages.dart';
-import '../src/messages/constant_evaluator.dart';
 import '../src/messages/main_message.dart';
 import '../src/messages/message.dart';
 import '../src/messages/message_extraction_exception.dart';
@@ -287,8 +288,10 @@ class MessageFindingVisitor extends GeneralizingAstVisitor {
     for (var namedExpr in arguments.whereType<NamedExpression>()) {
       var name = namedExpr.name.label.name;
       var exp = namedExpr.expression;
-      var constant = evaluate(exp);
-      var value = constant == null ? exp.toString() : constant.value;
+      var basicValue = exp.accept(ConstantEvaluator());
+      var value = basicValue == ConstantEvaluator.NOT_A_CONSTANT
+          ? exp.toString()
+          : basicValue;
       setAttribute(message, name, value);
     }
     // We only rewrite messages with parameters, otherwise we use the literal

pkgs/intl_translation/lib/visitors/message_finding_visitor.dart

@@ -137,13 +137,6 @@ class PluralAndGenderVisitor extends SimpleAstVisitor<void> {
       extraction.warnings.add(errString);
     }
 
-    if (!message.arguments.contains(message.mainArgument)) {
-      throw Exception(
-          'Argument `${message.mainArgument}` could not be found in '
-          '${message.arguments} while processing $node. The parent argument '
-          'name must match the one in the `Intl.` call.');
-    }
-
     return message;
   }
 }

pkgs/intl_translation/lib/visitors/plural_gender_visitor.dart

@@ -1,5 +1,5 @@
 name: intl_translation
-version: 0.21.0-wip
+version: 0.20.1
 description: >-
   Contains code to deal with internationalized/localized messages,
   date and number formatting and parsing, bi-directional text, and
@@ -15,9 +15,9 @@ environment:
   sdk: ^3.0.0
 
 dependencies:
-  analyzer: ">=6.3.0 <8.0.0"
+  analyzer: ^6.3.0
   args: ^2.0.0
-  dart_style: ^3.0.0
+  dart_style: ^2.0.0
   intl: '>=0.19.0 <0.21.0'
   package_config: ^2.1.0
   path: ^1.0.0