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

Hotfix for missing import

Browse Source 
Task-number: QDS-15384
Change-Id: Ia1ded05040f1fcc6326989587491604433f2efb0
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Henning Gruendl
2025-05-21 13:13:59 +02:00
committed by Thomas Hartmann
parent 3848bcdf47
commit 1cccc9428b
1 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
View File

@@ -480,6 +480,51 @@ bool QmlBuildSystem::setMainUiFileInProjectFile(const Utils::FilePath &newMainUi
&& setFileSettingInProjectFile("mainUiFile", newMainUiFilePath, m_projectItem->mainUiFile());
}
static void addImport(const Utils::FilePath &mainFilePath,
const Utils::FilePath &mainUiFilePath,
QString &fileContent)
{
auto commonPath = Utils::FileUtils::commonPath({mainFilePath, mainUiFilePath});
auto path = mainUiFilePath.parentDir().prefixRemoved(commonPath.path());
if (!path)
return;
const QChar pathSeparator = path->pathComponentSeparator();
QString importPath;
if (path->pathView().startsWith(pathSeparator))
importPath = path->pathView().mid(1).toString();
if (importPath.isEmpty())
return;
static const QRegularExpression rx(
"^import\\s+(?:(?:\"(?<path>[^\"]+)\"|(?<module>[\\w.]+))(?:\\s+(?<version>\\d+(?:"
"\\."
"\\d+)?)?)?(?:\\s+as\\s+(?<qualifier>\\w+))?)?\\s*$");
QStringList fileContentLines = fileContent.split('\n');
unsigned lastImportIndex = 0;
for (unsigned i = 0; i != fileContentLines.size(); ++i) {
QRegularExpressionMatch match = rx.match(fileContentLines[i]);
if (match.hasMatch()) {
auto pathCaptured = match.capturedView("path");
if (!pathCaptured.isEmpty() && pathCaptured == importPath)
return;
lastImportIndex = i;
}
}
fileContentLines.insert(lastImportIndex + 1, QString("import \"%1\"").arg(importPath));
fileContent = fileContentLines.join("\n");
}
bool QmlBuildSystem::setMainUiFileInMainFile(const Utils::FilePath &newMainUiFilePath)
{
Core::FileChangeBlocker fileChangeBlocker(mainFilePath());
@@ -504,6 +549,8 @@ bool QmlBuildSystem::setMainUiFileInMainFile(const Utils::FilePath &newMainUiFil
const QString currentMain = QString("%1 {").arg(mainUiFilePath().baseName());
const QString newMain = QString("%1 {").arg(newMainUiFilePath.baseName());
addImport(mainFilePath(), newMainUiFilePath, fileContent);
if (fileContent.contains(currentMain))
fileContent.replace(currentMain, newMain);