[CodeCompletion] Check getContextualType in getTypeForCompletion

Author: ahoppen

lib/IDE/ExprCompletion.cpp

@@ -77,12 +77,7 @@ void ExprTypeCheckCompletionCallback::sawSolutionImpl(
     const constraints::Solution &S) {
   auto &CS = S.getConstraintSystem();
 
-  Type ExpectedTy;
-  if (auto ContextualType = S.getContextualType(CompletionExpr)) {
-    ExpectedTy = ContextualType;
-  } else {
-    ExpectedTy = getTypeForCompletion(S, CompletionExpr);
-  }
+  Type ExpectedTy = getTypeForCompletion(S, CompletionExpr);
 
   bool ImplicitReturn = isImplicitSingleExpressionReturn(CS, CompletionExpr);
 

lib/IDE/PostfixCompletion.cpp

@@ -176,12 +176,7 @@ void PostfixCompletionCallback::sawSolutionImpl(
     return;
 
   auto *Locator = CS.getConstraintLocator(SemanticExpr);
-  Type ExpectedTy;
-  if (auto ContextualType = S.getContextualType(CompletionExpr)) {
-    ExpectedTy = ContextualType;
-  } else {
-    ExpectedTy = getTypeForCompletion(S, CompletionExpr);
-  }
+  Type ExpectedTy = getTypeForCompletion(S, CompletionExpr);
   Expr *ParentExpr = CS.getParentExpr(CompletionExpr);
 
   auto *CalleeLocator = S.getCalleeLocator(Locator);

lib/IDE/TypeCheckCompletionCallback.cpp

@@ -47,6 +47,10 @@ void TypeCheckCompletionCallback::fallbackTypeCheck(DeclContext *DC) {
 
 Type swift::ide::getTypeForCompletion(const constraints::Solution &S,
                                       ASTNode Node) {
+  if (auto ContextualType = S.getContextualType(Node)) {
+    return ContextualType;
+  }
+
   if (!S.hasType(Node)) {
     assert(false && "Expression wasn't type checked?");
     return nullptr;
@@ -60,9 +64,6 @@ Type swift::ide::getTypeForCompletion(const constraints::Solution &S,
     Result = S.getResolvedType(Node);
   }
 
-  if (!Result || Result->is<UnresolvedType>())
-    Result = S.getContextualType(Node);
-
   if (Result && Result->is<UnresolvedType>()) {
     Result = Type();
   }

test/IDE/complete_constructor.swift

@@ -312,8 +312,8 @@ class DependentTypeInClosure<Data: DataType> {
 func testDependentTypeInClosure() {
   let _: DependentTypeInClosure = .#^DEPENDENT_IN_CLOSURE_3^#
 // DEPENDENT_IN_CLOSURE_3: Begin completions, 2 items
-// DEPENDENT_IN_CLOSURE_3-DAG: Decl[Constructor]/CurrNominal/TypeRelation[Convertible]: init({#(arg): DataType#}, {#fn: (Data.Content) -> Void##(Data.Content) -> Void#})[#DependentTypeInClosure<DataType>#];
-// DEPENDENT_IN_CLOSURE_3-DAG: Decl[Constructor]/CurrNominal/TypeRelation[Convertible]: init({#arg: DataType#}, {#fn: () -> Data.Content##() -> Data.Content#})[#DependentTypeInClosure<DataType>#];
+// DEPENDENT_IN_CLOSURE_3-DAG: Decl[Constructor]/CurrNominal: init({#(arg): DataType#}, {#fn: (DataType.Content) -> Void##(DataType.Content) -> Void#})[#DependentTypeInClosure<DataType>#];
+// DEPENDENT_IN_CLOSURE_3-DAG: Decl[Constructor]/CurrNominal: init({#arg: DataType#}, {#fn: () -> DataType.Content##() -> DataType.Content#})[#DependentTypeInClosure<DataType>#];
 
   let _ = DependentTypeInClosure(#^DEPENDENT_IN_CLOSURE_1^#)
 // DEPENDENT_IN_CLOSURE_1-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]:      ['(']{#(arg): DataType#}, {#fn: (_) -> Void##(_) -> Void#}[')'][#DependentTypeInClosure<DataType>#];