averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Completion] Map failable initializer result type into context

Browse Source 
Make sure we don't pass an interface type to `setTypeContext`.

rdar://155038769
This commit is contained in:
Hamish Knight
2025-07-04 13:43:56 +01:00
parent ee5f4df5ee
commit 9671ed9d85
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/IDE/CodeCompletion.cpp
View File

@@ -901,7 +901,7 @@ static void addKeywordsAfterReturn(CodeCompletionResultSink &Sink, DeclContext *
// Note that `TypeContext` must stay alive for the duration of // Note that `TypeContext` must stay alive for the duration of
// `~CodeCodeCompletionResultBuilder()`. // `~CodeCodeCompletionResultBuilder()`.
ExpectedTypeContext TypeContext; ExpectedTypeContext TypeContext;
TypeContext.setPossibleTypes({resultType}); TypeContext.setPossibleTypes({DC->mapTypeIntoContext(resultType)});
CodeCompletionResultBuilder Builder(Sink, CodeCompletionResultKind::Literal, CodeCompletionResultBuilder Builder(Sink, CodeCompletionResultKind::Literal,
SemanticContextKind::None); SemanticContextKind::None);

5
test/IDE/complete_keywords.swift
View File

@@ -377,6 +377,11 @@ struct InInit {
init?() { #^IN_INIT_1?check=KW_DECL_STMT;check=KW_RETURN;check=KW_NO_IN^# } init?() { #^IN_INIT_1?check=KW_DECL_STMT;check=KW_RETURN;check=KW_NO_IN^# }
} }
struct InGenericTypeInit<T> {
init?() { return #^IN_INIT_2?check=KW_FAILABLE_INIT_NIL^# }
// KW_FAILABLE_INIT_NIL: Literal[Nil]/None: nil[#InGenericTypeInit<T>?#]; name=nil
}
struct InStruct { struct InStruct {
#^IN_NOMINAL_DECL_1?check=KW_DECL_TYPECONTEXT;check=KW_NO_INOUT^# #^IN_NOMINAL_DECL_1?check=KW_DECL_TYPECONTEXT;check=KW_NO_INOUT^#
} }

3
validation-test/IDE/crashers_fixed/7068664dc48e3152.swift Normal file
View File

@@ -0,0 +1,3 @@
// {"kind":"complete","signature":"swift::ide::CodeCompletionResultType::calculateTypeRelation(swift::ide::ExpectedTypeContext const*, swift::DeclContext const*, swift::ide::USRBasedTypeContext const*) const"}
// RUN: %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
class a<b { init ? { #^COMPLETE^#