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

QmlDesigner: Make inErrorState() private

Browse Source 
This method should be only for internal use, since it is
different from errors.isEmpty(), because the rewriter is only inErrorState
if parsing/rewriting fails, not if there is a semantic error.

Change-Id: Ib021e5e80750a4edcb4661755e85e6880fd6617c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Thomas Hartmann
2022-06-21 14:16:01 +02:00
parent 2de2a4808a
commit 281c534894
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp
View File

@@ -81,7 +81,7 @@ bool AssetExporterView::saveQmlFile(QString *error) const
void AssetExporterView::modelAttached(Model *model) void AssetExporterView::modelAttached(Model *model)
{ {
if (model->rewriterView() && model->rewriterView()->inErrorState()) if (model->rewriterView() && !model->rewriterView()->errors().isEmpty())
setState(LoadState::QmlErrorState); setState(LoadState::QmlErrorState);
AbstractView::modelAttached(model); AbstractView::modelAttached(model);

2
src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
View File

@@ -513,7 +513,7 @@ public:
->currentModel(); ->currentModel();
if (currentModel->rewriterView() if (currentModel->rewriterView()
&& currentModel->rewriterView()->inErrorState()) { && !currentModel->rewriterView()->errors().isEmpty()) {
throw DocumentError{}; throw DocumentError{};
} }

4
src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp
View File

@@ -96,11 +96,11 @@ void ImageCacheCollector::start(Utils::SmallStringView name,
model->setRewriterView(&rewriterView); model->setRewriterView(&rewriterView);
bool is3DRoot = !rewriterView.inErrorState() bool is3DRoot = rewriterView.errors().isEmpty()
&& (rewriterView.rootModelNode().isSubclassOf("QtQuick3D.Node") && (rewriterView.rootModelNode().isSubclassOf("QtQuick3D.Node")
|| rewriterView.rootModelNode().isSubclassOf("QtQuick3D.Material")); || rewriterView.rootModelNode().isSubclassOf("QtQuick3D.Material"));
if (rewriterView.inErrorState() || (!rewriterView.rootModelNode().metaInfo().isGraphicalItem() if (!rewriterView.errors().isEmpty() || (!rewriterView.rootModelNode().metaInfo().isGraphicalItem()
&& !is3DRoot)) { && !is3DRoot)) {
if (abortCallback) if (abortCallback)
abortCallback(ImageCache::AbortReason::Failed); abortCallback(ImageCache::AbortReason::Failed);

2
src/plugins/qmldesigner/designercore/include/rewriterview.h
View File

@@ -127,7 +127,6 @@ public:
void addError(const DocumentMessage &error); void addError(const DocumentMessage &error);
void enterErrorState(const QString &errorMessage); void enterErrorState(const QString &errorMessage);
bool inErrorState() const { return !m_rewritingErrorMessage.isEmpty(); }
void leaveErrorState() { m_rewritingErrorMessage.clear(); } void leaveErrorState() { m_rewritingErrorMessage.clear(); }
void resetToLastCorrectQml(); void resetToLastCorrectQml();
@@ -202,6 +201,7 @@ private: //variables
void setupCanonicalHashes() const; void setupCanonicalHashes() const;
void handleLibraryInfoUpdate(); void handleLibraryInfoUpdate();
void handleProjectUpdate(); void handleProjectUpdate();
bool inErrorState() const { return !m_rewritingErrorMessage.isEmpty(); }
TextModifier *m_textModifier = nullptr; TextModifier *m_textModifier = nullptr;
int transactionLevel = 0; int transactionLevel = 0;