Merge remote-tracking branch 'origin/4.14'

Change-Id: I516e87eed1b716ec085095c9dd4f47f04a99de7c
2021-01-25 09:06:36 +01:00
parent 4f1c5bacb9 90746d8623
commit aae3bf4ef7
21 changed files with 229 additions and 37 deletions
--- a/src/plugins/languageclient/client.h
+++ b/src/plugins/languageclient/client.h
@@ -205,6 +205,8 @@ private:
    void resetAssistProviders(TextEditor::TextDocument *document);
    void sendPostponedDocumentUpdates();

+    void updateCompletionProvider(TextEditor::TextDocument *document);
+
    using ContentHandler = std::function<void(const QByteArray &, QTextCodec *, QString &,
                                              LanguageServerProtocol::ResponseHandlers,
                                              LanguageServerProtocol::MethodHandler)>;