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 #58999 from ahoppen/pr/cache-function-asyncness

Browse Source 
[CodeCompletion] Cache 'async'-ness of free functions
This commit is contained in:
Alex Hoppen
2022-08-01 10:15:23 +02:00
committed by GitHub
parent ea9276fb60 1150e700a5
commit c5c34464de
21 changed files with 319 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tools/swift-ide-test/swift-ide-test.cpp
View File

@@ -1087,11 +1087,10 @@ doConformingMethodList(const CompilerInvocation &InitInvok,
});
}
static void
printCodeCompletionResultsImpl(ArrayRef<CodeCompletionResult *> Results,
llvm::raw_ostream &OS, bool IncludeKeywords,
bool IncludeComments, bool IncludeSourceText,
bool PrintAnnotatedDescription) {
static void printCodeCompletionResultsImpl(
ArrayRef<CodeCompletionResult *> Results, llvm::raw_ostream &OS,
bool IncludeKeywords, bool IncludeComments, bool IncludeSourceText,
bool PrintAnnotatedDescription, const ASTContext &Ctx) {
unsigned NumResults = 0;
for (auto Result : Results) {
if (!IncludeKeywords &&
@@ -1134,10 +1133,13 @@ printCodeCompletionResultsImpl(ArrayRef<CodeCompletionResult *> Results,
OS << "; comment=" << comment;
}
if (Result->getDiagnosticSeverity() !=
SmallString<256> Scratch;
auto DiagSeverityAndMessage =
Result->getDiagnosticSeverityAndMessage(Scratch, Ctx);
if (DiagSeverityAndMessage.first !=
CodeCompletionDiagnosticSeverity::None) {
OS << "; diagnostics=" << comment;
switch (Result->getDiagnosticSeverity()) {
switch (DiagSeverityAndMessage.first) {
case CodeCompletionDiagnosticSeverity::Error:
OS << "error";
break;
@@ -1153,7 +1155,8 @@ printCodeCompletionResultsImpl(ArrayRef<CodeCompletionResult *> Results,
case CodeCompletionDiagnosticSeverity::None:
llvm_unreachable("none");
}
OS << ":" << Result->getDiagnosticMessage();
SmallString<256> Scratch;
OS << ":" << DiagSeverityAndMessage.second;
}
OS << "\n";
@@ -1169,7 +1172,8 @@ static int printCodeCompletionResults(
CancellableResult, [&](CodeCompleteResult &Result) {
printCodeCompletionResultsImpl(
Result.ResultSink.Results, llvm::outs(), IncludeKeywords,
IncludeComments, IncludeSourceText, PrintAnnotatedDescription);
IncludeComments, IncludeSourceText, PrintAnnotatedDescription,
Result.Info.compilerInstance->getASTContext());
return 0;
});
}
@@ -1545,10 +1549,11 @@ static int doBatchCodeCompletion(const CompilerInvocation &InitInvok,
case CancellableResultKind::Success: {
wasASTContextReused =
Result->Info.completionContext->ReusingASTContext;
printCodeCompletionResultsImpl(Result->ResultSink.Results, OS,
IncludeKeywords, IncludeComments,
IncludeSourceText,
CodeCompletionAnnotateResults);
printCodeCompletionResultsImpl(
Result->ResultSink.Results, OS, IncludeKeywords,
IncludeComments, IncludeSourceText,
CodeCompletionAnnotateResults,
Result->Info.compilerInstance->getASTContext());
break;
}
case CancellableResultKind::Failure:
@@ -4227,14 +4232,16 @@ int main(int argc, char *argv[]) {
*contextFreeResult, SemanticContextKind::OtherModule,
CodeCompletionFlair(),
/*numBytesToErase=*/0, /*TypeContext=*/nullptr, /*DC=*/nullptr,
/*USRTypeContext=*/nullptr, ContextualNotRecommendedReason::None,
CodeCompletionDiagnosticSeverity::None, /*DiagnosticMessage=*/"");
/*USRTypeContext=*/nullptr, /*CanCurrDeclContextHandleAsync=*/false,
ContextualNotRecommendedReason::None);
contextualResults.push_back(contextualResult);
}
auto CompInstance = std::make_unique<CompilerInstance>();
printCodeCompletionResultsImpl(
contextualResults, llvm::outs(), options::CodeCompletionKeywords,
options::CodeCompletionComments, options::CodeCompletionSourceText,
options::CodeCompletionAnnotateResults);
options::CodeCompletionAnnotateResults,
CompInstance->getASTContext());
}
return 0;