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

LanguageClient: Do not assert on opening the same document twice

Browse Source 
Just silently ignore a second open. This is now consistent with
LanguageClientManager::openDocumentWithClient that also supports calling
it multiple times with the same document client combination.

Change-Id: I6e8eaf312805cd4e82070209b414d63433158360
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2022-02-18 12:38:31 +01:00
parent f7020a83c6
commit ad9365d8fd
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/languageclient/client.cpp
View File

@@ -358,7 +358,7 @@ void Client::setClientCapabilities(const LanguageServerProtocol::ClientCapabilit
void Client::openDocument(TextEditor::TextDocument *document) void Client::openDocument(TextEditor::TextDocument *document)
{ {
using namespace TextEditor; using namespace TextEditor;
if (!isSupportedDocument(document)) if (m_openedDocument.contains(document) || !isSupportedDocument(document))
return; return;
if (m_state != Initialized) { if (m_state != Initialized) {
@@ -366,8 +366,6 @@ void Client::openDocument(TextEditor::TextDocument *document)
return; return;
} }
QTC_ASSERT(!m_openedDocument.contains(document), return);
const FilePath &filePath = document->filePath(); const FilePath &filePath = document->filePath();
const QString method(DidOpenTextDocumentNotification::methodName); const QString method(DidOpenTextDocumentNotification::methodName);
if (Utils::optional<bool> registered = m_dynamicCapabilities.isRegistered(method)) { if (Utils::optional<bool> registered = m_dynamicCapabilities.isRegistered(method)) {