Version 2.11.0-171.0.dev

Merge commit '3af963831557ac249730b76aac253539f1be06e0' into 'dev'

Author: Dart CI

pkg/analyzer/lib/dart/ast/ast.dart

@@ -3241,11 +3241,15 @@ abstract class IndexExpression
   /// The auxiliary elements hold the static and propagated elements associated
   /// with the getter context.
   // TODO(brianwilkerson) Replace this API.
+  @Deprecated('Use CompoundAssignmentExpression.readElement and/or '
+      'CompoundAssignmentExpression.writeElement')
   AuxiliaryElements get auxiliaryElements;
 
   /// Set the auxiliary elements associated with this identifier to the given
   /// [elements].
   // TODO(brianwilkerson) Replace this API.
+  @Deprecated('Use CompoundAssignmentExpression.readElement and/or '
+      'CompoundAssignmentExpression.writeElement')
   set auxiliaryElements(AuxiliaryElements elements);
 
   /// Return the expression used to compute the index.

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -5810,6 +5810,8 @@ class IndexExpressionImpl extends ExpressionImpl
   /// If this expression is both in a getter and setter context, the
   /// [AuxiliaryElements] will be set to hold onto the static element from the
   /// getter context.
+  @Deprecated('Use CompoundAssignmentExpression.readElement and/or '
+      'CompoundAssignmentExpression.writeElement')
   @override
   AuxiliaryElements auxiliaryElements;
 

pkg/analyzer/lib/src/dart/ast/utilities.dart

@@ -4738,6 +4738,7 @@ class ResolutionCopier implements AstVisitor<bool> {
         _isEqualTokens(node.leftBracket, toNode.leftBracket),
         _isEqualNodes(node.index, toNode.index),
         _isEqualTokens(node.rightBracket, toNode.rightBracket))) {
+      // ignore: deprecated_member_use_from_same_package
       toNode.auxiliaryElements = node.auxiliaryElements;
       toNode.staticElement = node.staticElement;
       toNode.staticType = node.staticType;

pkg/analyzer/lib/src/generated/error_verifier.dart

@@ -321,6 +321,13 @@ class ErrorVerifier extends RecursiveAstVisitor<void> {
       _checkForDeadNullCoalesce(node.readType, node.rightHandSide);
     }
     _checkForAssignmentToFinal(lhs);
+    if (lhs is IndexExpression) {
+      _checkIndexExpressionIndex(
+        lhs.index,
+        readElement: node.readElement,
+        writeElement: node.writeElement,
+      );
+    }
     super.visitAssignmentExpression(node);
   }
 
@@ -816,28 +823,19 @@ class ErrorVerifier extends RecursiveAstVisitor<void> {
 
   @override
   void visitIndexExpression(IndexExpression node) {
-    void checkIndexExpression(MethodElement method) {
-      if (method != null) {
-        var parameters = method.parameters;
-        if (parameters.isNotEmpty) {
-          _checkForArgumentTypeNotAssignableForArgument2(
-            argument: node.index,
-            parameter: parameters[0],
-            promoteParameterToNullable: false,
-          );
-        }
-      }
-    }
-
-    checkIndexExpression(node.staticElement);
-    checkIndexExpression(node.auxiliaryElements?.staticElement);
+    _checkIndexExpressionIndex(
+      node.index,
+      readElement: node.staticElement,
+      writeElement: null,
+    );
 
     if (node.isNullAware) {
       _checkForUnnecessaryNullAware(
         node.realTarget,
         node.question ?? node.period ?? node.leftBracket,
       );
     }
+
     super.visitIndexExpression(node);
   }
 
@@ -989,12 +987,20 @@ class ErrorVerifier extends RecursiveAstVisitor<void> {
 
   @override
   void visitPostfixExpression(PostfixExpression node) {
+    var operand = node.operand;
     if (node.operator.type == TokenType.BANG) {
       _checkForUseOfVoidResult(node);
-      _checkForUnnecessaryNullAware(node.operand, node.operator);
+      _checkForUnnecessaryNullAware(operand, node.operator);
     } else {
-      _checkForAssignmentToFinal(node.operand);
-      _checkForIntNotAssignable(node.operand);
+      _checkForAssignmentToFinal(operand);
+      _checkForIntNotAssignable(operand);
+    }
+    if (operand is IndexExpression) {
+      _checkIndexExpressionIndex(
+        operand.index,
+        readElement: node.readElement,
+        writeElement: node.writeElement,
+      );
     }
     super.visitPostfixExpression(node);
   }
@@ -1022,6 +1028,13 @@ class ErrorVerifier extends RecursiveAstVisitor<void> {
       _checkForUseOfVoidResult(operand);
       _checkForIntNotAssignable(operand);
     }
+    if (operand is IndexExpression) {
+      _checkIndexExpressionIndex(
+        operand.index,
+        readElement: node.readElement,
+        writeElement: node.writeElement,
+      );
+    }
     super.visitPrefixExpression(node);
   }
 
@@ -4809,6 +4822,34 @@ class ErrorVerifier extends RecursiveAstVisitor<void> {
     }
   }
 
