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

Clang: Optimize clang overview model

Browse Source 
Build the tree in only one loop.

clangbackend generates tokens almost as fast as it
did before (about 10% slower in general).
Broken documents are more affected and take much more
time (about 300%) but it's better to have this time spent
on backend side then in QtC itself.

Task-number: QTCREATORBUG-20205
Change-Id: I34c58bca30c4494005a029abd82c7e612ecd6fb9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-04-06 14:24:28 +02:00
parent 5de5794c49
commit f9d95c9205
6 changed files with 114 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
View File

@@ -250,7 +250,6 @@ void ClangEditorDocumentProcessor::updateHighlighting(
const auto skippedPreprocessorBlocks = toTextEditorBlocks(textDocument(), skippedPreprocessorRanges);
emit ifdefedOutBlocksUpdated(documentRevision, skippedPreprocessorBlocks);
m_tokenInfos = tokenInfos;
m_semanticHighlighter.setHighlightingRunner(
[tokenInfos]() {
auto *reporter = new HighlightingResultReporter(tokenInfos);

97
src/plugins/clangcodemodel/clangoverviewmodel.cpp
View File

@@ -40,77 +40,50 @@ using TokenContainers = QVector<TokenContainer>;
namespace ClangCodeModel {
namespace Internal {
static bool contains(const ClangBackEnd::SourceRangeContainer &range,
unsigned line,
unsigned column)
void addFirstItem(TokenTreeItem *root)
{
if (line < range.start.line || line > range.end.line)
return false;
if (line == range.start.line && column < range.start.column)
return false;
if (line == range.end.line && column > range.end.column)
return false;
return true;
ClangBackEnd::ExtraInfo extraInfo;
if (!root->childCount()) {
extraInfo.token = Utf8String::fromString(
QString(QT_TRANSLATE_NOOP("ClangCodeModel", "<No Symbols>")));
} else {
extraInfo.token = Utf8String::fromString(
QString(QT_TRANSLATE_NOOP("ClangCodeModel", "<Select Symbol>")));
}
ClangBackEnd::HighlightingTypes types;
types.mainHighlightingType = ClangBackEnd::HighlightingType::Invalid;
TokenContainer firstItem(0, 0, 0, types, extraInfo);
root->prependChild(new TokenTreeItem(firstItem));
}
static bool contains(const ClangBackEnd::SourceRangeContainer &range,
const ClangBackEnd::SourceLocationContainer &location)
void buildTree(const TokenContainers &containers,
TokenTreeItem *root)
{
return contains(range, location.line, location.column);
}
void buildTree(TokenContainers::const_iterator containersBegin,
TokenContainers::const_iterator containersEnd,
TokenTreeItem *parent, bool isRoot = false)
{
for (auto it = containersBegin; it != containersEnd;) {
if (!it->extraInfo.declaration) {
++it;
continue;
}
if (it->types.mainHighlightingType == ClangBackEnd::HighlightingType::LocalVariable) {
++it;
// Most of the nodes are not used in this tree at all (all local variables and more)
// therefore use unordered_map instead of vector.
std::unordered_map<int, TokenTreeItem *> treeItemCache;
for (int index = 0; index < containers.size(); ++index) {
const TokenContainer &container = containers[index];
if (!container.extraInfo.declaration ||
(container.types.mainHighlightingType
== ClangBackEnd::HighlightingType::LocalVariable)) {
continue;
}
auto *item = new TokenTreeItem(*it);
parent->appendChild(item);
const auto &range = it->extraInfo.cursorRange;
const int lexicalParentIndex = container.extraInfo.lexicalParentIndex;
QTC_ASSERT(lexicalParentIndex < index, return;);
++it;
auto innerIt = it;
for (; innerIt != containersEnd; ++innerIt) {
if (!innerIt->extraInfo.declaration)
continue;
if (innerIt->types.mainHighlightingType
== ClangBackEnd::HighlightingType::LocalVariable) {
continue;
}
const auto &start = innerIt->extraInfo.cursorRange.start;
if (!contains(range, start)) {
break;
}
}
if (innerIt != it) {
buildTree(it, innerIt, item);
it = innerIt;
}
auto item = std::make_unique<TokenTreeItem>(container);
treeItemCache[index] = item.get();
TokenTreeItem *parent = root;
if (lexicalParentIndex >= 0 && treeItemCache[lexicalParentIndex])
parent = treeItemCache[lexicalParentIndex];
parent->appendChild(item.release());
}
if (isRoot) {
ClangBackEnd::ExtraInfo extraInfo;
if (!parent->childCount()) {
extraInfo.token = Utf8String::fromString(
QString(QT_TRANSLATE_NOOP("ClangCodeModel", "<No Symbols>")));
} else {
extraInfo.token = Utf8String::fromString(
QString(QT_TRANSLATE_NOOP("ClangCodeModel", "<Select Symbol>")));
}
ClangBackEnd::HighlightingTypes types;
types.mainHighlightingType = ClangBackEnd::HighlightingType::Invalid;
TokenContainer firstItem(0, 0, 0, types, extraInfo);
parent->prependChild(new TokenTreeItem(firstItem));
}
addFirstItem(root);
}
static QString addResultTypeToFunctionSignature(const QString &signature,
@@ -222,7 +195,7 @@ bool OverviewModel::rebuild(const QString &filePath)
const TokenContainers &tokenContainers = processor->tokenInfos();
auto *root = new TokenTreeItem;
buildTree(tokenContainers.begin(), tokenContainers.end(), root, true);
buildTree(tokenContainers, root);
setRootItem(root);
return true;

9
src/plugins/clangcodemodel/clangoverviewmodel.h
View File

@@ -36,16 +36,19 @@ namespace Internal {
class ClangEditorDocumentProcessor;
struct TokenTreeItem : public ::Utils::TypedTreeItem<TokenTreeItem>
class TokenTreeItem : public ::Utils::TypedTreeItem<TokenTreeItem>
{
TokenTreeItem() = default;
public:
TokenTreeItem() noexcept
: token()
{}
TokenTreeItem(const ClangBackEnd::TokenInfoContainer &token) noexcept
: token(token)
{}
QVariant data(int column, int role) const override;
ClangBackEnd::TokenInfoContainer token;
const ClangBackEnd::TokenInfoContainer token;
};
class OverviewModel : public CppTools::AbstractOverviewModel