refactor(ngast,ngcompiler): reduce dynamic usage in i18n

Signed-off-by: Gavin Zhao <[email protected]>
angulardart-community · Feb 4, 2024 · 74986e5 · 74986e5
1 parent 91c394d
commit 74986e5
Show file tree

Hide file tree

Showing 23 changed files with 27 additions and 27 deletions.
diff --git a/ngast/lib/src/ast/attribute.dart b/ngast/lib/src/ast/attribute.dart
@@ -41,7 +41,7 @@ abstract mixin class AttributeAst implements TemplateAst {
   }
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is AttributeAst &&
         name == other.name &&
         value == other.value &&

diff --git a/ngast/lib/src/ast/close_element.dart b/ngast/lib/src/ast/close_element.dart
@@ -29,7 +29,7 @@ abstract mixin class CloseElementAst implements TemplateAst {
   }) = ParsedCloseElementAst;
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is CloseElementAst && name == other.name;
   }
 

diff --git a/ngast/lib/src/ast/comment.dart b/ngast/lib/src/ast/comment.dart
@@ -31,7 +31,7 @@ abstract mixin class CommentAst implements StandaloneTemplateAst {
   }
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is CommentAst && value == other.value;
   }
 

diff --git a/ngast/lib/src/ast/container.dart b/ngast/lib/src/ast/container.dart
@@ -52,7 +52,7 @@ abstract mixin class ContainerAst implements StandaloneTemplateAst {
   }
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is ContainerAst &&
         _listEquals.equals(childNodes, other.childNodes) &&
         _listEquals.equals(stars, other.stars) &&

diff --git a/ngast/lib/src/ast/content.dart b/ngast/lib/src/ast/content.dart
@@ -63,7 +63,7 @@ abstract mixin class EmbeddedContentAst implements StandaloneTemplateAst {
   set closeComplement(CloseElementAst closeComplement);
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is EmbeddedContentAst &&
         other.selector == selector &&
         other.ngProjectAs == ngProjectAs &&

diff --git a/ngast/lib/src/ast/element.dart b/ngast/lib/src/ast/element.dart
@@ -58,7 +58,7 @@ abstract mixin class ElementAst implements StandaloneTemplateAst {
   }) = ParsedElementAst;
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is ElementAst &&
         name == other.name &&
         closeComplement == other.closeComplement &&

diff --git a/ngast/lib/src/ast/event.dart b/ngast/lib/src/ast/event.dart
@@ -38,7 +38,7 @@ abstract mixin class EventAst implements TemplateAst {
   ]) = ParsedEventAst;
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is EventAst &&
         name == other.name &&
         _listEquals.equals(reductions, other.reductions);

diff --git a/ngast/lib/src/ast/interpolation.dart b/ngast/lib/src/ast/interpolation.dart
@@ -36,7 +36,7 @@ abstract mixin class InterpolationAst implements StandaloneTemplateAst {
   String get value;
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is InterpolationAst && other.value == value;
   }
 

diff --git a/ngast/lib/src/ast/let_binding.dart b/ngast/lib/src/ast/let_binding.dart
@@ -38,7 +38,7 @@ abstract mixin class LetBindingAst implements TemplateAst {
   ]) = ParsedLetBindingAst;
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is LetBindingAst && name == other.name && value == other.value;
   }
 

diff --git a/ngast/lib/src/ast/property.dart b/ngast/lib/src/ast/property.dart
@@ -37,7 +37,7 @@ abstract mixin class PropertyAst implements TemplateAst {
   ]) = ParsedPropertyAst;
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is PropertyAst &&
         name == other.name &&
         postfix == other.postfix &&

diff --git a/ngast/lib/src/ast/reference.dart b/ngast/lib/src/ast/reference.dart
@@ -31,7 +31,7 @@ abstract mixin class ReferenceAst implements TemplateAst {
   ]) = ParsedReferenceAst;
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is ReferenceAst &&
         identifier == other.identifier &&
         variable == other.variable;

diff --git a/ngast/lib/src/ast/sugar/annotation.dart b/ngast/lib/src/ast/sugar/annotation.dart
@@ -35,7 +35,7 @@ abstract mixin class AnnotationAst implements TemplateAst {
   }
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is AnnotationAst && name == other.name && value == other.value;
   }
 

diff --git a/ngast/lib/src/ast/sugar/banana.dart b/ngast/lib/src/ast/sugar/banana.dart
@@ -40,7 +40,7 @@ abstract mixin class BananaAst implements TemplateAst {
   }
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is BananaAst && name == other.name && value == other.value;
   }
 

