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

Merge remote-tracking branch 'origin/4.11' into 4.12

Browse Source 
Change-Id: I8cc80483cdb10309bf73aba5cfab52c1d90e1bbc
This commit is contained in:
Eike Ziller
2020-02-26 08:14:47 +01:00
parent a8cca1b89a 8625bbfe5a
commit fa59e02f89
8 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -366,6 +366,8 @@ void LanguageClientManager::clientFinished(Client *client)
client->log(tr("Unexpectedly finished. Restarting in %1 seconds.").arg(restartTimeoutS),
Core::MessageManager::Flash);
QTimer::singleShot(restartTimeoutS * 1000, client, [client]() { startClient(client); });
for (TextEditor::TextDocument *document : m_clientForDocument.keys(client))
client->deactivateDocument(document);
} else {
if (unexpectedFinish && !m_shuttingDown)
client->log(tr("Unexpectedly finished."), Core::MessageManager::Flash);
@@ -397,7 +399,8 @@ void LanguageClientManager::editorOpened(Core::IEditor *editor)
if (!widget)
return;
if (Client *client = clientForDocument(widget->textDocument()))
client->cursorPositionChanged(widget);
if (client->reachable())
client->cursorPositionChanged(widget);
});
});
updateEditorToolBar(editor);