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

QmlJS: Update to new QmlJS parser.

Browse Source 
UiPublicMember is now initialized with a statement.
This commit is contained in:
Christian Kamm
2011-05-12 13:25:35 +02:00
parent f8bcd6c615
commit d72bddc7da
30 changed files with 1171 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmljseditor/qmljshoverhandler.cpp
View File

@@ -181,13 +181,13 @@ bool HoverHandler::matchColorItem(const LookupContext::Ptr &lookupContext,
}
} else if (const AST::UiPublicMember *publicMember =
AST::cast<const AST::UiPublicMember *>(member)) {
if (publicMember->name && posIsInSource(pos, publicMember->expression)) {
if (publicMember->name && posIsInSource(pos, publicMember->statement)) {
value = lookupContext->context()->lookup(publicMember->name->asString());
if (const Interpreter::Reference *ref = value->asReference())
value = lookupContext->context()->lookupReference(ref);
color = textAt(qmlDocument,
publicMember->expression->firstSourceLocation(),
publicMember->expression->lastSourceLocation());
publicMember->statement->firstSourceLocation(),
publicMember->statement->lastSourceLocation());
}
}

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

@@ -523,7 +523,7 @@ QModelIndex QmlOutlineModel::enterPublicMember(AST::UiPublicMember *publicMember
if (publicMember->name)
objectData.insert(Qt::DisplayRole, publicMember->name->asString());
objectData.insert(AnnotationRole, getAnnotation(publicMember->expression));
objectData.insert(AnnotationRole, getAnnotation(publicMember->statement));
objectData.insert(ItemTypeRole, NonElementBindingType);
QmlOutlineItem *item = enterNode(objectData, publicMember, 0, m_icons->publicMemberIcon());