[CursorInfo] A few miscellaneous fixes to the AST-based cursor info and new test cases

In these cases the solver-based and AST-based cursor info differed in their results. Fix the AST-based cursor info to return the correct results and add test cases to make sure the solver-based implementation doesn’t regress them.

Author: ahoppen

lib/IDE/Utils.cpp

@@ -860,6 +860,9 @@ Expr *swift::ide::getBase(ArrayRef<Expr *> ExprStack) {
 
   Expr *CurrentE = ExprStack.back();
   Expr *ParentE = getContainingExpr(ExprStack, 1);
+  if (ParentE && isa<FunctionConversionExpr>(ParentE)) {
+    ParentE = getContainingExpr(ExprStack, 2);
+  }
   Expr *Base = nullptr;
 
   if (auto DSE = dyn_cast_or_null<DotSyntaxCallExpr>(ParentE))
@@ -925,6 +928,8 @@ bool swift::ide::isDynamicRef(Expr *Base, ValueDecl *D, llvm::function_ref<Type(
   if (!isDeclOverridable(D))
     return false;
 
+  Base = Base->getSemanticsProvidingExpr();
+
   // super.method()
   // TODO: Should be dynamic if `D` is marked as dynamic and @objc, but in
   //       that case we really need to change the role the index outputs as
@@ -956,11 +961,9 @@ void swift::ide::getReceiverType(Expr *Base,
   if (!ReceiverTy)
     return;
 
-  if (auto LVT = ReceiverTy->getAs<LValueType>())
-    ReceiverTy = LVT->getObjectType();
-  else if (auto MetaT = ReceiverTy->getAs<MetatypeType>())
-    ReceiverTy = MetaT->getInstanceType();
-  else if (auto SelfT = ReceiverTy->getAs<DynamicSelfType>())
+  ReceiverTy = ReceiverTy->getWithoutSpecifierType();
+  ReceiverTy = ReceiverTy->getMetatypeInstanceType();
+  if (auto SelfT = ReceiverTy->getAs<DynamicSelfType>())
     ReceiverTy = SelfT->getSelfType();
 
   // TODO: Handle generics and composed protocols

test/SourceKit/CursorInfo/cursor_simplify_type.swift

@@ -0,0 +1,35 @@
+protocol Publisher<Output> {
+    associatedtype Output
+}
+
+extension Publisher {
+  func stage2() -> MyGenerictype<Self.Output> {
+    fatalError()
+  }
+
+  func stage3() -> Self {
+    fatalError()
+  }
+}
+
+struct MyGenerictype<Output> : Publisher {
+  init() {}
+
+  func stage1(with output: Self.Output) -> HasTypeAccessInTypealias<Self> {
+    fatalError()
+  }
+}
+
+struct HasTypeAccessInTypealias<Upstream> : Publisher where Upstream : Publisher {
+  typealias Output = Upstream.Output
+}
+
+func test() {
+  MyGenerictype()
+    .stage1(with: 0)
+    .stage2()
+  // RUN: %sourcekitd-test -req=cursor -pos=%(line + 1):6 %s -- %s
+    .stage3()
+}
+
+// CHECK: <Declaration>func stage3() -&gt; <Type usr="s:4test13MyGenerictypeV">MyGenerictype</Type>&lt;<Type usr="s:4test24HasTypeAccessInTypealiasV">HasTypeAccessInTypealias</Type>&lt;<Type usr="s:4test13MyGenerictypeV">MyGenerictype</Type>&lt;<Type usr="s:Si">Int</Type>&gt;&gt;.<Type usr="s:4test24HasTypeAccessInTypealiasV6Outputa">Output</Type>&gt;</Declaration>

test/SourceKit/CursorInfo/look_through_identity_expr_and_types.swift

@@ -0,0 +1,26 @@
+func lookThroughFunctionConversions() {
+  class DispatchQueue {
+    class var main: DispatchQueue { get }
+    func async(execute work: @escaping @convention(block) () -> Void)
+  }
+
+  // RUN: %sourcekitd-test -req=cursor -pos=%(line + 1):22 %s -- %s | %FileCheck %s --check-prefix=FUNCTION_CONVERSION
+  DispatchQueue.main.async {}
+}
+
+// FUNCTION_CONVERSION: (DispatchQueue) -> (@escaping @convention(block) () -> ()) -> ()
+// FUNCTION_CONVERSION: DYNAMIC
+
+func lookThorughInout() {
+  public struct Villager {}
+  let villager = Villager()
+
+  var villagers: [Villager] = []
+  // RUN: %sourcekitd-test -req=cursor -pos=%(line + 1):13 %s -- %s | %FileCheck %s
+  villagers.removeAll(where: { _ in true })
+}
+
+// CHECK: RECEIVERS BEGIN
+// CHECK: s:Sa
+// CHECK: RECEIVERS END
+

test/SourceKit/CursorInfo/static_vs_class_spelling.swift

@@ -0,0 +1,37 @@
+// RUN: %empty-directory(%t)
+// RUN: %empty-directory(%t/Modules)
+// RUN: %{python} %utils/split_file.py -o %t %s
+
+
+// BEGIN MyModule.swift
+
+public class UserCollection {
+  public static let sharedStatic = UserCollection()
+  public class var sharedComputedClass: UserCollection { UserCollection() }
+}
+
+// RUN: %target-swift-frontend \
+// RUN:     -emit-module \
+// RUN:     -module-name MyModule \
+// RUN:     -emit-module-path %t/Modules/MyModule.swiftmodule \
+// RUN:     -emit-module-doc-path %t/Modules/MyModule.swiftdoc \
+// RUN:     %t/MyModule.swift
+
+// BEGIN test.swift
+import MyModule
+
+func application() {
+  UserCollection.sharedStatic
+  UserCollection.sharedComputedClass
+}
+
+// RUN: %sourcekitd-test -req=cursor -pos=4:18 %t/test.swift -- %t/test.swift -I %t/Modules | %FileCheck %s --check-prefix=SHARED_STATIC
+
+// FIXME: This should be reported as 'static var' rdar://105239467
+// SHARED_STATIC: <Declaration>class let sharedStatic: <Type usr="s:8MyModule14UserCollectionC">UserCollection</Type></Declaration>
+// SHARED_STATIC: <decl.var.class><syntaxtype.keyword>class</syntaxtype.keyword> <syntaxtype.keyword>let</syntaxtype.keyword> <decl.name>sharedStatic</decl.name>: <decl.var.type><ref.class usr="s:8MyModule14UserCollectionC">UserCollection</ref.class></decl.var.type></decl.var.class>
+
+// RUN: %sourcekitd-test -req=cursor -pos=5:18 %t/test.swift -- %t/test.swift -I %t/Modules| %FileCheck %s --check-prefix=SHARED_COMPUTED_CLASS
+
+// SHARED_COMPUTED_CLASS: <Declaration>class var sharedComputedClass: <Type usr="s:8MyModule14UserCollectionC">UserCollection</Type> { get }</Declaration>
+// SHARED_COMPUTED_CLASS: <decl.var.class><syntaxtype.keyword>class</syntaxtype.keyword> <syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>sharedComputedClass</decl.name>: <decl.var.type><ref.class usr="s:8MyModule14UserCollectionC">UserCollection</ref.class></decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> }</decl.var.class>