AST. Implement DirectAssignment and UnqualifiedNameAssignmentTarget.

Bug: #63882
Change-Id: I70d1826d5158922731dfb2967a81bc6bf1b167ad
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/530260
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>

Author: scheglov

pkg/analysis_server/lib/src/services/correction/dart/convert_to_switch_expression.dart

@@ -453,8 +453,8 @@ class ConvertToSwitchExpression extends ResolvedCorrectionProducer {
         canBeReturn = false;
       }
 
-      var statement = statements.first;
-      if (statement is ExpressionStatementImpl) {
+      Statement statement = statements.first;
+      if (statement is ExpressionStatement) {
         var expression = statement.expression;
         // Any type of switch can have a throw expression as a statement.
         if (expression is ThrowExpression) {
@@ -470,7 +470,7 @@ class ConvertToSwitchExpression extends ResolvedCorrectionProducer {
         // A return switch case's statement can't be a non-throw expression.
         canBeReturn = false;
 
-        if (canBeArgument && expression is MethodInvocationImpl) {
+        if (canBeArgument && expression is MethodInvocation) {
           // An assignment switch case's statement can't be a method invocation.
           canBeAssignment = false;
 
@@ -482,12 +482,12 @@ class ConvertToSwitchExpression extends ResolvedCorrectionProducer {
             // The function invoked in each case must be the same.
             return null;
           }
-        } else if (canBeAssignment && expression is AssignmentExpressionImpl) {
+        } else if (canBeAssignment && expression is AssignmentExpression) {
           // An argument switch case's statement can't be an assignment.
           canBeArgument = false;
 
           var leftHandSide = expression.leftHandSide;
-          if (leftHandSide is! SimpleIdentifierImpl) return null;
+          if (leftHandSide is! SimpleIdentifier) return null;
           if (writeElement == null) {
             var element = leftHandSide.element;
             if (element is! LocalVariableElement) return null;
@@ -508,7 +508,7 @@ class ConvertToSwitchExpression extends ResolvedCorrectionProducer {
         // it must be a return statement with a
         // non-null expression as part of a return switch.
         if (!canBeReturn ||
-            statement is! ReturnStatementImpl ||
+            statement is! ReturnStatement ||
             statement.expression == null) {
           return null;
         }

pkg/analyzer/api.txt

@@ -616,6 +616,9 @@ abstract class RuleVisitorRegistry2 {
     AstVisitor2 visitor,
   );
 
+  @experimental
+  void addDirectAssignment(AbstractAnalysisRule rule, AstVisitor2 visitor);
+
   void addDoStatement(AbstractAnalysisRule rule, AstVisitor2 visitor);
 
   void addDotShorthandConstructorInvocation(
@@ -1009,6 +1012,12 @@ abstract class RuleVisitorRegistry2 {
     AstVisitor2 visitor,
   );
 
+  @experimental
+  void addUnqualifiedNameAssignmentTarget(
+    AbstractAnalysisRule rule,
+    AstVisitor2 visitor,
+  );
+
   void addVariableDeclaration(AbstractAnalysisRule rule, AstVisitor2 visitor);
 
   void addVariableDeclarationList(

pkg/analyzer/lib/analysis_rule/rule_visitor_registry.g.dart

@@ -53,6 +53,8 @@ export 'package:analyzer/src/dart/ast/ast.dart'
         AssertStatement,
         AssignedVariablePattern,
         AssignmentExpression,
+        AssignmentExpression2,
+        AssignmentTarget,
         AstNode,
         AstVisitor,
         AstVisitor2,
@@ -112,6 +114,7 @@ export 'package:analyzer/src/dart/ast/ast.dart'
         DotShorthandPropertyAccess,
         DottedName,
         DoubleLiteral,
+        DirectAssignment,
         EmptyClassBody,
         EmptyEnumBody,
         EmptyFunctionBody,
@@ -171,6 +174,7 @@ export 'package:analyzer/src/dart/ast/ast.dart'
         InstanceReceiver,
         InstanceCreationExpression,
         IntegerLiteral,
+        InvalidNamedWriteResolution,
         InterpolationElement,
         InterpolationExpression,
         InterpolationString,
@@ -199,7 +203,9 @@ export 'package:analyzer/src/dart/ast/ast.dart'
         MixinDeclaration,
         MixinOnClause,
         NamedArgument,
+        NamedReadResolution,
         NamedType,
+        NamedWriteResolution,
         NamespaceDirective,
         NameWithTypeParameters,
         NativeClause,
@@ -248,6 +254,7 @@ export 'package:analyzer/src/dart/ast/ast.dart'
         ReturnStatement,
         ScriptTag,
         SetOrMapLiteral,
+        SetterInvocationResolution,
         ShowCombinator,
         SimpleIdentifier,
         SimpleStringLiteral,
@@ -281,10 +288,13 @@ export 'package:analyzer/src/dart/ast/ast.dart'
         UriBasedDirective,
         UnaryOperator,
         UnaryOperatorInvocation,
+        UnqualifiedNameAssignmentTarget,
         VariableDeclaration,
         VariableDeclarationList,
         VariableDeclarationStatement,
         VariablePattern,
+        VariableWriteResolution,
+        ValidNamedWriteResolution,
         WhenClause,
         WhileStatement,
         WildcardPattern,

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

@@ -77,6 +77,13 @@ class GeneralizingAstVisitor<R> implements AstVisitor<R> {
   R? visitAssignmentExpression(AssignmentExpression node) =>
       visitExpression(node);
 
+  @experimental
+  R? visitAssignmentExpression2(AssignmentExpression2 node) =>
+      visitExpression(node);
+
+  @experimental
+  R? visitAssignmentTarget(AssignmentTarget node) => visitNode(node);
+
   @override
   R? visitAwaitExpression(AwaitExpression node) => visitExpression(node);
 
@@ -816,6 +823,13 @@ class GeneralizingAstVisitor2<R> implements AstVisitor2<R> {
   R? visitAssignmentExpression(AssignmentExpression node) =>
       visitExpression(node);
 
+  @experimental
+  R? visitAssignmentExpression2(AssignmentExpression2 node) =>
+      visitExpression(node);
+
+  @experimental
+  R? visitAssignmentTarget(AssignmentTarget node) => visitNode(node);
+
   @override
   R? visitAwaitExpression(AwaitExpression node) => visitExpression(node);
 
@@ -953,6 +967,11 @@ class GeneralizingAstVisitor2<R> implements AstVisitor2<R> {
   R? visitDelimitedFormalParameters(DelimitedFormalParameters node) =>
       visitNode(node);
 
+  @experimental
+  @override
+  R? visitDirectAssignment(DirectAssignment node) =>
+      visitAssignmentExpression2(node);
+
   R? visitDirective(Directive node) => visitAnnotatedNode(node);
 
   @override
@@ -1513,6 +1532,12 @@ class GeneralizingAstVisitor2<R> implements AstVisitor2<R> {
   R? visitUnaryOperatorInvocation(UnaryOperatorInvocation node) =>
       visitExpression(node);
 
+  @experimental
+  @override
+  R? visitUnqualifiedNameAssignmentTarget(
+    UnqualifiedNameAssignmentTarget node,
+  ) => visitAssignmentTarget(node);
+
   R? visitUriBasedDirective(UriBasedDirective node) => visitDirective(node);
 
   @override
@@ -2963,6 +2988,13 @@ class RecursiveAstVisitor2<R> implements AstVisitor2<R> {
     return null;
   }
 
+  @experimental
+  @override
+  R? visitDirectAssignment(DirectAssignment node) {
+    node.visitChildren2(this);
+    return null;
+  }
+
   @override
   R? visitDoStatement(DoStatement node) {
     node.visitChildren2(this);
@@ -3837,6 +3869,15 @@ class RecursiveAstVisitor2<R> implements AstVisitor2<R> {
     return null;
   }
 
+  @experimental
+  @override
+  R? visitUnqualifiedNameAssignmentTarget(
+    UnqualifiedNameAssignmentTarget node,
+  ) {
+    node.visitChildren2(this);
+    return null;
+  }
+
   @override
   R? visitVariableDeclaration(VariableDeclaration node) {
     node.visitChildren2(this);
@@ -4621,6 +4662,10 @@ class SimpleAstVisitor2<R> implements AstVisitor2<R> {
   @override
   R? visitDelimitedFormalParameters(DelimitedFormalParameters node) => null;
 
+  @experimental
+  @override
+  R? visitDirectAssignment(DirectAssignment node) => null;
+
   @override
   R? visitDoStatement(DoStatement node) => null;
 
@@ -5074,6 +5119,12 @@ class SimpleAstVisitor2<R> implements AstVisitor2<R> {
   @override
   R? visitUnaryOperatorInvocation(UnaryOperatorInvocation node) => null;
 
+  @experimental
+  @override
+  R? visitUnqualifiedNameAssignmentTarget(
+    UnqualifiedNameAssignmentTarget node,
+  ) => null;
+
   @override
   R? visitVariableDeclaration(VariableDeclaration node) => null;
 
@@ -5861,6 +5912,10 @@ class ThrowingAstVisitor2<R> implements AstVisitor2<R> {
   R? visitDelimitedFormalParameters(DelimitedFormalParameters node) =>
       _throw(node);
 
+  @experimental
+  @override
+  R? visitDirectAssignment(DirectAssignment node) => _throw(node);
+
   @override
   R? visitDoStatement(DoStatement node) => _throw(node);
 
@@ -6322,6 +6377,12 @@ class ThrowingAstVisitor2<R> implements AstVisitor2<R> {
   @override
   R? visitUnaryOperatorInvocation(UnaryOperatorInvocation node) => _throw(node);
 
+  @experimental
+  @override
+  R? visitUnqualifiedNameAssignmentTarget(
+    UnqualifiedNameAssignmentTarget node,
+  ) => _throw(node);
+
   @override
   R? visitVariableDeclaration(VariableDeclaration node) => _throw(node);
 
@@ -8230,6 +8291,15 @@ class TimedAstVisitor2<T> implements AstVisitor2<T> {
     return result;
   }
 
+  @experimental
+  @override
+  T? visitDirectAssignment(DirectAssignment node) {
+    stopwatch.start();
+    T? result = _baseVisitor.visitDirectAssignment(node);
+    stopwatch.stop();
+    return result;
+  }
+
   @override
   T? visitDoStatement(DoStatement node) {
     stopwatch.start();
@@ -9388,6 +9458,17 @@ class TimedAstVisitor2<T> implements AstVisitor2<T> {
     return result;
   }
 
+  @experimental
+  @override
+  T? visitUnqualifiedNameAssignmentTarget(
+    UnqualifiedNameAssignmentTarget node,
+  ) {
+    stopwatch.start();
+    T? result = _baseVisitor.visitUnqualifiedNameAssignmentTarget(node);
+    stopwatch.stop();
+    return result;
+  }
+
   @override
   T? visitVariableDeclaration(VariableDeclaration node) {
     stopwatch.start();
@@ -10240,6 +10321,10 @@ class UnifyingAstVisitor2<R> implements AstVisitor2<R> {
   R? visitDelimitedFormalParameters(DelimitedFormalParameters node) =>
       visitNode(node);
 
+  @experimental
+  @override
+  R? visitDirectAssignment(DirectAssignment node) => visitNode(node);
+
   @override
   R? visitDoStatement(DoStatement node) => visitNode(node);
 
@@ -10720,6 +10805,12 @@ class UnifyingAstVisitor2<R> implements AstVisitor2<R> {
   R? visitUnaryOperatorInvocation(UnaryOperatorInvocation node) =>
       visitNode(node);
 
+  @experimental
+  @override
+  R? visitUnqualifiedNameAssignmentTarget(
+    UnqualifiedNameAssignmentTarget node,
+  ) => visitNode(node);
+
   @override
   R? visitVariableDeclaration(VariableDeclaration node) => visitNode(node);
 

pkg/analyzer/lib/dart/ast/visitor.g.dart

@@ -109,7 +109,7 @@ testFineAfterLibraryAnalyzerHook;
 // TODO(scheglov): Clean up the list of implicitly analyzed files.
 class AnalysisDriver {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 667;
+  static const int DATA_VERSION = 671;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -920,6 +920,27 @@ class _IndexContributor extends GeneralizingAstVisitor2 {
     node.typeArguments?.accept2(this);
   }
 
+  @override
+  void visitDirectAssignment(DirectAssignment node) {
+    var target = node.target as UnqualifiedNameAssignmentTarget;
+    var write = target.write;
+    if (write is! ValidNamedWriteResolution) {
+      assembler.addNameRelation(
+        target.name.lexeme,
+        IndexRelationKind.IS_WRITTEN_BY,
+        target.offset,
+        false,
+      );
+    } else {
+      var element = write.element;
+      if (element.firstFragment.enclosingFragment is LibraryFragmentImpl) {
+        assembler.addPrefixForElement(element);
+      }
+      recordRelation(element, IndexRelationKind.IS_WRITTEN_BY, target, false);
+    }
+    super.visitDirectAssignment(node);
+  }
+
   @override
   void visitDotShorthandConstructorInvocation(
     DotShorthandConstructorInvocation node,

pkg/analyzer/lib/src/dart/analysis/index.dart

@@ -420,6 +420,13 @@ class _ReferencedNamesComputer extends GeneralizingAstVisitor2<void> {
     super.visitSuperFormalParameter(node);
   }
 
+  @override
+  void visitUnqualifiedNameAssignmentTarget(
+    UnqualifiedNameAssignmentTarget node,
+  ) {
+    _addIfNotShadowed(node.name, hasImportPrefix: false);
+  }
+
   /// Adds [token] if it is not shadowed by a local element.
   void _addIfNotShadowed(Token token, {required bool hasImportPrefix}) {
     var name = token.lexeme;

pkg/analyzer/lib/src/dart/analysis/referenced_names.dart

@@ -946,6 +946,8 @@ class Search {
     }
     if (setter != null) {
       await _addResults(results, setter, const {
+        IndexRelationKind.IS_WRITTEN_BY: SearchResultKind.WRITE,
+        // TODO(scheglov): Remove when all assignment targets use IS_WRITTEN_BY.
         IndexRelationKind.IS_REFERENCED_BY: SearchResultKind.WRITE,
       });
     }
@@ -1861,6 +1863,20 @@ class _LocalReferencesVisitor extends RecursiveAstVisitor2<void> {
     }
   }
 
+  @override
+  void visitUnqualifiedNameAssignmentTarget(
+    UnqualifiedNameAssignmentTarget node,
+  ) {
+    var write = node.write;
+    if (write is ValidNamedWriteResolution) {
+      var element = write.element;
+      var variable = element.tryCast<PropertyAccessorElement>()?.variable;
+      if (elements.contains(element) || elements.contains(variable)) {
+        _addResult(node, SearchResultKind.WRITE);
+      }
+    }
+  }
+
   void _addResult(SyntacticEntity entity, SearchResultKind kind) {
     bool isQualified = entity is AstNode && entity.parent2 is Label;
     _addResultImpl(entity, kind, isQualified: isQualified);