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

QmlJS: Fix issues with getting modulePaths

Browse Source 
This patch

- improves performance by removing the usage of QRegularExpression for
trivial string operations (this is called 3000 times after configuring
Qt Creator)

- fixes handling of version number like "2.-1" which are the result of
imports with only a major version number like "import QtQuick 2"

Task-number: QTCREATORBUG-25899
Fixes: QTCREATORBUG-26178
Fixes: QTCREATORBUG-26216
Change-Id: Ic792909513f4fe25ac72043645f297ee41890375
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Eike Ziller
2021-06-23 10:27:08 +02:00
parent 481070d808
commit 95de5c93b1
5 changed files with 100 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,6 +213,29 @@ bool QmlJS::maybeModuleVersion(const QString &version) {
return version.isEmpty() || version == undefinedVersion || re.match(version).hasMatch();
}
const QStringList QmlJS::splitVersion(const QString &version)
{
// Successively removing minor and major version numbers.
QStringList result;
int versionEnd = version.length();
while (versionEnd > 0) {
result.append(version.left(versionEnd));
// remove numbers and then potential . at the end
const int oldVersionEnd = versionEnd;
while (versionEnd > 0 && version.at(versionEnd - 1).isDigit())
--versionEnd;
// handle e.g. -1, because an import "QtQuick 2" results in version "2.-1"
if (versionEnd > 0 && version.at(versionEnd - 1) == '-')
--versionEnd;
if (versionEnd > 0 && version.at(versionEnd - 1) == '.')
--versionEnd;
// bail out if we didn't proceed because version string contains invalid characters
if (versionEnd == oldVersionEnd)
break;
}
return result;
}
/*!
* \brief Get the path of a module
* \param name
@@ -242,24 +265,19 @@ QStringList QmlJS::modulePaths(const QString &name, const QString &version,
const QString sanitizedVersion = version == undefinedVersion ? QString() : version;
const QStringList parts = name.split('.', Qt::SkipEmptyParts);
auto mkpath = [] (const QStringList &xs) -> QString { return xs.join(QLatin1Char('/')); };
// Regular expression for building candidates by successively removing minor and major
// version numbers. It does not match the undefined version, so it has to be applied to the
// sanitized version.
const QRegularExpression re("\\.?\\d+$");
auto mkpath = [](const QStringList &xs) -> QString { return xs.join(QLatin1Char('/')); };
QStringList result;
QString candidate;
for (QString ver = sanitizedVersion; !ver.isEmpty(); ver.remove(re)) {
for (const QString &path: importPaths) {
for (const QString &versionPart : splitVersion(sanitizedVersion)) {
for (const QString &path : importPaths) {
for (int i = parts.count() - 1; i >= 0; --i) {
candidate = QDir::cleanPath(
QString::fromLatin1("%1/%2.%3/%4").arg(path,
mkpath(parts.mid(0, i + 1)),
ver,
mkpath(parts.mid(i + 1))));
candidate = QDir::cleanPath(QString::fromLatin1("%1/%2.%3/%4")
.arg(path,
mkpath(parts.mid(0, i + 1)),
versionPart,
mkpath(parts.mid(i + 1))));
if (QDir(candidate).exists())
result << candidate;
}