xxx

Author: hamishknight

lib/IDE/CodeCompletion.cpp

@@ -1500,7 +1500,7 @@ void CodeCompletionCallbacksImpl::typeCheckWithLookup(
   // switch case where there control expression is invalid). Having normal
   // typechecking still resolve even these cases would be beneficial for
   // tooling in general though.
-  if (!Lookup.gotCallback()) {
+  if (false && !Lookup.gotCallback()) {
     if (Context.TypeCheckerOpts.DebugConstraintSolver) {
       llvm::errs() << "--- Fallback typecheck for code completion ---\n";
     }

lib/Parse/ParseExpr.cpp

@@ -1555,6 +1555,9 @@ Parser::parseExprPostfixSuffix(ParserResult<Expr> Result, bool isExprBasic,
     if (!Tok.isAtStartOfLine() && Tok.is(tok::unknown)) {
       SourceLoc UnknownLoc = consumeToken();
       SourceRange ErrorRange = Result.get()->getSourceRange();
+      if (SourceMgr.rangeContainsIDEInspectionTarget(Lexer::getCharSourceRangeFromSourceRange(SourceMgr, ErrorRange))) {
+        continue;
+      }
       ErrorRange.widen(UnknownLoc);
       Result = makeParserResult(Result, new (Context) ErrorExpr(ErrorRange,
                                                                 Type(),

lib/Sema/CompletionContextFinder.cpp

@@ -114,6 +114,7 @@ size_t CompletionContextFinder::getKeyPathCompletionComponentIndex() const {
 
 std::optional<Fallback>
 CompletionContextFinder::getFallbackCompletionExpr() const {
+  return std::nullopt;
   if (!hasCompletionExpr()) {
     // Creating a fallback expression only makes sense if we are completing in
     // an expression, not when we're completing in a key path.

lib/Sema/TypeCheckStmt.cpp

@@ -1075,7 +1075,7 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
     assert(TheFunc && "Should have bailed from pre-check if this is None");
 
     Type ResultTy = TheFunc->getBodyResultType();
-    if (!ResultTy || ResultTy->hasError())
+    if (!ResultTy)
       return nullptr;
 
     if (!RS->hasResult()) {
@@ -2672,7 +2672,8 @@ bool TypeCheckASTNodeAtLocRequest::evaluate(
   // apply the solution.
   // FIXME: We ought to see if we can do better in that case.
   if (auto *CE = DC->getInnermostClosureForCaptures()) {
-    if (CE->getBodyState() == ClosureExpr::BodyState::Parsed) {
+    if (CE->getBodyState() == ClosureExpr::BodyState::Parsed &&
+        !typeCheckCtx.isForUnattachedNode()) {
       swift::typeCheckASTNodeAtLoc(
           TypeCheckASTNodeAtLocContext::declContext(CE->getParent()),
           CE->getLoc());

validation-test/IDE/crashers/1118c1956154924d.swift renamed to validation-test/IDE/crashers_fixed/1118c1956154924d.swift

@@ -1,3 +1,3 @@
 // {"kind":"complete","signature":"swift::constraints::ConstraintSystem::assignFixedType(swift::TypeVariableType*, swift::Type, bool, bool)","signatureAssert":"Assertion failed: (!type->hasError() && \"Should not be assigning a type involving ErrorType!\"), function assignFixedType"}
-// RUN: not --crash %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
+// RUN: %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
 [ _""#^COMPLETE^#

validation-test/IDE/crashers/63cae8d8f799869.swift renamed to validation-test/IDE/crashers_fixed/63cae8d8f799869.swift

@@ -1,5 +1,5 @@
 // {"kind":"complete","original":"8d3b43e5","signature":"(anonymous namespace)::ConstraintWalker::walkToExprPost(swift::Expr*)"}
-// RUN: not --crash %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
+// RUN: %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
 [
   switch  {
   case ((\.a) #^^#

validation-test/IDE/crashers/7b2825e90bfce47.swift renamed to validation-test/IDE/crashers_fixed/7b2825e90bfce47.swift

@@ -1,3 +1,3 @@
 // {"kind":"complete","signature":"swift::SourceManager::findBufferContainingLocInternal(swift::SourceLoc) const","signatureAssert":"Assertion failed: (Loc.isValid()), function findBufferContainingLocInternal"}
-// RUN: not --crash %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
+// RUN: %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
 class a { lazy b: () = { answer {}#^^#

validation-test/IDE/crashers/928f167118f85cf.swift renamed to validation-test/IDE/crashers_fixed/928f167118f85cf.swift

@@ -1,5 +1,5 @@
 // {"kind":"complete","original":"7bbb1dc5","signature":"swift::TypeRepr::print(swift::ASTPrinter&, swift::PrintOptions const&, swift::optionset::OptionSet<swift::NonRecursivePrintOption, unsigned int>) const","signatureAssert":"Assertion failed: (false && \"Expression wasn't type checked?\"), function getTypeForCompletion"}
-// RUN: not --crash %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
+// RUN: %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
 a ? {
 init { b { extension
 }#^^#

validation-test/IDE/crashers/a51bc03e2023ede5.swift renamed to validation-test/IDE/crashers_fixed/a51bc03e2023ede5.swift

@@ -1,3 +1,3 @@
 // {"kind":"complete","signature":"swift::constraints::ConstraintSystem::buildDisjunctionForOptionalVsUnderlying(swift::Type, swift::Type, swift::constraints::ConstraintLocator*)","signatureAssert":"Assertion failed: (isa<To>(Val) && \"cast<Ty>() argument of incompatible type!\"), function cast"}
-// RUN: not --crash %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
+// RUN: %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
 class a {b: c! = b #^COMPLETE^#

validation-test/IDE/crashers/e6f077eee83be8a7.swift renamed to validation-test/IDE/crashers_fixed/e6f077eee83be8a7.swift

@@ -1,4 +1,4 @@
 // {"kind":"complete","signature":"swift::constraints::ConstraintSystem::getType(swift::ASTNode) const","signatureAssert":"Assertion failed: (!node.isNull() && \"Expected non-null node\"), function hasType"}
-// RUN: not --crash %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
+// RUN: %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
 if case (
 #a,#^COMPLETE^# is b