Elements. Start removing AugmentableElement.

Change-Id: I6bbbe2336b6abaca88b9bea3defd74ed790dbaa2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/414661
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>

Author: scheglov

pkg/analysis_server/test/analysis/notification_highlights2_test.dart

@@ -1543,6 +1543,7 @@ class C = Object with A;
     assertHasRegion(HighlightRegionType.KEYWORD, 'with A;');
   }
 
+  @SkippedTest() // TODO(scheglov): implement augmentation
   Future<void> test_KEYWORD_augmented_onInstanceGetter() async {
     addTestFile('''
 class C {
@@ -1553,6 +1554,7 @@ class C {
     assertHasRegion(HighlightRegionType.KEYWORD, 'augmented');
   }
 
+  @SkippedTest() // TODO(scheglov): implement augmentation
   Future<void> test_KEYWORD_augmented_onInstanceMethod() async {
     addTestFile('''
 class C {
@@ -1563,6 +1565,7 @@ class C {
     assertHasRegion(HighlightRegionType.KEYWORD, 'augmented');
   }
 
+  @SkippedTest() // TODO(scheglov): implement augmentation
   Future<void> test_KEYWORD_augmented_onInstanceSetter() async {
     addTestFile('''
 class C {
@@ -1573,6 +1576,7 @@ class C {
     assertHasRegion(HighlightRegionType.KEYWORD, 'augmented');
   }
 
+  @SkippedTest() // TODO(scheglov): implement augmentation
   Future<void> test_KEYWORD_augmented_onStaticMethod() async {
     addTestFile('''
 class C {
@@ -1583,6 +1587,7 @@ class C {
     assertHasRegion(HighlightRegionType.KEYWORD, 'augmented');
   }
 
+  @SkippedTest() // TODO(scheglov): implement augmentation
   Future<void> test_KEYWORD_augmented_onTopLevelFunction() async {
     addTestFile('''
 augment int f(int x) => augmented(x);
@@ -1591,6 +1596,7 @@ augment int f(int x) => augmented(x);
     assertHasRegion(HighlightRegionType.KEYWORD, 'augmented');
   }
 
+  @SkippedTest() // TODO(scheglov): implement augmentation
   Future<void> test_KEYWORD_augmented_onTopLevelGetter() async {
     addTestFile('''
 augment int get g => augmented;
@@ -1599,6 +1605,7 @@ augment int get g => augmented;
     assertHasRegion(HighlightRegionType.KEYWORD, 'augmented');
   }
 
+  @SkippedTest() // TODO(scheglov): implement augmentation
   Future<void> test_KEYWORD_augmented_onTopLevelSetter() async {
     addTestFile('''
 augment set s(int x) { augmented = x; }

pkg/analysis_server/test/lsp/semantic_tokens_test.dart

@@ -271,6 +271,7 @@ class A {
     await _initializeAndVerifyTokensInRange(content, expected);
   }
 
+  @SkippedTest() // TODO(scheglov): implement augmentation
   Future<void> test_augmentations() async {
     var mainContent = '''
 part 'main_augmentation.dart';

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

@@ -320,15 +320,6 @@ class BinaryExpressionResolver {
       {required TypeImpl contextType}) {
     var left = node.leftOperand;
 
-    if (left is AugmentedExpressionImpl) {
-      _resolveUserDefinableAugmented(
-        node,
-        left: left,
-        contextType: contextType,
-      );
-      return;
-    }
-
     _resolver.analyzeExpression(
         node.leftOperand, SharedTypeSchemaView(UnknownInferredType.instance));
     left = _resolver.popRewrite()!;
@@ -351,56 +342,6 @@ class BinaryExpressionResolver {
     _resolveRightOperand(node, contextType);
   }
 
-  void _resolveUserDefinableAugmented(
-    BinaryExpressionImpl node, {
-    required AugmentedExpressionImpl left,
-    required TypeImpl contextType,
-  }) {
-    var methodName = node.operator.lexeme;
-
-    var augmentation = _resolver.enclosingAugmentation!;
-    var augmentationTarget = augmentation.augmentationTarget;
-
-    // Unresolved by default.
-    left.setPseudoExpressionStaticType(InvalidTypeImpl.instance);
-
-    switch (augmentationTarget) {
-      case MethodElementImpl fragment:
-        left.fragment = fragment;
-        left.setPseudoExpressionStaticType(
-            _resolver.thisType ?? InvalidTypeImpl.instance);
-        if (fragment.name2 == methodName) {
-          node.staticInvokeType = fragment.element.type;
-        } else {
-          _errorReporter.atToken(
-            left.augmentedKeyword,
-            CompileTimeErrorCode.AUGMENTED_EXPRESSION_NOT_OPERATOR,
-            arguments: [
-              methodName,
-            ],
-          );
-        }
-      case PropertyAccessorFragment fragment:
-        left.fragment = fragment;
-        var element = fragment.element;
-        if (element is GetterElement) {
-          left.setPseudoExpressionStaticType(element.returnType);
-          _resolveUserDefinableElement(node, methodName);
-        } else {
-          _errorReporter.atToken(
-            left.augmentedKeyword,
-            CompileTimeErrorCode.AUGMENTED_EXPRESSION_IS_SETTER,
-          );
-        }
-      case PropertyInducingFragment fragment:
-        left.fragment = fragment;
-        left.setPseudoExpressionStaticType(fragment.element.type);
-        _resolveUserDefinableElement(node, methodName);
-    }
-
-    _resolveRightOperand(node, contextType);
-  }
-
   void _resolveUserDefinableElement(
     BinaryExpressionImpl node,
     String methodName, {

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

@@ -48,11 +48,6 @@ class PrefixExpressionResolver {
       return;
     }
 
-    if (node.operand case AugmentedExpressionImpl operand) {
-      _resolveAugmented(node, operand);
-      return;
-    }
-
     var operand = node.operand;
     if (operator.isIncrementOperator) {
       var operandResolution = _resolver.resolveForWrite(
@@ -247,57 +242,6 @@ class PrefixExpressionResolver {
     _resolver.nullShortingTermination(node);
   }
 
-  void _resolveAugmented(
-    PrefixExpressionImpl node,
-    AugmentedExpressionImpl operand,
-  ) {
-    var methodName = _getPrefixOperator(node);
-    var augmentation = _resolver.enclosingAugmentation!;
-    var augmentationTarget = augmentation.augmentationTarget;
-
-    // Unresolved by default.
-    operand.setPseudoExpressionStaticType(InvalidTypeImpl.instance);
-
-    switch (augmentationTarget) {
-      case MethodFragment fragment:
-        operand.fragment = fragment;
-        operand.setPseudoExpressionStaticType(
-            _resolver.thisType ?? InvalidTypeImpl.instance);
-        if (fragment.element.lookupName == methodName) {
-          node.element = fragment.element;
-          node.recordStaticType(fragment.element.returnType,
-              resolver: _resolver);
-        } else {
-          _errorReporter.atToken(
-            operand.augmentedKeyword,
-            CompileTimeErrorCode.AUGMENTED_EXPRESSION_NOT_OPERATOR,
-            arguments: [
-              methodName,
-            ],
-          );
-          node.recordStaticType(InvalidTypeImpl.instance, resolver: _resolver);
-        }
-      case PropertyAccessorFragment fragment:
-        operand.fragment = fragment;
-        if (fragment.element is GetterElement) {
-          operand.setPseudoExpressionStaticType(fragment.element.returnType);
-          _resolve1(node);
-          _resolve2(node);
-        } else {
-          _errorReporter.atToken(
-            operand.augmentedKeyword,
-            CompileTimeErrorCode.AUGMENTED_EXPRESSION_IS_SETTER,
-          );
-          node.recordStaticType(InvalidTypeImpl.instance, resolver: _resolver);
-        }
-      case PropertyInducingFragment fragment:
-        operand.fragment = fragment;
-        operand.setPseudoExpressionStaticType(fragment.element.type);
-        _resolve1(node);
-        _resolve2(node);
-    }
-  }
-
   void _resolveNegation(PrefixExpressionImpl node) {
     var operand = node.operand;