Version 3.11.0-87.0.dev

Merge fc8b3d7 into dev

Author: Dart CI

pkg/analysis_server/lib/src/services/completion/dart/feature_computer.dart

@@ -626,6 +626,21 @@ class _ContextTypeVisitor extends SimpleAstVisitor<DartType> {
   @override
   DartType? visitBinaryExpression(BinaryExpression node) {
     if (node.operator.end <= offset) {
+      if (node.operator.type == TokenType.EQ_EQ ||
+          node.operator.type == TokenType.BANG_EQ_EQ) {
+        // TODO(kallentu): Fix the parser implementation where dot shorthand
+        // const constructor declarations recover with a wrapping function
+        // expression invocation and then remove this.
+        var rightOperand = node.rightOperand;
+        if (rightOperand is FunctionExpressionInvocation &&
+            rightOperand.function is DotShorthandMixin) {
+          rightOperand = rightOperand.function;
+        }
+        if (rightOperand is DotShorthandMixin && rightOperand.isDotShorthand) {
+          return node.leftOperand.staticType;
+        }
+      }
+
       return node.rightOperand.correspondingParameter?.type;
     }
     return _visitParent(node);
@@ -648,6 +663,11 @@ class _ContextTypeVisitor extends SimpleAstVisitor<DartType> {
     }
   }
 
+  @override
+  DartType? visitConstantPattern(ConstantPattern node) {
+    return _visitParent(node);
+  }
+
   @override
   DartType? visitConstructorFieldInitializer(ConstructorFieldInitializer node) {
     if (node.equals.end <= offset) {
@@ -823,6 +843,21 @@ class _ContextTypeVisitor extends SimpleAstVisitor<DartType> {
     return null;
   }
 
+  @override
+  DartType? visitGuardedPattern(GuardedPattern node) {
+    if (node.parent
+        case SwitchExpressionCase(parent: SwitchExpression(:var expression)) ||
+            SwitchPatternCase(parent: SwitchStatement(:var expression))) {
+      var when = node.whenClause;
+      if (when != null && range.startEnd(when, node).contains(offset)) {
+        return typeProvider.boolType;
+      } else {
+        return expression.staticType;
+      }
+    }
+    return null;
+  }
+
   @override
   DartType? visitIfElement(IfElement node) {
     if (range
@@ -1391,6 +1426,10 @@ extension on ArgumentList {
           case ConstructorElement constructorElement) {
         return constructorElement.type;
       }
+    } else if (parent is SuperConstructorInvocation) {
+      if (parent.element case ConstructorElement constructorElement) {
+        return constructorElement.type;
+      }
     }
     return null;
   }

pkg/analysis_server/lib/src/services/completion/dart/in_scope_completion_pass.dart

@@ -951,6 +951,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     var period = node.period;
     if (offset >= period.end && offset <= node.constructorName.end) {
       var contextType = _computeContextType(node);
+      contextType = _resolveFutureOrType(contextType);
       if (contextType is! InterfaceType) return;
       declarationHelper(
         mustBeConstant: node.isConst,
@@ -965,6 +966,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     var period = node.period;
     if (offset >= period.end && offset <= node.memberName.end) {
       var contextType = _computeContextType(node);
+      contextType = _resolveFutureOrType(contextType);
       if (contextType == null) return;
 
       var element = contextType.element;
@@ -981,6 +983,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
   @override
   void visitDotShorthandPropertyAccess(DotShorthandPropertyAccess node) {
     var contextType = _computeContextType(node);
+    contextType = _resolveFutureOrType(contextType);
     if (contextType == null) return;
 
     var element = contextType.element;
@@ -4086,6 +4089,13 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     return 'ArgumentList_${context}_$argumentKind';
   }
 
+  DartType? _resolveFutureOrType(DartType? contextType) {
+    if (contextType is InterfaceType && contextType.isDartAsyncFutureOr) {
+      return contextType.typeArguments.firstOrNull;
+    }
+    return contextType;
+  }
+
   /// Suggests overrides in the context of the given [element].
   ///
   /// If the budget has been exceeded, then the results are marked as incomplete
@@ -4114,9 +4124,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     required RecordLiteral? recordLiteral,
     required bool isNewField,
   }) {
-    if (contextType != null && (contextType.isDartAsyncFutureOr)) {
-      contextType = (contextType as InterfaceType).typeArguments.firstOrNull;
-    }
+    contextType = _resolveFutureOrType(contextType);
     RecordType recordType;
     if (contextType is RecordType) {
       recordType = contextType;

pkg/analysis_server/test/services/completion/dart/location/dot_shorthand_constructor_invocation_test.dart

@@ -36,6 +36,44 @@ suggestions
 ''');
   }
 
+  Future<void> test_constructor_const_equality() async {
+    allowedIdentifiers = {'named', 'notConstant'};
+    await computeSuggestions('''
+class C {
+  const C.named();
+  C.notConstant();
+}
+void f() {
+  print(C() == const .^);
+}
+''');
+    assertResponse(r'''
+suggestions
+  named
+    kind: constructorInvocation
+''');
+  }
+
+  Future<void> test_constructor_const_equality_withPrefix() async {
+    allowedIdentifiers = {'named', 'notConstant'};
+    await computeSuggestions('''
+class C {
+  const C.named();
+  C.notConstant();
+}
+void f() {
+  print(C.named() == const .n^);
+}
+''');
+    assertResponse(r'''
+replacement
+  left: 1
+suggestions
+  named
+    kind: constructorInvocation
+''');
+  }
+
   Future<void> test_constructor_const_withPrefix() async {
     allowedIdentifiers = {'named', 'notConstant'};
     await computeSuggestions('''

pkg/analysis_server/test/services/completion/dart/location/dot_shorthand_invocation_test.dart

@@ -34,6 +34,25 @@ suggestions
 ''');
   }
 
+  Future<void> test_constructor_class_named_equality_withPrefix() async {
+    allowedIdentifiers = {'named'};
+    await computeSuggestions('''
+class C {
+  C.named();
+}
+void f() {
+  print(C.named() == .n^);
+}
+''');
+    assertResponse(r'''
+replacement
+  left: 1
+suggestions
+  named
+    kind: constructorInvocation
+''');
+  }
+
   Future<void> test_constructor_class_unnamed() async {
     allowedIdentifiers = {'new'};
     await computeSuggestions('''
@@ -49,6 +68,21 @@ suggestions
 ''');
   }
 
+  Future<void> test_constructor_class_unnamed_equality() async {
+    allowedIdentifiers = {'new'};
+    await computeSuggestions('''
+class C {}
+void f() {
+  print(C() == .^);
+}
+''');
+    assertResponse(r'''
+suggestions
+  new
+    kind: constructorInvocation
+''');
+  }
+
   Future<void> test_constructor_class_withParentheses() async {
     allowedIdentifiers = {'named'};
     await computeSuggestions('''
@@ -181,6 +215,21 @@ suggestions
 ''');
   }
 
+  Future<void> test_constructor_extensionType_unnamed_equality() async {
+    allowedIdentifiers = {'new'};
+    await computeSuggestions('''
+extension type C(int x) {}
+void f() {
+  print(C() == .^);
+}
+''');
+    assertResponse(r'''
+suggestions
+  new
+    kind: constructorInvocation
+''');
+  }
+
   Future<void> test_constructor_extensionType_withPrefix_named() async {
     allowedIdentifiers = {'named'};
     await computeSuggestions('''
@@ -281,6 +330,24 @@ suggestions
 ''');
   }
 
+  Future<void> test_method_class_equality() async {
+    allowedIdentifiers = {'method', 'notStatic'};
+    await computeSuggestions('''
+class C {
+  static C method() => C();
+  C notStatic() => C();
+}
+void f() {
+  print(C() == .^);
+}
+''');
+    assertResponse(r'''
+suggestions
+  method
+    kind: methodInvocation
+''');
+  }
+
   Future<void> test_method_class_withParentheses() async {
     allowedIdentifiers = {'method', 'notStatic'};
     await computeSuggestions('''
@@ -338,6 +405,24 @@ suggestions
 ''');
   }
 
+  Future<void> test_method_extensionType_equality() async {
+    allowedIdentifiers = {'method', 'notStatic'};
+    await computeSuggestions('''
+extension type C(int x) {
+  static C method() => C(1);
+  C notStatic() => C(1);
+}
+void f() {
+  print(C(1) == .^);
+}
+''');
+    assertResponse(r'''
+suggestions
+  method
+    kind: methodInvocation
+''');
+  }
+
   Future<void> test_method_extensionType_withPrefix() async {
     allowedIdentifiers = {'method', 'anotherMethod', 'notStatic'};
     await computeSuggestions('''