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

QmlJS: Reactivate instantiating component scope detection.

Browse Source 
* Bind::usesQmlPrototype is now significantly more performant
* type environments are no longer hashed by filename, but rather
  by Document *
* duplicate scope builds are avoided

Task-number: QTCREATORBUG-2835
Reviewed-by: Erik Verbruggen
This commit is contained in:
Christian Kamm
2010-11-23 12:57:48 +01:00
parent 8f27c43877
commit 93967104f3
6 changed files with 78 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/libs/qmljs/qmljsbind.cpp
View File

@@ -93,12 +93,71 @@ Interpreter::ObjectValue *Bind::findQmlObject(AST::Node *node) const
bool Bind::usesQmlPrototype(ObjectValue *prototype,
const Context *context) const
{
// ### This function is disabled for performance reasons.
return false;
if (!prototype)
return false;
foreach (ObjectValue *object, _qmlObjects.values()) {
const QString componentName = prototype->className();
// all component objects have classname set
if (componentName.isEmpty())
return false;
// get a list of all the names that may refer to this component
// this can only happen for file imports with an 'as' clause
// if there aren't any, possibleNames will be left empty
QSet<QString> possibleNames;
foreach (const ImportInfo &import, imports()) {
if (import.type() == ImportInfo::FileImport
&& !import.id().isEmpty()
&& import.name().contains(componentName)) {
possibleNames.insert(import.id());
}
}
if (!possibleNames.isEmpty())
possibleNames.insert(componentName);
// if there are no renamed imports and the document does not use
// the className string anywhere, it's out
if (possibleNames.isEmpty()) {
NameId nameId(componentName.data(), componentName.size());
if (!_doc->engine()->literals().contains(nameId))
return false;
}
QHashIterator<Node *, ObjectValue *> it(_qmlObjects);
while (it.hasNext()) {
it.next();
// if the type id does not contain one of the possible names, skip
Node *node = it.key();
UiQualifiedId *id = 0;
if (UiObjectDefinition *n = cast<UiObjectDefinition *>(node)) {
id = n->qualifiedTypeNameId;
} else if (UiObjectBinding *n = cast<UiObjectBinding *>(node)) {
id = n->qualifiedTypeNameId;
}
if (!id)
continue;
bool skip = false;
// optimize the common case of no renamed imports
if (possibleNames.isEmpty()) {
for (UiQualifiedId *idIt = id; idIt; idIt = idIt->next) {
if (!idIt->next && idIt->name->asString() != componentName)
skip = true;
}
} else {
for (UiQualifiedId *idIt = id; idIt; idIt = idIt->next) {
if (!idIt->next && !possibleNames.contains(idIt->name->asString()))
skip = true;
}
}
if (skip)
continue;
// resolve and check the prototype
const ObjectValue *object = it.value();
const ObjectValue *resolvedPrototype = object->prototype(context);
if (resolvedPrototype == prototype)
return true;
}