TypeCheckType: Fix missing any fix-it for compositions

Author: AnthonyLatsis

lib/Sema/TypeCheckType.cpp

@@ -6033,40 +6033,58 @@ class ExistentialTypeSyntaxChecker : public ASTWalker {
   }
 
   void emitInsertAnyFixit(InFlightDiagnostic &diag, DeclRefTypeRepr *T) const {
-    TypeRepr *replaceRepr = T;
+    TypeRepr *replacementSource = T;
 
     // Insert parens in expression context for '(any P).self'
     bool needsParens = (exprCount != 0);
+
+    // Compute the replacement source (the node to which to apply `any`).
     if (reprStack.size() > 1) {
-      auto parentIt = reprStack.end() - 2;
-      needsParens = existentialNeedsParens(*parentIt);
-
-      // Expand to include parenthesis before checking if the parent needs
-      // to be replaced.
-      while (parentIt != reprStack.begin() &&
-             (*parentIt)->getWithoutParens() != *parentIt)
-        parentIt -= 1;
-
-      // For existential metatypes, 'any' is applied to the metatype.
-      if ((*parentIt)->getKind() == TypeReprKind::Metatype) {
-        replaceRepr = *parentIt;
-        if (parentIt != reprStack.begin())
-          needsParens = existentialNeedsParens(*(parentIt - 1));
+      auto it = reprStack.end() - 1;
+      auto replacementSourceIt = it;
+
+      // Backtrack the stack and expand the replacement source to any parent
+      // compositions or `.Type` metatypes, skipping only parentheses.
+      //
+      // - `P` → `any P`.
+      // - `P.Type` → `any P.Type`
+      // - `X & P` → `any X & P`, not `X & any P`.
+      // - `(X & P).Type` → `any (X & P).Type`, not `(any X & P).Type`.
+      do {
+        --it;
+        if ((*it)->getWithoutParens() != *it) {
+          continue;
+        }
+
+        if (isa<CompositionTypeRepr>(*it) || isa<MetatypeTypeRepr>(*it)) {
+          replacementSourceIt = it;
+          continue;
+        }
+
+        break;
+      } while (it != reprStack.begin());
+
+      // Whether parentheses are necessary is determined by the immediate parent
+      // of the replacement source.
+      if (replacementSourceIt != reprStack.begin()) {
+        needsParens = existentialNeedsParens(*(replacementSourceIt - 1));
       }
+
+      replacementSource = *replacementSourceIt;
     }
 
     llvm::SmallString<64> fix;
     {
       llvm::raw_svector_ostream OS(fix);
       if (needsParens)
         OS << "(";
-      ExistentialTypeRepr existential(SourceLoc(), replaceRepr);
+      ExistentialTypeRepr existential(SourceLoc(), replacementSource);
       existential.print(OS);
       if (needsParens)
         OS << ")";
     }
 
-    diag.fixItReplace(replaceRepr->getSourceRange(), fix);
+    diag.fixItReplace(replacementSource->getSourceRange(), fix);
   }
 
   void checkDeclRefTypeRepr(DeclRefTypeRepr *T) const {

test/type/explicit_existential.swift

@@ -301,6 +301,8 @@ func testAnyFixIt() {
   let _: (HasAssoc).Type = ConformingType.self
   // expected-error@+1 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{10-27=any ((HasAssoc)).Type}}
   let _: ((HasAssoc)).Type = ConformingType.self
+  // expected-error@+1 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{10-32=any ((HasAssoc).Type).Type}}
+  let _: ((HasAssoc).Type).Type
   // expected-error@+2 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{10-18=(any HasAssoc)}}
   // expected-error@+1 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{30-38=(any HasAssoc)}}
   let _: HasAssoc.Protocol = HasAssoc.self
@@ -335,6 +337,17 @@ func testAnyFixIt() {
   // expected-error@+1 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{37-45=any HasAssoc}}
   func f2(_: some ((HasAssocGeneric<HasAssoc>)) & (HasAssoc)) {}
 
+  // https://github.com/apple/swift/issues/65027
+
+  // expected-error@+2:10 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{10-29=any HasAssoc & HasAssoc}}
+  // expected-error@+1:21 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{10-29=any HasAssoc & HasAssoc}}
+  let _: HasAssoc & HasAssoc
+  // expected-error@+1 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{11-27=any C & ((HasAssoc))}}
+  let _: (C & ((HasAssoc)))
+  // expected-error@+1 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{10-40=(any (C & (HasAssoc & C)).Type.Type)}}
+  let _: (C & (HasAssoc & C)).Type.Type?
+
+
   // expected-error@+1 {{optional 'any' type must be written '(any HasAssoc)?'}}{{10-23=(any HasAssoc)?}}
   let _: any HasAssoc? = nil
   // expected-error@+1 {{optional 'any' type must be written '(any HasAssoc.Type)?'}}{{10-28=(any HasAssoc.Type)?}}

test/type/explicit_existential_swift6.swift

@@ -334,6 +334,8 @@ func testAnyFixIt() {
   let _: (HasAssoc).Type = ConformingType.self
   // expected-error@+1 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{10-27=any ((HasAssoc)).Type}}
   let _: ((HasAssoc)).Type = ConformingType.self
+  // expected-error@+1 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{10-32=any ((HasAssoc).Type).Type}}
+  let _: ((HasAssoc).Type).Type
   // expected-error@+2 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{10-18=(any HasAssoc)}}
   // expected-error@+1 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{30-38=(any HasAssoc)}}
   let _: HasAssoc.Protocol = HasAssoc.self
@@ -368,6 +370,16 @@ func testAnyFixIt() {
   // expected-error@+1 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{37-45=any HasAssoc}}
   func f2(_: some ((HasAssocGeneric<HasAssoc>)) & (HasAssoc)) {}
 
+  // https://github.com/apple/swift/issues/65027
+
+  // expected-error@+2:10 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{10-29=any HasAssoc & HasAssoc}}
+  // expected-error@+1:21 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{10-29=any HasAssoc & HasAssoc}}
+  let _: HasAssoc & HasAssoc
+  // expected-error@+1 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{11-27=any C & ((HasAssoc))}}
+  let _: (C & ((HasAssoc)))
+  // expected-error@+1 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{10-40=(any (C & (HasAssoc & C)).Type.Type)}}
+  let _: (C & (HasAssoc & C)).Type.Type?
+
   // expected-error@+1 {{optional 'any' type must be written '(any HasAssoc)?'}}{{10-23=(any HasAssoc)?}}
   let _: any HasAssoc? = nil
   // expected-error@+1 {{optional 'any' type must be written '(any HasAssoc.Type)?'}}{{10-28=(any HasAssoc.Type)?}}