diff --git a/ngast/lib/src/ast/sugar/star.dart b/ngast/lib/src/ast/sugar/star.dart
@@ -39,7 +39,7 @@ abstract mixin class StarAst implements TemplateAst {
   }
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is PropertyAst && value == other.value && name == other.name;
   }
 

diff --git a/ngast/lib/src/ast/template.dart b/ngast/lib/src/ast/template.dart
@@ -88,7 +88,7 @@ abstract mixin class EmbeddedTemplateAst implements StandaloneTemplateAst {
   set closeComplement(CloseElementAst? closeComplement);
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is EmbeddedTemplateAst &&
         closeComplement == other.closeComplement &&
         _listEquals.equals(annotations, other.annotations) &&

diff --git a/ngast/lib/src/ast/text.dart b/ngast/lib/src/ast/text.dart
@@ -24,7 +24,7 @@ abstract mixin class TextAst implements StandaloneTemplateAst {
   ) = _ParsedTextAst;
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is TextAst && value == other.value;
   }
 

diff --git a/ngast/lib/src/exception_handler/angular_parser_exception.dart b/ngast/lib/src/exception_handler/angular_parser_exception.dart
@@ -19,7 +19,7 @@ class AngularParserException extends Error {
   );
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is AngularParserException &&
         errorCode == other.errorCode &&
         length == other.length &&

diff --git a/ngast/lib/src/expression/micro/ast.dart b/ngast/lib/src/expression/micro/ast.dart
@@ -20,7 +20,7 @@ class NgMicroAst {
   });
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is NgMicroAst &&
         _listEquals.equals(letBindings, other.letBindings) &&
         _listEquals.equals(properties, other.properties);

diff --git a/ngast/lib/src/expression/micro/token.dart b/ngast/lib/src/expression/micro/token.dart
@@ -53,7 +53,7 @@ class NgMicroToken {
   const NgMicroToken._(this.type, this.lexeme, this.offset);
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is NgMicroToken &&
         other.offset == offset &&
         other.type == type;

diff --git a/ngast/lib/src/token/lexeme.dart b/ngast/lib/src/token/lexeme.dart
@@ -9,7 +9,7 @@ class _LexemeNgSimpleToken extends NgSimpleToken {
       : super._(type, offset);
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is _LexemeNgSimpleToken &&
         super == other &&
         lexeme == other.lexeme;
@@ -41,7 +41,7 @@ class _LexemeNgToken extends NgToken {
         );
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is _LexemeNgToken && super == other && lexeme == other.lexeme;
   }
 

diff --git a/ngast/lib/src/token/tokens.dart b/ngast/lib/src/token/tokens.dart
@@ -153,7 +153,7 @@ class NgSimpleToken implements NgBaseToken<NgSimpleTokenType> {
   );
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is NgSimpleToken &&
         other.offset == offset &&
         other.type == type;
@@ -224,7 +224,7 @@ class NgSimpleQuoteToken extends _LexemeNgSimpleToken {
         );
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is NgSimpleQuoteToken &&
         other.offset == offset &&
         other.type == type &&
@@ -405,7 +405,7 @@ class NgToken implements NgBaseToken<NgTokenType> {
   });
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is NgToken &&
         (errorSynthetic || other.errorSynthetic
             ? other.offset == offset && other.type == type
@@ -478,7 +478,7 @@ class NgAttributeValueToken extends NgToken {
         );
 
   @override
-  bool operator ==(Object? other) {
+  bool operator ==(Object other) {
     return other is NgAttributeValueToken &&
         leftQuote == other.leftQuote &&
         rightQuote == other.rightQuote &&

diff --git a/ngcompiler/lib/v1/src/compiler/i18n/message.dart b/ngcompiler/lib/v1/src/compiler/i18n/message.dart
@@ -34,7 +34,7 @@ class I18nMessage {
   int get hashCode => metadata.hashCode ^ text.hashCode ^ _map.hash(args);
 
   @override
-  bool operator ==(dynamic other) =>
+  bool operator ==(Object other) =>
       other is I18nMessage &&
       other.metadata == metadata &&
       other.text == text &&

diff --git a/ngcompiler/lib/v1/src/compiler/i18n/metadata.dart b/ngcompiler/lib/v1/src/compiler/i18n/metadata.dart
@@ -119,7 +119,7 @@ class I18nMetadata {
       description.hashCode ^ locale.hashCode ^ meaning.hashCode ^ skip.hashCode;
 
   @override
-  bool operator ==(dynamic other) =>
+  bool operator ==(Object other) =>
       other is I18nMetadata &&
       other.description == description &&
       other.locale == locale &&