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

ClangFormat: Make Language Client dependency conditional

Browse Source 
Amends e1f7469afb

Change-Id: Iea7dc6210ac7e1bf39e570cf58e6a5a1abd5cdb6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Artem Sokolovskii
2024-01-31 11:08:48 +01:00
parent 4dc3fb05a7
commit 5051a77c8b
1 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/clangformat/clangformatconfigwidget.cpp
View File

@@ -54,9 +54,14 @@ using namespace Utils;
namespace ClangFormat {
static QObject *languageClientManager()
template<typename... Args>
static void invokeMethodForLanguageClientManager(const char *method, Args &&...args)
{
return ExtensionSystem::PluginManager::getObjectByName("LanguageClientManager");
QObject *languageClientManager = ExtensionSystem::PluginManager::getObjectByName(
"LanguageClientManager");
if (!languageClientManager)
return;
QMetaObject::invokeMethod(languageClientManager, method, args...);
}
class ClangFormatConfigWidget final : public TextEditor::CodeStyleEditorWidget
@@ -69,8 +74,7 @@ public:
~ClangFormatConfigWidget()
{
auto doc = qobject_cast<TextEditor::TextDocument *>(m_editor->document());
QMetaObject::invokeMethod(languageClientManager(),
"documentClosed",
invokeMethodForLanguageClientManager("documentClosed",
Q_ARG(Core::IDocument *, doc));
}
@@ -178,11 +182,9 @@ void ClangFormatConfigWidget::initEditor(TextEditor::ICodeStylePreferences *code
m_editor->document()->open(&errorString, m_config->filePath(), m_config->filePath());
m_editor->widget()->adjustSize();
QMetaObject::invokeMethod(languageClientManager(),
"documentOpened",
invokeMethodForLanguageClientManager("documentOpened",
Q_ARG(Core::IDocument *, m_editor->document()));
QMetaObject::invokeMethod(languageClientManager(),
"editorOpened",
invokeMethodForLanguageClientManager("editorOpened",
Q_ARG(Core::IEditor *, m_editor));
m_editorWidget = m_editor->widget();
@@ -209,7 +211,7 @@ void ClangFormatConfigWidget::initEditor(TextEditor::ICodeStylePreferences *code
= parseConfigurationContent(m_editor->document()->contents().toStdString(),
currentSettingsStyle);
QString text = "";
QString text;
Qt::GlobalColor currentColor;
QPixmap pixmap;
if (success) {
@@ -262,7 +264,7 @@ void ClangFormatConfigWidget::initPreview(TextEditor::ICodeStylePreferences *cod
m_preview->textDocument()->setFontSettings(TextEditor::TextEditorSettings::fontSettings());
m_preview->textDocument()->resetSyntaxHighlighter(
[] { return new CppEditor::CppHighlighter(); });
m_preview->textDocument()->indenter()->setFileName(fileName);
m_indenter->setFileName(fileName);
m_preview->show();
}
@@ -334,8 +336,7 @@ void ClangFormatConfigWidget::reopenClangFormatDocument()
QString errorString;
if (m_editor->document()->open(&errorString, m_config->filePath(), m_config->filePath())
== Core::IDocument::OpenResult::Success) {
QMetaObject::invokeMethod(languageClientManager(),
"documentOpened",
invokeMethodForLanguageClientManager("documentOpened",
Q_ARG(Core::IDocument *, m_editor->document()));
}
}
@@ -360,18 +361,12 @@ void ClangFormatConfigWidget::apply()
}
QMessageBox mBox;
mBox.setText(Tr::tr("The current settings are not valid. Are you sure you want to apply them?"));
mBox.setText(
Tr::tr("The current settings are not valid. Are you sure you want to apply them?"));
mBox.setStandardButtons(QMessageBox::No | QMessageBox::Yes);
mBox.setDefaultButton(QMessageBox::No);
int ret = mBox.exec();
switch (ret) {
case QMessageBox::Yes:
if (mBox.exec() == QMessageBox::Yes)
saveSettings();
break;
case QMessageBox::No:
default:
break;
}
}
TextEditor::CodeStyleEditorWidget *createClangFormatConfigWidget(