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

17
src/plugins/languageclient/languageclientoutline.cpp
View File

@@ -220,6 +220,8 @@ void LanguageClientOutlineWidget::onItemActivated(const QModelIndex &index)
static bool clientSupportsDocumentSymbols(const Client *client, const TextEditor::TextDocument *doc)
{
if (!client)
return false;
DynamicCapabilities dc = client->dynamicCapabilities();
if (dc.isRegistered(DocumentSymbolsRequest::methodName).value_or(false)) {
TextDocumentRegistrationOptions options(dc.option(DocumentSymbolsRequest::methodName));
@@ -234,22 +236,17 @@ bool LanguageClientOutlineWidgetFactory::supportsEditor(Core::IEditor *editor) c
auto doc = qobject_cast<TextEditor::TextDocument *>(editor->document());
if (!doc)
return false;
auto clients = LanguageClientManager::clientsSupportingDocument(doc);
return Utils::anyOf(clients, [doc](const Client *client){
return clientSupportsDocumentSymbols(client, doc);
});
return clientSupportsDocumentSymbols(LanguageClientManager::clientForDocument(doc), doc);
}
TextEditor::IOutlineWidget *LanguageClientOutlineWidgetFactory::createWidget(Core::IEditor *editor)
{
auto textEditor = qobject_cast<TextEditor::BaseTextEditor *>(editor);
QTC_ASSERT(textEditor, return nullptr);
QList<Client *> clients = LanguageClientManager::clientsSupportingDocument(textEditor->textDocument());
QTC_ASSERT(!clients.isEmpty(), return nullptr);
clients = Utils::filtered(clients, [doc = textEditor->textDocument()](const Client *client){
return clientSupportsDocumentSymbols(client, doc);
});
return new LanguageClientOutlineWidget(clients.first(), textEditor);
Client *client = LanguageClientManager::clientForDocument(textEditor->textDocument());
if (!client || !clientSupportsDocumentSymbols(client, textEditor->textDocument()))
return nullptr;
return new LanguageClientOutlineWidget(client, textEditor);
}
} // namespace LanguageClient