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

CMakePM: Add support for cmake-format config files

Browse Source 
Fixes: QTCREATORBUG-28969
Change-Id: I0bb31993e4d2ffd8affcc67dee5fd70654e2c1d3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Cristian Adam
2023-08-03 19:29:37 +02:00
parent 9a31491934
commit 3a3bf41eef
1 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/plugins/cmakeprojectmanager/cmakeformatter.cpp
View File

@@ -97,7 +97,11 @@ public:
Core::Command *cmd = ActionManager::registerAction(&formatFile, Constants::CMAKEFORMATTER_ACTION_ID); Core::Command *cmd = ActionManager::registerAction(&formatFile, Constants::CMAKEFORMATTER_ACTION_ID);
connect(&formatFile, &QAction::triggered, this, [this] { connect(&formatFile, &QAction::triggered, this, [this] {
TextEditor::formatCurrentFile(formatCommand()); auto command = formatCommand();
if (auto editor = EditorManager::currentEditor())
extendCommandWithConfigs(command, editor->document()->filePath());
TextEditor::formatCurrentFile(command);
}); });
ActionManager::actionContainer(Constants::CMAKEFORMATTER_MENU_ID)->addAction(cmd); ActionManager::actionContainer(Constants::CMAKEFORMATTER_MENU_ID)->addAction(cmd);
@@ -142,6 +146,46 @@ public:
return cmd; return cmd;
} }
static FilePaths formatConfigFiles(const FilePath &dir)
{
if (dir.isEmpty())
return FilePaths();
return filtered(transform({".cmake-format",
".cmake-format.py",
".cmake-format.json",
".cmake-format.yaml",
"cmake-format.py",
"cmake-format.json",
"cmake-format.yaml"},
[dir](const QString &fileName) {
return dir.pathAppended(fileName);
}),
&FilePath::exists);
}
static FilePaths findConfigs(const FilePath &fileName)
{
FilePath parentDirectory = fileName.parentDir();
while (parentDirectory.exists()) {
FilePaths configFiles = formatConfigFiles(parentDirectory);
if (!configFiles.isEmpty())
return configFiles;
parentDirectory = parentDirectory.parentDir();
}
return FilePaths();
}
static void extendCommandWithConfigs(TextEditor::Command &command, const FilePath &source)
{
const FilePaths configFiles = findConfigs(source);
if (!configFiles.isEmpty()) {
command.addOption("--config-files");
command.addOptions(Utils::transform(configFiles, &FilePath::nativePath));
}
}
FilePathAspect command{this}; FilePathAspect command{this};
bool haveValidFormatCommand{false}; bool haveValidFormatCommand{false};
BoolAspect autoFormatOnSave{this}; BoolAspect autoFormatOnSave{this};
@@ -199,9 +243,11 @@ void CMakeFormatterSettings::applyIfNecessary(IDocument *document) const
IEditor *currentEditor = EditorManager::currentEditor(); IEditor *currentEditor = EditorManager::currentEditor();
IEditor *editor = editors.contains(currentEditor) ? currentEditor : editors.first(); IEditor *editor = editors.contains(currentEditor) ? currentEditor : editors.first();
if (auto widget = TextEditorWidget::fromEditor(editor)) if (auto widget = TextEditorWidget::fromEditor(editor)) {
extendCommandWithConfigs(command, editor->document()->filePath());
TextEditor::formatEditor(widget, command); TextEditor::formatEditor(widget, command);
} }
}
CMakeFormatterSettings &formatterSettings() CMakeFormatterSettings &formatterSettings()
{ {