+  void _checkIndexExpressionIndex(
+    Expression index, {
+    @required ExecutableElement readElement,
+    @required ExecutableElement writeElement,
+  }) {
+    if (readElement is MethodElement) {
+      var parameters = readElement.parameters;
+      if (parameters.isNotEmpty) {
+        _checkForArgumentTypeNotAssignableForArgument2(
+          argument: index,
+          parameter: parameters[0],
+          promoteParameterToNullable: false,
+        );
+      }
+    }
+
+    if (writeElement is MethodElement) {
+      var parameters = writeElement.parameters;
+      if (parameters.isNotEmpty) {
+        _checkForArgumentTypeNotAssignableForArgument2(
+          argument: index,
+          parameter: parameters[0],
+          promoteParameterToNullable: false,
+        );
+      }
+    }
+  }
+
   void _checkMixinInference(
       NamedCompilationUnitMember node, WithClause withClause) {
     if (withClause == null) {

pkg/analyzer/lib/src/generated/resolver.dart

@@ -658,6 +658,7 @@ class ResolverVisitor extends ScopedVisitor {
     if (left is IndexExpression) {
       if (hasRead) {
         left.staticElement = assignment.writeElement;
+        // ignore: deprecated_member_use_from_same_package
         left.auxiliaryElements = AuxiliaryElements(assignment.readElement);
       } else {
         left.staticElement = assignment.writeElement;

pkg/analyzer/test/src/dart/ast/utilities_test.dart

@@ -568,6 +568,7 @@ class ResolutionCopierTest with ElementsTypesMixin {
     MethodElement staticElement = ElementFactory.methodElement(
         "m", interfaceTypeStar(ElementFactory.classElement2('C')));
     AuxiliaryElements auxiliaryElements = AuxiliaryElements(staticElement);
+    // ignore: deprecated_member_use_from_same_package
     fromNode.auxiliaryElements = auxiliaryElements;
     fromNode.staticElement = staticElement;
     DartType staticType = interfaceTypeStar(ElementFactory.classElement2('C'));
@@ -577,6 +578,7 @@ class ResolutionCopierTest with ElementsTypesMixin {
       index: AstTestFactory.integer(0),
     );
     ResolutionCopier.copyResolutionData(fromNode, toNode);
+    // ignore: deprecated_member_use_from_same_package
     expect(toNode.auxiliaryElements, same(auxiliaryElements));
     expect(toNode.staticElement, same(staticElement));
     expect(toNode.staticType, same(staticType));

pkg/analyzer/test/src/dart/resolution/resolution.dart

@@ -112,23 +112,6 @@ mixin ResolutionTest implements ResourceProviderMixin {
     assertType(node, type);
   }
 
-  void assertAuxElement(AstNode node, Element expected) {
-    var auxElements = getNodeAuxElements(node);
-    expect(auxElements?.staticElement, same(expected));
-  }
-
-  void assertAuxMember(
-    Expression node,
-    Element expectedBase,
-    Map<String, String> expectedSubstitution,
-  ) {
-    var actual = getNodeAuxElements(node)?.staticElement as ExecutableMember;
-
-    expect(actual.declaration, same(expectedBase));
-
-    assertSubstitution(actual.substitution, expectedSubstitution);
-  }
-
   void assertBinaryExpression(
     BinaryExpression node, {
     @required Object element,
@@ -397,6 +380,7 @@ mixin ResolutionTest implements ResourceProviderMixin {
     var isRead = node.inGetterContext();
     var isWrite = node.inSetterContext();
     if (isRead && isWrite) {
+      // ignore: deprecated_member_use_from_same_package
       assertElement(node.auxiliaryElements?.staticElement, readElement);
       assertElement(node.staticElement, writeElement);
     } else if (isRead) {
@@ -824,14 +808,6 @@ mixin ResolutionTest implements ResourceProviderMixin {
     }
   }
 
-  AuxiliaryElements getNodeAuxElements(AstNode node) {
-    if (node is IndexExpression) {
-      return node.auxiliaryElements;
-    } else {
-      fail('Unsupported node: (${node.runtimeType}) $node');
-    }
-  }
-
   Element getNodeElement(AstNode node) {
     if (node is Annotation) {
       return node.element;

pkg/analyzer/test/src/diagnostics/argument_type_not_assignable_test.dart

@@ -194,8 +194,12 @@ class A {
 }
 f(A a) {
   a['0'] += 0;
+  ++a['0'];
+  a['0']++;
 }''', [
       error(CompileTimeErrorCode.ARGUMENT_TYPE_NOT_ASSIGNABLE, 103, 3),
+      error(CompileTimeErrorCode.ARGUMENT_TYPE_NOT_ASSIGNABLE, 120, 3),
+      error(CompileTimeErrorCode.ARGUMENT_TYPE_NOT_ASSIGNABLE, 130, 3),
     ]);
   }
 
@@ -219,8 +223,12 @@ class A {
 }
 f(A a) {
   a['0'] += 0;
+  ++a['0'];
+  a['0']++;
 }''', [
       error(CompileTimeErrorCode.ARGUMENT_TYPE_NOT_ASSIGNABLE, 103, 3),
+      error(CompileTimeErrorCode.ARGUMENT_TYPE_NOT_ASSIGNABLE, 120, 3),
+      error(CompileTimeErrorCode.ARGUMENT_TYPE_NOT_ASSIGNABLE, 130, 3),
     ]);
   }
 

pkg/analyzer/test/src/summary/resolved_ast_printer.dart

@@ -770,10 +770,6 @@ class ResolvedAstPrinter extends ThrowingAstVisitor<void> {
     _writeln('IndexExpression');
     _withIndent(() {
       var properties = _Properties();
-      properties.addAuxiliaryElements(
-        'auxiliaryElements',
-        node.auxiliaryElements,
-      );
       properties.addNode('index', node.index);
       properties.addToken('period', node.period);
       properties.addNode('target', node.target);
@@ -1801,17 +1797,6 @@ class ResolvedAstPrinter extends ThrowingAstVisitor<void> {
   }
 }
 
-class _AuxiliaryElementsProperty extends _Property {
-  final AuxiliaryElements elements;
-
-  _AuxiliaryElementsProperty(String name, this.elements) : super(name);
-
-  @override
-  void write(ResolvedAstPrinter printer) {
-    printer._writeAuxiliaryElements(name, elements);
-  }
-}
-
 class _ElementProperty extends _Property {
   final Element element;
 
@@ -1848,12 +1833,6 @@ class _NodeProperty extends _Property {
 class _Properties {
   final properties = <_Property>[];
 
-  void addAuxiliaryElements(String name, AuxiliaryElements elements) {
-    properties.add(
-      _AuxiliaryElementsProperty(name, elements),
-    );
-  }
-
   void addElement(String name, Element element) {
     properties.add(
       _ElementProperty(name, element),

sdk/lib/_internal/js_dev_runtime/patch/core_patch.dart

@@ -732,8 +732,8 @@ class StringBuffer {
   @patch
   String toString() => Primitives.flattenString(_contents);
 
-  void _writeString(String str) {
-    _contents = Primitives.stringConcatUnchecked(_contents, str);
+  void _writeString(@notNull String str) {
+    _contents = JS<String>('!', '# + #', _contents, str);
   }
 
   static String _writeAll(String string, Iterable objects, String separator) {
@@ -753,8 +753,8 @@ class StringBuffer {
     return string;
   }
 
-  static String _writeOne(String string, Object? obj) {
-    return Primitives.stringConcatUnchecked(string, '$obj');
+  static String _writeOne(@notNull String string, Object? obj) {
+    return JS<String>('!', '# + #', string, '$obj');
   }
 }