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

39
src/plugins/languageclient/languageclientmanager.cpp
View File

@@ -245,11 +245,8 @@ void LanguageClientManager::applySettings()
}
if (!documents.isEmpty()) {
Client *client = startClient(setting);
for (TextEditor::TextDocument *document : documents) {
if (managerInstance->m_clientForDocument.value(document).isNull())
managerInstance->m_clientForDocument[document] = client;
for (TextEditor::TextDocument *document : documents)
client->openDocument(document);
}
}
break;
}
@@ -332,13 +329,21 @@ Client *LanguageClientManager::clientForUri(const DocumentUri &uri)
return clientForFilePath(uri.toFilePath());
}
void LanguageClientManager::reOpenDocumentWithClient(TextEditor::TextDocument *document, Client *client)
void LanguageClientManager::openDocumentWithClient(TextEditor::TextDocument *document, Client *client)
{
Utils::ExecuteOnDestruction outlineUpdater(&TextEditor::IOutlineWidgetFactory::updateOutline);
if (Client *currentClient = clientForDocument(document))
Client *currentClient = clientForDocument(document);
if (client == currentClient)
return;
if (currentClient)
currentClient->deactivateDocument(document);
managerInstance->m_clientForDocument[document] = client;
client->activateDocument(document);
if (client) {
if (!client->documentOpen(document))
client->openDocument(document);
else
client->activateDocument(document);
}
TextEditor::IOutlineWidgetFactory::updateOutline();
}
void LanguageClientManager::logBaseMessage(const LspLogMessage::MessageSender sender,
@@ -458,22 +463,12 @@ void LanguageClientManager::documentOpened(Core::IDocument *document)
} else if (setting->m_startBehavior == BaseSettings::RequiresFile && clients.isEmpty()) {
clients << startClient(setting);
}
for (auto client : clients) {
if (!m_clientForDocument.contains(textDocument))
m_clientForDocument[textDocument] = client;
openDocumentWithClient(textDocument, client);
}
for (auto client : clients)
client->openDocument(textDocument);
}
}
}
void LanguageClientManager::openDocumentWithClient(TextEditor::TextDocument *document,
Client *client)
{
if (client && client->state() != Client::Error)
client->openDocument(document);
}
void LanguageClientManager::documentClosed(Core::IDocument *document)
{
if (auto textDocument = qobject_cast<TextEditor::TextDocument *>(document)) {
@@ -629,9 +624,7 @@ void LanguageClientManager::updateProject(ProjectExplorer::Project *project)
newClient = startClient(setting, project);
if (!newClient)
break;
openDocumentWithClient(textDoc, newClient);
if (m_clientForDocument.value(textDoc) == nullptr)
m_clientForDocument[textDoc] = newClient;
newClient->openDocument(textDoc);
}
}
}