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

QmlDesigner: Improve error message on trying to edit empty component

Browse Source 
Task-number: QDS-5308
Change-Id: I401a375443e2df52a2656a34ab4c650664b0df97
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Miikka Heikkinen
2021-11-02 17:21:00 +02:00
parent 0484d574d6
commit 1c526c827d
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp
View File

@@ -123,6 +123,9 @@ QTextDocument *ComponentTextModifier::textDocument() const
QString ComponentTextModifier::text() const QString ComponentTextModifier::text() const
{ {
if (m_componentStartOffset == -1)
return {};
QString txt(m_originalModifier->text()); QString txt(m_originalModifier->text());
const int leader = m_componentStartOffset - m_rootStartOffset; const int leader = m_componentStartOffset - m_rootStartOffset;

9
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -1044,6 +1044,15 @@ void TextToModelMerger::setupUsedImports()
Document::MutablePtr TextToModelMerger::createParsedDocument(const QUrl &url, const QString &data, QList<DocumentMessage> *errors) Document::MutablePtr TextToModelMerger::createParsedDocument(const QUrl &url, const QString &data, QList<DocumentMessage> *errors)
{ {
if (data.isEmpty()) {
if (errors) {
QmlJS::DiagnosticMessage msg;
msg.message = QObject::tr("Empty document");
errors->append(DocumentMessage(msg, url));
}
return {};
}
const QString fileName = url.toLocalFile(); const QString fileName = url.toLocalFile();
Dialect dialect = ModelManagerInterface::guessLanguageOfFile(fileName); Dialect dialect = ModelManagerInterface::guessLanguageOfFile(fileName);