Ignore error types in VariableTypeCollector

Also add a test to verify that error types get ignored (as intended).

Author: fwcd

lib/IDE/IDETypeChecking.cpp

@@ -796,15 +796,20 @@ class VariableTypeCollector : public SourceEntityWalker {
         llvm::raw_svector_ostream OS(Buffer);
         PrintOptions Options;
         Options.SynthesizeSugarOnTypes = true;
-        VD->getType()->print(OS, Options);
+        auto Ty = VD->getType();
+        // Skip this declaration if the type is an error type.
+        if (Ty->is<ErrorType>()) {
+          return false;
+        }
+        Ty->print(OS, Options);
       }
       // Transfer the type to `OS` if needed and get the offsets of this string
       // in `OS`.
-      auto Ty = getTypeOffsets(Buffer.str());
+      auto TyOffsets = getTypeOffsets(Buffer.str());
       bool HasExplicitType =
           VD->getTypeReprOrParentPatternTypeRepr() != nullptr;
       // Add the type information to the result list.
-      Results.emplace_back(VarOffset, VarLength, HasExplicitType, Ty.first);
+      Results.emplace_back(VarOffset, VarLength, HasExplicitType, TyOffsets.first);
     }
     return true;
   }

test/SourceKit/VariableType/error.swift

@@ -0,0 +1,6 @@
+let x = "an error type" + 3
+let y = "not an error type"
+
+// RUN: %sourcekitd-test -req=collect-var-type %s -- %s | %FileCheck %s
+// CHECK-NOT: (1:5, 1:6)
+// CHECK: (2:5, 2:6): String (explicit type: 0)