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

37
src/plugins/languageclient/languageclientutils.cpp
View File

@@ -40,6 +40,7 @@
#include <utils/utilsicons.h>
#include <QFile>
#include <QMenu>
#include <QTextDocument>
#include <QToolBar>
#include <QToolButton>
@@ -200,30 +201,34 @@ void updateEditorToolBar(Core::IEditor *editor)
if (!widget)
return;
const Core::IDocument *document = editor->document();
QStringList clientsWithDoc;
for (auto client : LanguageClientManager::clients()) {
if (client->documentOpen(document))
clientsWithDoc << client->name();
}
Core::IDocument *document = editor->document();
Client *client = LanguageClientManager::clientForDocument(document);
static QMap<QWidget *, QAction *> actions;
if (actions.contains(widget)) {
auto action = actions[widget];
if (clientsWithDoc.isEmpty()) {
if (client) {
action->setText(client->name());
} else {
widget->toolBar()->removeAction(action);
actions.remove(widget);
} else {
action->setText(clientsWithDoc.join(';'));
}
} else if (!clientsWithDoc.isEmpty()) {
const QIcon icon
= Utils::Icon({{":/languageclient/images/languageclient.png",
Utils::Theme::IconsBaseColor}})
.icon();
actions[widget] = widget->toolBar()->addAction(icon, clientsWithDoc.join(';'), []() {
Core::ICore::showOptionsDialog(Constants::LANGUAGECLIENT_SETTINGS_PAGE);
} else if (client) {
const QIcon icon = Utils::Icon({{":/languageclient/images/languageclient.png",
Utils::Theme::IconsBaseColor}})
.icon();
actions[widget] = widget->toolBar()->addAction(icon, client->name(), [document]() {
auto menu = new QMenu;
for (auto client : LanguageClientManager::clientsSupportingDocument(document))
menu->addAction(client->name(), [client = QPointer<Client>(client), document]() {
if (client)
LanguageClientManager::reOpenDocumentWithClient(document, client);
});
menu->addAction("Manage...", []() {
Core::ICore::showOptionsDialog(Constants::LANGUAGECLIENT_SETTINGS_PAGE);
});
menu->popup(QCursor::pos());
});
QObject::connect(widget, &QWidget::destroyed, [widget]() {
actions.remove(widget);