Merge remote-tracking branch 'origin/4.12'

Change-Id: I4523ea36332772a310fd462df55683c93c61bb18
This commit is contained in:
Eike Ziller
2020-02-27 09:41:05 +01:00
110 changed files with 542 additions and 589 deletions

View File

@@ -215,8 +215,11 @@ void ClangCompletionAssistProcessor::handleAvailableCompletions(const CodeComple
return;
}
if (!m_fallbackToNormalCompletion)
if (!m_fallbackToNormalCompletion) {
// We must report back to the code assistant under all circumstances
setAsyncProposalAvailable(nullptr);
return;
}
// else: Proceed with a normal completion in case:
// 1) it was not a function call, but e.g. a function declaration like "void f("
// 2) '{' meant not a constructor call.