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

LanguageClient: open a document in just one client

Browse Source 
Also show a menu when triggering the language client toolbar button that
allows you to manage and switch between different language clients. The
default language server used to open a specific file type is determined
by the order of the servers inside the settings.

Change-Id: Ib1b21dd2c04d4559f538705e6ba229af043e02ae
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2019-07-24 13:40:12 +02:00
parent e0e5621b80
commit 332031d677
8 changed files with 227 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -381,11 +381,17 @@ void Client::cancelRequest(const MessageId &id)
sendContent(CancelRequest(CancelParameter(id)));
}
void Client::closeDocument(const DidCloseTextDocumentParams &params)
void Client::closeDocument(Core::IDocument *document)
{
const DocumentUri &uri = params.textDocument().uri();
m_openedDocument.remove(document->filePath());
const DocumentUri &uri = DocumentUri::fromFileName(document->filePath());
const DidCloseTextDocumentParams params(TextDocumentIdentifier{uri});
m_highlights[uri].clear();
sendContent(uri, DidCloseTextDocumentNotification(params));
auto textDocument = qobject_cast<TextEditor::TextDocument *>(document);
if (!textDocument)
return;
textDocument->setCompletionAssistProvider(m_resetAssistProvider.take(textDocument));
}
bool Client::documentOpen(const Core::IDocument *document) const
@@ -935,6 +941,20 @@ void Client::log(const QString &message, Core::MessageManager::PrintToOutputPane
Core::MessageManager::write(QString("LanguageClient %1: %2").arg(name(), message), flag);
}
void Client::showDiagnostics(Core::IDocument *doc)
{
showDiagnostics(DocumentUri::fromFileName(doc->filePath()));
}
void Client::hideDiagnostics(Core::IDocument *doc)
{
if (auto *textDocument = qobject_cast<TextEditor::TextDocument *>(doc)) {
DocumentUri uri = DocumentUri::fromFileName(doc->filePath());
for (TextMark *mark : m_diagnostics.value(uri))
textDocument->removeMark(mark);
}
}
const ServerCapabilities &Client::capabilities() const
{
return m_serverCapabilities;
@@ -1187,16 +1207,6 @@ void Client::intializeCallback(const InitializeRequest::Response &initResponse)
qCDebug(LOGLSPCLIENT) << "language server " << m_displayName << " initialized";
m_state = Initialized;
sendContent(InitializeNotification());
for (auto openedDocument : Core::DocumentModel::openedDocuments()) {
if (openDocument(openedDocument)) {
for (Core::IEditor *editor : Core::DocumentModel::editorsForDocument(openedDocument))
updateEditorToolBar(editor);
}
}
for (Core::IEditor *editor : Core::DocumentModel::editorsForOpenedDocuments()) {
if (auto textEditor = qobject_cast<TextEditor::BaseTextEditor *>(editor))
textEditor->editorWidget()->addHoverHandler(&m_hoverHandler);
}
if (m_dynamicCapabilities.isRegistered(DocumentSymbolsRequest::methodName)
.value_or(capabilities().documentSymbolProvider().value_or(false))) {
TextEditor::IOutlineWidgetFactory::updateOutline();