feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

LSP: fix crashing and leaking memory

Browse Source 
... in the language client code assist by making the
code assist provider a member of the client.

Change-Id: I8ea22300a2c824ff00b87cdeaf8ea5f0cf95e4a9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2018-10-16 07:00:48 +02:00
parent 885be5524c
commit 7826fdaa56
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/languageclient/baseclient.cpp
View File

@@ -24,7 +24,6 @@
****************************************************************************/
#include "baseclient.h"
#include "languageclientcodeassist.h"
#include "languageclientmanager.h"
#include <coreplugin/icore.h>
@@ -63,6 +62,7 @@ static Q_LOGGING_CATEGORY(LOGLSPCLIENTV, "qtc.languageclient.messages", QtWarnin
BaseClient::BaseClient()
: m_id(Core::Id::fromString(QUuid::createUuid().toString()))
, m_completionProvider(this)
{
m_buffer.open(QIODevice::ReadWrite | QIODevice::Append);
m_contentHandler.insert(JsonRpcMessageHandler::jsonRpcMimeType(),
@@ -72,6 +72,10 @@ BaseClient::BaseClient()
BaseClient::~BaseClient()
{
m_buffer.close();
// FIXME: instead of replacing the completion provider in the text document store the
// completion provider as a prioritised list in the text document
for (TextEditor::TextDocument *document : m_resetCompletionProvider)
document->setCompletionAssistProvider(nullptr);
}
void BaseClient::initialize()
@@ -149,7 +153,11 @@ void BaseClient::openDocument(Core::IDocument *document)
documentContentsChanged(document);
});
if (textDocument) {
textDocument->setCompletionAssistProvider(new LanguageClientCompletionAssistProvider(this));
m_resetCompletionProvider << textDocument;
textDocument->setCompletionAssistProvider(&m_completionProvider);
connect(textDocument, &QObject::destroyed, this, [this, textDocument]{
m_resetCompletionProvider.remove(textDocument);
});
if (BaseTextEditor *editor = BaseTextEditor::textEditorForDocument(textDocument)) {
if (QPointer<TextEditorWidget> widget = editor->editorWidget()) {
connect(widget, &TextEditorWidget::cursorPositionChanged, this, [this, widget](){