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

Merge pull request #35784 from DougGregor/se-0296

Browse Source
This commit is contained in:
Doug Gregor
2021-02-05 20:10:48 -08:00
committed by GitHub
parent 44f6214396 089151cede
commit 5013d20b86
11 changed files with 70 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/IDE/CodeCompletion.cpp
View File

@@ -5818,15 +5818,12 @@ static void addObserverKeywords(CodeCompletionResultSink &Sink) {
addKeyword(Sink, "didSet", CodeCompletionKeywordKind::None);
}
static void addExprKeywords(CodeCompletionResultSink &Sink,
bool IsConcurrencyEnabled) {
static void addExprKeywords(CodeCompletionResultSink &Sink) {
// Expr keywords.
addKeyword(Sink, "try", CodeCompletionKeywordKind::kw_try);
addKeyword(Sink, "try!", CodeCompletionKeywordKind::kw_try);
addKeyword(Sink, "try?", CodeCompletionKeywordKind::kw_try);
if (IsConcurrencyEnabled) {
addKeyword(Sink, "await", CodeCompletionKeywordKind::None);
}
addKeyword(Sink, "await", CodeCompletionKeywordKind::None);
}
static void addOpaqueTypeKeyword(CodeCompletionResultSink &Sink) {
@@ -5865,8 +5862,7 @@ void CodeCompletionCallbacksImpl::addKeywords(CodeCompletionResultSink &Sink,
break;
case CompletionKind::EffectsSpecifier: {
if (!llvm::is_contained(ParsedKeywords, "async") &&
Context.LangOpts.EnableExperimentalConcurrency)
if (!llvm::is_contained(ParsedKeywords, "async"))
addKeyword(Sink, "async", CodeCompletionKeywordKind::None);
if (!llvm::is_contained(ParsedKeywords, "throws"))
addKeyword(Sink, "throws", CodeCompletionKeywordKind::kw_throws);
@@ -5902,7 +5898,7 @@ void CodeCompletionCallbacksImpl::addKeywords(CodeCompletionResultSink &Sink,
case CompletionKind::ForEachSequence:
addSuperKeyword(Sink);
addLetVarKeywords(Sink);
addExprKeywords(Sink, Context.LangOpts.EnableExperimentalConcurrency);
addExprKeywords(Sink);
addAnyTypeKeyword(Sink, CurDeclContext->getASTContext().TheAnyType);
break;
@@ -6729,7 +6725,7 @@ void CodeCompletionCallbacksImpl::doneParsing() {
addStmtKeywords(Sink, MaybeFuncBody);
addSuperKeyword(Sink);
addLetVarKeywords(Sink);
addExprKeywords(Sink, Context.LangOpts.EnableExperimentalConcurrency);
addExprKeywords(Sink);
addAnyTypeKeyword(Sink, Context.TheAnyType);
DoPostfixExprBeginning();
}