[CodeComplete] Use PrintOptionalAsImplicitlyUnwrapped to print IUO
Other instances of fb9c65e. Consistently use
PrintOption.PrintOptionalAsImplicitlyUnwrapped to print IUO.
rdar://problem/41046225
rdar://problem/42443512
diff --git a/lib/IDE/CodeCompletion.cpp b/lib/IDE/CodeCompletion.cpp
index ad7d108..ea66680 100644
--- a/lib/IDE/CodeCompletion.cpp
+++ b/lib/IDE/CodeCompletion.cpp
@@ -2559,16 +2559,17 @@
// What's left is the result type.
if (ResultType->isVoid()) {
OS << "Void";
- } else if (!IsImplicitlyCurriedInstanceMethod
- && FD->getAttrs().hasAttribute<ImplicitlyUnwrappedOptionalAttr>()) {
+ } else {
// As we did with parameters in addParamPatternFromFunction,
// for regular methods we'll print '!' after implicitly
// unwrapped optional results.
- auto ObjectType = ResultType->getOptionalObjectType();
- OS << ObjectType->getStringAsComponent();
- OS << "!";
- } else {
- ResultType.print(OS);
+ bool IsIUO =
+ !IsImplicitlyCurriedInstanceMethod &&
+ FD->getAttrs().hasAttribute<ImplicitlyUnwrappedOptionalAttr>();
+
+ PrintOptions PO;
+ PO.PrintOptionalAsImplicitlyUnwrapped = IsIUO;
+ ResultType.print(OS, PO);
}
}
Builder.addTypeAnnotation(TypeStr);
diff --git a/lib/IDE/CodeCompletionResultBuilder.h b/lib/IDE/CodeCompletionResultBuilder.h
index d4f7a83..1f1fd63 100644
--- a/lib/IDE/CodeCompletionResultBuilder.h
+++ b/lib/IDE/CodeCompletionResultBuilder.h
@@ -372,13 +372,8 @@
PrintOptions PO;
PO.SkipAttributes = true;
- std::string TypeName;
- if (IsIUO) {
- assert(Ty->getOptionalObjectType());
- TypeName = Ty->getOptionalObjectType()->getStringAsComponent(PO) + "!";
- } else {
- TypeName = Ty->getString(PO);
- }
+ PO.PrintOptionalAsImplicitlyUnwrapped = IsIUO;
+ std::string TypeName = Ty->getString(PO);
addChunkWithText(CodeCompletionString::Chunk::ChunkKind::CallParameterType,
TypeName);
diff --git a/test/IDE/complete_crashes.swift b/test/IDE/complete_crashes.swift
index 5da4bba..fdba9e9 100644
--- a/test/IDE/complete_crashes.swift
+++ b/test/IDE/complete_crashes.swift
@@ -306,7 +306,7 @@
func test_40956846(
arg_40956846_1: inout Int!,
arg_40956846_2: Void!,
- arg_40956846_3: (() -> Int)!,
+ arg_40956846_3: (() -> Int?)!,
arg_40956846_4: inout ((Int) -> Int)!
) {
let y = #^RDAR_40956846^#
@@ -314,10 +314,20 @@
// RDAR_40956846: Begin completions
// RDAR_40956846-DAG: Decl[LocalVar]/Local: arg_40956846_1[#inout Int!#]; name=arg_40956846_1
// RDAR_40956846-DAG: Decl[LocalVar]/Local: arg_40956846_2[#Void!#]; name=arg_40956846_2
-// RDAR_40956846-DAG: Decl[LocalVar]/Local: arg_40956846_3[#(() -> Int)!#]; name=arg_40956846_3
+// RDAR_40956846-DAG: Decl[LocalVar]/Local: arg_40956846_3[#(() -> Int?)!#]; name=arg_40956846_3
// RDAR_40956846-DAG: Decl[LocalVar]/Local: arg_40956846_4[#inout ((Int) -> Int)!#]; name=arg_40956846_4
// RDAR_40956846: End completions
+// rdar://problem/42443512
+// RUN: %target-swift-ide-test -code-completion -code-completion-token=RDAR_42443512 -source-filename=%s | %FileCheck %s -check-prefix=RDAR_42443512
+class test_42443512 {
+ func foo(x: Int!) { }
+ static func test() {
+ self.foo#^RDAR_42443512^#
+ }
+}
+// RDAR_42443512: Begin completions
+
// rdar://problem/42452085
// RUN: %target-swift-ide-test -code-completion -code-completion-token=RDAR_42452085_1 -source-filename=%s | %FileCheck %s -check-prefix=RDAR_42452085
// RUN: %target-swift-ide-test -code-completion -code-completion-token=RDAR_42452085_2 -source-filename=%s | %FileCheck %s -check-prefix=RDAR_42452085
