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

QmlJS: Improve support for multiple imports into same alias

Browse Source 
Add extra handling for aliased imports to avoid handling
shadowed imports as unknown which in turn ignored them
and marked their members as unknown types and did not
provide auto completion for their members.

Fixes: QTCREATORBUG-15684
Change-Id: Iee1009cbdfde13ce261854c3239b9b50c434f563
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Christian Stenger
2019-12-03 11:07:47 +01:00
parent e5f1559bb6
commit 8f682573a8
3 changed files with 74 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/libs/qmljs/qmljsinterpreter.cpp
View File

@@ -2355,6 +2355,12 @@ TypeScope::TypeScope(const Imports *imports, ValueOwner *valueOwner)
const Value *TypeScope::lookupMember(const QString &name, const Context *context,
const ObjectValue **foundInObject, bool) const
{
if (const ObjectValue *value = m_imports->resolveAliasAndMarkUsed(name)) {
if (foundInObject)
*foundInObject = this;
return value;
}
const QList<Import> &imports = m_imports->all();
for (int pos = imports.size(); --pos >= 0; ) {
const Import &i = imports.at(pos);
@@ -2365,16 +2371,6 @@ const Value *TypeScope::lookupMember(const QString &name, const Context *context
if (info.type() == ImportType::File || info.type() == ImportType::QrcFile)
continue;
if (!info.as().isEmpty()) {
if (info.as() == name) {
if (foundInObject)
*foundInObject = this;
i.used = true; // FIXME: This evilly modifies a 'const' object
return import;
}
continue;
}
if (const Value *v = import->lookupMember(name, context, foundInObject)) {
i.used = true;
return v;
@@ -2418,26 +2414,10 @@ JSImportScope::JSImportScope(const Imports *imports, ValueOwner *valueOwner)
const Value *JSImportScope::lookupMember(const QString &name, const Context *,
const ObjectValue **foundInObject, bool) const
{
const QList<Import> &imports = m_imports->all();
for (int pos = imports.size(); --pos >= 0; ) {
const Import &i = imports.at(pos);
const ObjectValue *import = i.object;
const ImportInfo &info = i.info;
// JS imports are always: import "somefile.js" as Foo
if (info.type() != ImportType::File && info.type() != ImportType::QrcFile)
continue;
if (info.as() == name) {
if (foundInObject)
*foundInObject = this;
i.used = true;
return import;
}
}
const ObjectValue *value = m_imports->resolveAliasAndMarkUsed(name);
if (foundInObject)
*foundInObject = nullptr;
return nullptr;
*foundInObject = value ? this : nullptr;
return value;
}
void JSImportScope::processMembers(MemberProcessor *processor) const
@@ -2464,10 +2444,31 @@ Imports::Imports(ValueOwner *valueOwner)
, m_importFailed(false)
{}
class MemberCopy : public MemberProcessor
{
public:
explicit MemberCopy(ObjectValue *value) : m_value(value) {}
bool processProperty(const QString &name, const Value *value,
const PropertyInfo & /*propertyInfo*/) override
{
m_value->setMember(name, value);
return true;
}
private:
ObjectValue *m_value = nullptr;
};
void Imports::append(const Import &import)
{
// when doing lookup, imports with 'as' clause are looked at first
if (!import.info.as().isEmpty()) {
const QString alias = import.info.as();
if (!m_aliased.contains(alias))
m_aliased.insert(alias, m_typeScope->valueOwner()->newObject(nullptr));
ObjectValue *obj = m_aliased[alias];
MemberCopy copyProcessor(obj);
import.object->processMembers(&copyProcessor);
m_imports.append(import);
} else {
// find first as-import and prepend
@@ -2554,6 +2555,11 @@ const QList<Import> &Imports::all() const
return m_imports;
}
const ObjectValue *Imports::aliased(const QString &name) const
{
return m_aliased.value(name, nullptr);
}
const TypeScope *Imports::typeScope() const
{
return m_typeScope;
@@ -2564,6 +2570,20 @@ const JSImportScope *Imports::jsImportScope() const
return m_jsImportScope;
}
const ObjectValue *Imports::resolveAliasAndMarkUsed(const QString &name) const
{
if (const ObjectValue *value = m_aliased.value(name, nullptr)) {
// mark all respective ImportInfo objects to avoid dropping imports (QmlDesigner) on rewrite
for (const Import &i : qAsConst(m_imports)) {
const ImportInfo &info = i.info;
if (info.as() == name)
i.used = true; // FIXME: This evilly modifies a 'const' object
}
return value;
}
return nullptr;
}
#ifdef QT_DEBUG
class MemberDumper: public MemberProcessor