[CursorInfo] Fix issues found by the stress tester

Author: ahoppen

lib/IDE/CursorInfo.cpp

@@ -219,7 +219,9 @@ class NodeFinder : ASTWalker {
     if (auto CaptureList = dyn_cast<CaptureListExpr>(E)) {
       for (auto ShorthandShadows :
            getShorthandShadows(CaptureList, getCurrentDeclContext())) {
-        assert(ShorthandShadowedDecls.count(ShorthandShadows.first) == 0);
+        assert(ShorthandShadowedDecls.count(ShorthandShadows.first) == 0 ||
+               ShorthandShadowedDecls[ShorthandShadows.first] ==
+                   ShorthandShadows.second);
         ShorthandShadowedDecls[ShorthandShadows.first] =
             ShorthandShadows.second;
       }
@@ -374,10 +376,12 @@ class CursorInfoDoneParsingCallback : public IDEInspectionCallbacks {
 
     // Type check the statemnt containing E and listen for solutions.
     CursorInfoTypeCheckSolutionCallback Callback(*DC, RequestedLoc);
-    llvm::SaveAndRestore<TypeCheckCompletionCallback *> CompletionCollector(
-        DC->getASTContext().SolutionCallback, &Callback);
-    typeCheckASTNodeAtLoc(TypeCheckASTNodeAtLocContext::declContext(DC),
-                          E->getLoc());
+    {
+      llvm::SaveAndRestore<TypeCheckCompletionCallback *> CompletionCollector(
+          DC->getASTContext().SolutionCallback, &Callback);
+      typeCheckASTNodeAtLoc(TypeCheckASTNodeAtLocContext::declContext(DC),
+                            E->getLoc());
+    }
 
     if (Callback.getResults().empty()) {
       // No results.
@@ -395,6 +399,11 @@ class CursorInfoDoneParsingCallback : public IDEInspectionCallbacks {
     SmallVector<ResolvedCursorInfoPtr> Results;
     for (auto Res : Callback.getResults()) {
       SmallVector<NominalTypeDecl *> ReceiverTypes;
+      if (isa<ModuleDecl>(Res.ReferencedDecl)) {
+        // ResolvedModuleRefCursorInfo is not supported by solver-based cursor
+        // info yet.
+        continue;
+      }
       if (Res.IsDynamicRef && Res.BaseType) {
         if (auto ReceiverType = Res.BaseType->getAnyNominal()) {
           ReceiverTypes = {ReceiverType};

test/SourceKit/CursorInfo/cursor_declref_resolve_triggers_more_typechecking.swift

@@ -0,0 +1,19 @@
+struct GorEach<Data, Content> {
+  public init(_ data: Data, content: (Data) -> Void) {}
+}
+
+struct MavigationLink<Label, Destination> {
+  init(destination: PeopleDetail) {}
+}
+
+struct PeopleDetail {
+  init(peopleId: Int) {}
+}
+
+func test(peoples: [Int]) {
+  GorEach(peoples) { people in
+    // Should not crash
+    // RUN: %sourcekitd-test -req=cursor -pos=%(line + 1):56 %s -- %s
+    MavigationLink(destination: PeopleDetail(peopleId: people))
+  }
+}

test/SourceKit/CursorInfo/cursor_on_invalid_capturing_self.swift

@@ -0,0 +1,8 @@
+class Items {
+  func test() {
+    // Should not crash
+    // RUN: %sourcekitd-test -req=cursor -pos=%(line + 1):9 %s -- %s
+    _ = Invalid.sink { [weak self] items in
+    }
+  }
+}

test/SourceKit/CursorInfo/cursor_on_module.swift

@@ -0,0 +1,7 @@
+func test() {
+  // RUN: %sourcekitd-test -req=cursor -pos=%(line + 1):3 %s -- %s | %FileCheck %s
+  Swift.min
+}
+
+// CHECK: source.lang.swift.ref.module ()
+// CHECK-NEXT: Swift