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

ClangFormat: Use relevant settings for each file

Browse Source 
Existing Clang Format settings may not follow the
project/global pattern but can be expected to be used
for the indentation/formatting.

So let's proceed with UI for global/project settings
but use global settings only if there's no configuration
found for the current file.

Change-Id: I87c25ab3feb7e2e3deb0290848088657783cf972
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-11-13 11:47:02 +01:00
parent 5b12ada2dc
commit 9a85ce88a7
5 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/plugins/clangformat/clangformatutils.cpp
View File

@@ -92,7 +92,7 @@ static void applyCppCodeStyleSettings(clang::format::FormatStyle &style,
: - static_cast<int>(style.IndentWidth);
}
static Utils::FileName projectStylePath()
static Utils::FileName projectPath()
{
const Project *project = SessionManager::startupProject();
if (project)
@@ -101,18 +101,18 @@ static Utils::FileName projectStylePath()
return Utils::FileName();
}
static Utils::FileName globalStylePath()
static Utils::FileName globalPath()
{
return Utils::FileName::fromString(Core::ICore::userResourcePath());
}
Utils::FileName currentStyleConfigPath()
{
Utils::FileName path = projectStylePath();
if (!path.isEmpty())
return path;
return globalStylePath();
static bool configForFileExists(Utils::FileName fileName) {
QDir projectDir(fileName.parentDir().toString());
while (!projectDir.exists(SETTINGS_FILE_NAME) && !projectDir.exists(SETTINGS_FILE_ALT_NAME)) {
if (!projectDir.cdUp())
return false;
}
return true;
}
static clang::format::FormatStyle constructStyle(bool isGlobal)
@@ -134,9 +134,11 @@ static clang::format::FormatStyle constructStyle(bool isGlobal)
return style;
}
void createStyleFileIfNeeded(Utils::FileName styleConfigPath, bool isGlobal)
void createStyleFileIfNeeded(bool isGlobal)
{
const QString configFile = styleConfigPath.appendPath(SETTINGS_FILE_NAME).toString();
Utils::FileName path = isGlobal ? globalPath() : projectPath();
const QString configFile = path.appendPath(SETTINGS_FILE_NAME).toString();
if (QFile::exists(configFile))
return;
@@ -147,13 +149,23 @@ void createStyleFileIfNeeded(Utils::FileName styleConfigPath, bool isGlobal)
}
}
static clang::format::FormatStyle currentStyle(bool isGlobal)
clang::format::FormatStyle styleForFile(Utils::FileName fileName)
{
Utils::FileName styleConfigPath = isGlobal ? globalStylePath() : projectStylePath();
createStyleFileIfNeeded(styleConfigPath, isGlobal);
bool isGlobal = false;
if (!configForFileExists(fileName)) {
if (fileName.isChildOf(projectPath()) && CppCodeStyleSettings::currentProjectCodeStyle()) {
fileName = projectPath();
} else {
fileName = globalPath();
isGlobal = true;
}
fileName.appendPath(SAMPLE_FILE_NAME);
createStyleFileIfNeeded(isGlobal);
}
Expected<FormatStyle> style = format::getStyle(
"file", styleConfigPath.appendPath("test.cpp").toString().toStdString(), "LLVM");
Expected<FormatStyle> style = format::getStyle("file",
fileName.toString().toStdString(),
"none");
if (style)
return *style;
@@ -166,25 +178,12 @@ static clang::format::FormatStyle currentStyle(bool isGlobal)
clang::format::FormatStyle currentProjectStyle()
{
return currentStyle(false);
return styleForFile(projectPath().appendPath(SAMPLE_FILE_NAME));
}
clang::format::FormatStyle currentGlobalStyle()
{
return currentStyle(true);
}
static bool isCurrentStyleGlobal()
{
Utils::FileName path = projectStylePath();
if (path.appendPath(SETTINGS_FILE_NAME).exists())
return false;
return !CppCodeStyleSettings::currentProjectCodeStyle().has_value();
}
clang::format::FormatStyle currentStyle()
{
return currentStyle(isCurrentStyleGlobal());
return styleForFile(globalPath().appendPath(SAMPLE_FILE_NAME));
}
}