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

QmlJS: Fix handling multiple import paths into same module

Browse Source 
It is possible to import components of different paths to fill
a module.
Take further paths into account when looking up types.

Fixes: QTCREATORBUG-24405
Change-Id: I8d6bf0a324ea9c0d1fe9d91b40857f91f00dd662
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
This commit is contained in:
Christian Stenger
2021-01-11 14:09:51 +01:00
parent 7dc72c533e
commit 6ea088c02f
5 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/qmljs/qmljsutils.cpp
View File

@@ -233,12 +233,12 @@ bool QmlJS::maybeModuleVersion(const QString &version) {
* \return The module paths if found, an empty string otherwise
* \see qmlimportscanner in qtdeclarative/tools
*/
QString QmlJS::modulePath(const QString &name, const QString &version,
const QStringList &importPaths)
QStringList QmlJS::modulePaths(const QString &name, const QString &version,
const QStringList &importPaths)
{
Q_ASSERT(maybeModuleVersion(version));
if (importPaths.isEmpty())
return QString();
return {};
const QString sanitizedVersion = version == undefinedVersion ? QString() : version;
const QStringList parts = name.split('.', Qt::SkipEmptyParts);
@@ -249,6 +249,7 @@ QString QmlJS::modulePath(const QString &name, const QString &version,
// sanitized version.
const QRegularExpression re("\\.?\\d+$");
QStringList result;
QString candidate;
for (QString ver = sanitizedVersion; !ver.isEmpty(); ver.remove(re)) {
@@ -260,7 +261,7 @@ QString QmlJS::modulePath(const QString &name, const QString &version,
ver,
mkpath(parts.mid(i + 1))));
if (QDir(candidate).exists())
return candidate;
result << candidate;
}
}
}
@@ -269,10 +270,10 @@ QString QmlJS::modulePath(const QString &name, const QString &version,
for (const QString &path: importPaths) {
candidate = QDir::cleanPath(QString::fromLatin1("%1/%2").arg(path, mkpath(parts)));
if (QDir(candidate).exists())
return candidate;
result << candidate;
}
return QString();
return result;
}
bool QmlJS::isValidBuiltinPropertyType(const QString &name)