Fix missing indexing data when using Self initializer

Fixes: #64686

Author: keith

Diff for: lib/IDE/SourceEntityWalker.cpp

@@ -633,6 +633,17 @@ ASTWalker::PreWalkAction SemaAnnotator::walkToTypeReprPre(TypeRepr *T) {
                         ReferenceMetaData(SemaReferenceKind::TypeRef, None));
       return Action::StopIf(!Continue);
     }
+  } else if (auto FT = dyn_cast<FixedTypeRepr>(T)) {
+    ValueDecl *VD = FT->getType()->getAnyGeneric();
+    if (auto DT = FT->getType()->getAs<DynamicSelfType>())
+      VD = DT->getSelfType()->getAnyGeneric();
+
+    if (VD) {
+      auto Data = ReferenceMetaData(SemaReferenceKind::DynamicMemberRef, None, /*isImplicit=*/true);
+      auto Continue = passReference(VD, FT->getType(), FT->getLoc(),
+                                    FT->getSourceRange(), Data);
+      return Action::StopIf(!Continue);
+    }
   }
 
   return Action::Continue();

Diff for: lib/IDE/Utils.cpp

@@ -853,6 +853,10 @@ bool swift::ide::isBeingCalled(ArrayRef<Expr *> ExprStack) {
       if (CRCE->getBase() == Target)
         return true;
     }
+    if (auto *CRCE = dyn_cast<ConstructorRefCallExpr>(AE->getFn()))
+      if (auto *MCE = dyn_cast<MetatypeConversionExpr>(CRCE->getBase()))
+        if (MCE->getSubExpr() == Target)
+          return true;
     if (isa<SelfApplyExpr>(AE))
       continue;
     if (getReferencedDecl(AE->getFn()).second == UnderlyingDecl)

Diff for: lib/Index/Index.cpp

@@ -856,6 +856,8 @@ class IndexSwiftASTWalker : public SourceEntityWalker {
 
     if (Data.isImplicit)
       Info.roles |= (unsigned)SymbolRole::Implicit;
+    if (Data.Kind == SemaReferenceKind::DynamicMemberRef)
+      Info.roles |= (unsigned)SymbolRole::Dynamic;
 
     if (CtorTyRef)
       if (!reportRef(CtorTyRef, Loc, Info, Data.AccKind))

Diff for: test/Index/index_self.swift

@@ -0,0 +1,31 @@
+// RUN: %target-swift-ide-test -print-indexed-symbols -source-filename %s | %FileCheck %s
+
+struct Foo { // CHECK: [[@LINE]]:8 | struct/Swift | Foo | [[Foo_USR:.*]] | Def | rel: 0
+  init() {} // CHECK: [[@LINE]]:3 | constructor/Swift | init() | [[Foo_init_USR:.*]] | Def,RelChild | rel: 1
+
+  static func bar() -> Self {
+    .init() // CHECK: [[@LINE]]:6 | constructor/Swift | init() | [[Foo_init_USR]] | Ref,Call,RelCall,RelCont | rel: 1
+  }
+
+  static func baz() -> Self {
+    Self()
+    // CHECK: [[@LINE-1]]:5 | struct/Swift | Foo | [[Foo_USR]] | Ref,Dyn,Impl,RelCont | rel: 1
+    // CHECK: [[@LINE-2]]:5 | constructor/Swift | init() | [[Foo_init_USR]] | Ref,Call,Dyn,Impl,RelCall,RelCont | rel: 1
+  }
+}
+
+class Bar { // CHECK: [[@LINE]]:7 | class/Swift | Bar | [[Bar_USR:.*]] | Def | rel: 0
+  required init() {} // CHECK: [[@LINE]]:12 | constructor/Swift | init() | [[Bar_init_USR:.*]] | Def,RelChild | rel: 1
+
+  static func foo() -> Self {
+    .init() // CHECK: [[@LINE]]:6 | constructor/Swift | init() | [[Bar_init_USR]] | Ref,Call,RelCall,RelCont | rel: 1
+  }
+
+  static func baz() -> Self {
+    Self()
+    // CHECK: [[@LINE-1]]:5 | class/Swift | Bar | [[Bar_USR]] | Ref,Dyn,Impl,RelCont | rel: 1
+    // CHECK: [[@LINE-2]]:5 | constructor/Swift | init() | [[Bar_init_USR]] | Ref,Call,Dyn,Impl,RelCall,RelCont | rel: 1
+  }
+}
+
+class Baz: Bar {}