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

ClangFormat: Add caching of current style

Browse Source 
Previously, ClangFormat was getting the style for a file
every time styleForFile was called, which could cause
unnecessary delays and impact performance. This commit
adds caching of the current style with a timeout of 1s,
so that ClangFormat can quickly access the cached style
instead of recalculating it each time.

Change-Id: I33c114d51d6ce1acd0b6d9d2a28e2b6712e149dd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Artem Sokolovskii
2023-05-12 11:57:26 +02:00
parent 375db16ac4
commit 74f77f6407
3 changed files with 46 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/clangformat/clangformatbaseindenter.cpp
View File

@@ -774,10 +774,28 @@ clang::format::FormatStyle overrideStyle(const Utils::FilePath &fileName)
return currentSettingsStyle;
}
clang::format::FormatStyle ClangFormatBaseIndenter::styleForFile() const
static std::chrono::milliseconds getCacheTimeout()
{
if (getCurrentOverriddenSettings(m_fileName))
return overrideStyle(m_fileName);
using namespace std::chrono_literals;
bool ok = false;
const int envCacheTimeout = qEnvironmentVariableIntValue("CLANG_FORMAT_CACHE_TIMEOUT", &ok);
return ok ? std::chrono::milliseconds(envCacheTimeout) : 1s;
}
const clang::format::FormatStyle &ClangFormatBaseIndenter::styleForFile() const
{
using namespace std::chrono_literals;
static const std::chrono::milliseconds cacheTimeout = getCacheTimeout();
QDateTime time = QDateTime::currentDateTime();
if (m_cachedStyle.expirationTime > time && !(m_cachedStyle.style == clang::format::getNoStyle()))
return m_cachedStyle.style;
if (getCurrentOverriddenSettings(m_fileName)) {
clang::format::FormatStyle style = overrideStyle(m_fileName);
m_cachedStyle.setCache(style, cacheTimeout);
return m_cachedStyle.style;
}
llvm::Expected<clang::format::FormatStyle> styleFromProjectFolder
= clang::format::getStyle("file",
@@ -788,14 +806,17 @@ clang::format::FormatStyle ClangFormatBaseIndenter::styleForFile() const
if (styleFromProjectFolder && !(*styleFromProjectFolder == clang::format::getNoStyle())) {
addQtcStatementMacros(*styleFromProjectFolder);
return *styleFromProjectFolder;
m_cachedStyle.setCache(*styleFromProjectFolder, cacheTimeout);
return m_cachedStyle.style;
}
handleAllErrors(styleFromProjectFolder.takeError(), [](const llvm::ErrorInfoBase &) {
// do nothing
});
return qtcStyle();
m_cachedStyle.setCache(qtcStyle(), 0ms);
return m_cachedStyle.style;
}
} // namespace ClangFormat