[CursorInfo] Fix issues found by the stress tester

Author: ahoppen

include/swift/IDE/CursorInfo.h

@@ -26,7 +26,7 @@ namespace ide {
 class CursorInfoConsumer {
 public:
   virtual ~CursorInfoConsumer() {}
-  virtual void handleResults(SmallVector<ResolvedCursorInfoPtr>) = 0;
+  virtual void handleResults(std::vector<ResolvedCursorInfoPtr>) = 0;
 };
 
 /// Create a factory for code completion callbacks.

include/swift/IDETool/IDEInspectionInstance.h

@@ -82,7 +82,7 @@ struct ConformingMethodListResults {
 /// The results returned from \c IDEInspectionInstance::cursorInfo.
 struct CursorInfoResults {
   /// The actual results.
-  SmallVector<ResolvedCursorInfoPtr> ResolvedCursorInfos;
+  std::vector<ResolvedCursorInfoPtr> ResolvedCursorInfos;
   /// Whether an AST was reused to produce the results.
   bool DidReuseAST;
 };

lib/IDE/CursorInfo.cpp

@@ -216,7 +216,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;
       }
@@ -346,7 +348,7 @@ class CursorInfoDoneParsingCallback : public IDEInspectionCallbacks {
       : IDEInspectionCallbacks(P), Consumer(Consumer),
         RequestedLoc(RequestedLoc) {}
 
-  SmallVector<ResolvedCursorInfoPtr>
+  std::vector<ResolvedCursorInfoPtr>
   getDeclResult(NodeFinderDeclResult *DeclResult, SourceFile *SrcFile,
                 NodeFinder &Finder) const {
     typeCheckDeclAndParentClosures(DeclResult->getDecl());
@@ -363,18 +365,20 @@ class CursorInfoDoneParsingCallback : public IDEInspectionCallbacks {
     return {CursorInfo};
   }
 
-  SmallVector<ResolvedCursorInfoPtr>
+  std::vector<ResolvedCursorInfoPtr>
   getExprResult(NodeFinderExprResult *ExprResult, SourceFile *SrcFile,
                 NodeFinder &Finder) const {
     Expr *E = ExprResult->getExpr();
     DeclContext *DC = ExprResult->getDeclContext();
 
     // 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.
@@ -389,9 +393,14 @@ class CursorInfoDoneParsingCallback : public IDEInspectionCallbacks {
 
     // Deliver results
 
-    SmallVector<ResolvedCursorInfoPtr> Results;
+    std::vector<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};
@@ -426,7 +435,7 @@ class CursorInfoDoneParsingCallback : public IDEInspectionCallbacks {
     if (!Result) {
       return;
     }
-    SmallVector<ResolvedCursorInfoPtr> CursorInfo;
+    std::vector<ResolvedCursorInfoPtr> CursorInfo;
     switch (Result->getKind()) {
     case NodeFinderResultKind::Decl:
       CursorInfo = getDeclResult(cast<NodeFinderDeclResult>(Result.get()),

lib/IDETool/IDEInspectionInstance.cpp

@@ -827,7 +827,7 @@ void swift::ide::IDEInspectionInstance::cursorInfo(
         : ReusingASTContext(ReusingASTContext),
           CancellationFlag(CancellationFlag), Callback(Callback) {}
 
-    void handleResults(SmallVector<ResolvedCursorInfoPtr> result) override {
+    void handleResults(std::vector<ResolvedCursorInfoPtr> result) override {
       HandleResultsCalled = true;
       if (CancellationFlag &&
           CancellationFlag->load(std::memory_order_relaxed)) {

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