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

QmlOutline: Show id instead of element name if available

Browse Source
This commit is contained in:
Kai Koehne
2010-07-12 15:51:26 +02:00
parent 5e3bc834f4
commit 9c12ef51fb
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/qmljseditor/qmloutlinemodel.cpp
View File

@@ -63,6 +63,8 @@ private:
return text;
}
bool visit(AST::UiObjectDefinition *objDef)
{
AST::SourceLocation location;
@@ -71,7 +73,9 @@ private:
- objDef->firstSourceLocation().offset
+ objDef->lastSourceLocation().length;
QModelIndex index = m_model->enterElement(asString(objDef->qualifiedTypeNameId), location);
const QString typeName = asString(objDef->qualifiedTypeNameId);
const QString id = getId(objDef);
QModelIndex index = m_model->enterElement(asString(objDef->qualifiedTypeNameId), id, location);
m_nodeToIndex.insert(objDef, index);
return true;
}
@@ -100,6 +104,26 @@ private:
m_model->leaveProperty();
}
QString getId(AST::UiObjectDefinition *objDef) {
QString id;
for (AST::UiObjectMemberList *it = objDef->initializer->members; it; it = it->next) {
if (AST::UiScriptBinding *binding = dynamic_cast<AST::UiScriptBinding*>(it->member)) {
if (binding->qualifiedId->name->asString() == "id") {
AST::ExpressionStatement *expr = dynamic_cast<AST::ExpressionStatement*>(binding->statement);
if (!expr)
continue;
AST::IdentifierExpression *idExpr = dynamic_cast<AST::IdentifierExpression*>(expr->expression);
if (!idExpr)
continue;
id = idExpr->name->asString();
break;
}
}
}
return id;
}
QmlOutlineModel *m_model;
QHash<AST::Node*, QModelIndex> m_nodeToIndex;
int indent;
@@ -128,10 +152,15 @@ void QmlOutlineModel::update(QmlJS::Document::Ptr doc)
emit updated();
}
QModelIndex QmlOutlineModel::enterElement(const QString &type, const AST::SourceLocation &sourceLocation)
QModelIndex QmlOutlineModel::enterElement(const QString &type, const QString &id, const AST::SourceLocation &sourceLocation)
{
QStandardItem *item = enterNode(sourceLocation);
if (!id.isEmpty()) {
item->setText(id);
} else {
item->setText(type);
}
item->setToolTip(type);
item->setIcon(m_icons.objectDefinitionIcon());
return item->index();
}

2
src/plugins/qmljseditor/qmloutlinemodel.h
View File

@@ -21,7 +21,7 @@ public:
void update(QmlJS::Document::Ptr doc);
QModelIndex enterElement(const QString &typeName, const QmlJS::AST::SourceLocation &location);
QModelIndex enterElement(const QString &typeName, const QString &id, const QmlJS::AST::SourceLocation &location);
void leaveElement();
QModelIndex enterProperty(const QString &name, const QmlJS::AST::SourceLocation &location);