Record a fix about extra parens for computed properties

Use countType and add an additional tuple check

Add tests

[Sema] Record a fix about extra parens for computed properties

Author: Sima Nerush

lib/Sema/CSSimplify.cpp

@@ -7750,7 +7750,23 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
     if (type1->isPlaceholder() || type2->isPlaceholder())
       return getTypeMatchSuccess();
 
+    // If parameter pack expansion contains more than one element and the other
+    // side is a tuple, record a fix.
     auto *loc = getConstraintLocator(locator);
+    if (loc->isLastElement<LocatorPathElt::ApplyArgToParam>()) {
+      if (auto packExpansion = type2->getAs<PackExpansionType>()) {
+        auto countType = simplifyType(packExpansion->getCountType(), flags);
+        if (auto paramPack = countType->getAs<PackType>()) {
+          if (type1->is<TupleType>() && paramPack->getNumElements() >= 1) {
+            if (recordFix(DestructureTupleToMatchPackExpansionParameter::create(
+                    *this, paramPack, loc))) {
+              return getTypeMatchFailure(loc);
+            }
+            return getTypeMatchSuccess();
+          }
+        }
+      }
+    }
     if (recordFix(AllowInvalidPackExpansion::create(*this, loc)))
       return getTypeMatchFailure(locator);
 
@@ -13451,14 +13467,16 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifySameShapeConstraint(
         auto paramPack = type2->castTo<PackType>();
 
         // Tailed diagnostic to explode tuples.
+        // FIXME: This is very similar to
+        // 'cannot_convert_single_tuple_into_multiple_arguments'; can we emit
+        // both of these in the same place?
         if (argPack->getNumElements() == 1) {
-          if (auto *tuple = argPack->getElementType(0)->getAs<TupleType>()) {
-            if (tuple->getNumElements() == paramPack->getNumElements()) {
-              return recordShapeFix(
-                  DestructureTupleToMatchPackExpansionParameter::create(
-                      *this, paramPack, loc),
-                  /*impact=*/2 * paramPack->getNumElements());
-            }
+          if (argPack->getElementType(0)->is<TupleType>() &&
+              paramPack->getNumElements() >= 1) {
+            return recordShapeFix(
+                DestructureTupleToMatchPackExpansionParameter::create(
+                    *this, paramPack, loc),
+                /*impact=*/2 * paramPack->getNumElements());
           }
         }
 

test/Constraints/pack-expansion-expressions.swift

@@ -604,3 +604,47 @@ func test_that_expansions_are_bound_early() {
       })
   }
 }
+
+// https://github.com/apple/swift/issues/66393
+do {
+    struct S<each T> {
+        var property: (repeat each T) -> Void { // expected-note 4 {{'property' declared here}}
+            get {}
+        }
+
+        func method(_: repeat each T) {} // expected-note 4 {{'method' declared here}}
+    }
+    S<Int, Bool>().method((5, true))
+    // expected-error@-1 {{value pack expansion at parameter #0 expects 2 separate arguments; remove extra parentheses to change tuple into separate arguments}}
+
+    S<Int, Bool>().method((5, true, 6))
+    // expected-error@-1 {{value pack expansion at parameter #0 expects 2 separate arguments; remove extra parentheses to change tuple into separate arguments}}
+
+    S<Int, Bool>().property((5, true))
+    // expected-error@-1 {{value pack expansion at parameter #0 expects 2 separate arguments; remove extra parentheses to change tuple into separate arguments}}
+
+    S<Int, Bool>().property((5, true, 6))
+    // expected-error@-1 {{value pack expansion at parameter #0 expects 2 separate arguments; remove extra parentheses to change tuple into separate arguments}}
+
+    func foo<each U>(u: repeat each U) {
+        S<repeat each U>().property((3, 4, 5))
+        // expected-error@-1 {{value pack expansion at parameter #0 expects 1 separate arguments; remove extra parentheses to change tuple into separate arguments}}
+
+        // FIXME: The count of 'repeat each U' is not statically known, but error suggests that it is 1.
+        S<repeat each U>().method((3, 4, 5))
+        // expected-error@-1 {{value pack expansion at parameter #0 expects 1 separate arguments; remove extra parentheses to change tuple into separate arguments}}
+        // FIXME: Bad diagnostics
+        // expected-error@-3 {{pack expansion requires that 'each U' and '_' have the same shape}}
+        // expected-error@-4 {{pack expansion requires that 'each U' and '_.RawValue' have the same shape}}
+
+        // FIXME: The count of '(Int, Int), repeat each U' is not statically known, but error suggests that it is 2.
+        S<(Int, Int), repeat each U>().method((3, 4))
+        // expected-error@-1 {{value pack expansion at parameter #0 expects 2 separate arguments; remove extra parentheses to change tuple into separate arguments}}
+        // FIXME: Duplicate diagnostics
+        // expected-error@-3 2 {{pack expansion requires that 'each U' and '' have the same shape}}
+
+        // FIXME: The count of '(Int, Int), repeat each U' is not statically known, but error suggests that it is 2.
+        S<(Int, Int), repeat each U>().property((3, 4))
+        // expected-error@-1 {{value pack expansion at parameter #0 expects 2 separate arguments; remove extra parentheses to change tuple into separate arguments}}
+    }
+}