1 files changed, 11 insertions, 1 deletions
diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
index 592f7c8795..0670584c62 100644
--- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
@@ -132,6 +132,12 @@ static QList<AssistProposalItemInterface *> toAssistProposalItems(
         if (codeCompletion.text.isEmpty())
             continue; // It's an OverloadCandidate which has text but no typedText.
 
+        // Don't offer symbols that are not accessible here.
+        if (codeCompletion.availability == CodeCompletion::NotAvailable
+                || codeCompletion.availability == CodeCompletion::NotAccessible) {
+            continue;
+        }
+
         const QString name = codeCompletion.completionKind == CodeCompletion::KeywordCompletionKind
                 ? CompletionChunksToTextConverter::convertToName(codeCompletion.chunks)
                 : codeCompletion.text.toString();
@@ -697,6 +703,10 @@ IAssistProposal *ClangCompletionAssistProcessor::createFunctionHintProposal(
     return new FunctionHintProposal(m_positionForProposal, model);
 }
 
+void ClangCompletionAssistProcessor::cancel()
+{
+    m_interface->communicator().cancelCompletions(this);
+}
+
 } // namespace Internal
 } // namespace ClangCodeModel
-