Merge pull request #65071 from xedin/rdar-107835060-followup

[CSSyntaticElement] Canonicalize type before collecting "in scope" va…

Author: xedin

lib/Sema/CSSyntacticElement.cpp

@@ -217,7 +217,7 @@ class TypeVariableRefFinder : public ASTWalker {
     // For example `Typealias<$T, $U>.Context` which desugars into
     // `_Context<$U>` would bring in `$T` that could be inferrable
     // only after the body of the closure is solved.
-    type = type->getDesugaredType();
+    type = type->getCanonicalType();
 
     // Don't walk into the opaque archetypes because they are not
     // transparent in this context - `some P` could reference a

validation-test/Sema/SwiftUI/rdar107835060.swift

@@ -32,7 +32,7 @@ struct TestView<Data, Content: View> : View {
    typealias Context = Content._Context where Content: ContentProtocol
 
    init<R, C>(_ data: Data,
-              @ViewBuilder shelfContent: @escaping (Context) -> C)
+              @ViewBuilder shelfContent: @escaping ([Context]) -> C)
        where Data.Element == any Model<R>,
              Content == ContinuousContent<LazyMapCollection<Data, AnyModel<R>>, C> {
    }
@@ -44,7 +44,7 @@ struct TestView<Data, Content: View> : View {
 func test(values: [any Model<[Int]>]) -> some View {
   TestView(values) { context in
     VStack {
-      if context.offset == 0 {
+      if context.first?.offset == 0 {
       }
     }
   }