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

LSP: Robustify open documents

Browse Source 
Use Client::openDocument if you just want to open a document and
activate it if it is not already used in another client.

Use LanguageClientManager::openDocumentWithClient if you want to make
sure a document is opened _and_ activated for a specific client.

Change-Id: I6b790f15e17335ce2dc8981a04d2cd571b22b66b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2020-05-12 09:20:01 +02:00
parent f3407bb0ca
commit 8f5109b6ee
5 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -329,8 +329,11 @@ void Client::openDocument(TextEditor::TextDocument *document)
item.setVersion(document->document()->revision());
sendContent(DidOpenTextDocumentNotification(DidOpenTextDocumentParams(item)));
if (LanguageClientManager::clientForDocument(document) == this)
const Client *currentClient = LanguageClientManager::clientForDocument(document);
if (currentClient == this) // this is the active client for the document so directly activate it
activateDocument(document);
else if (currentClient == nullptr) // there is no client for this document so assign it to this server
LanguageClientManager::openDocumentWithClient(document, this);
}
void Client::sendContent(const IContent &content)
@@ -887,11 +890,8 @@ void Client::projectFileListChanged()
{
for (Core::IDocument *doc : Core::DocumentModel::openedDocuments()) {
if (m_project->isKnownFile(doc->filePath())) {
if (auto textDocument = qobject_cast<TextEditor::TextDocument *>(doc)) {
if (auto textDocument = qobject_cast<TextEditor::TextDocument *>(doc))
openDocument(textDocument);
if (!LanguageClientManager::clientForDocument(textDocument))
LanguageClientManager::reOpenDocumentWithClient(textDocument, this);
}
}
}
}