Commit 617f74aa authored by Thomas Hartmann's avatar Thomas Hartmann

QmlDesigner.rewriter: Validate instead of Amend in applyChanges()

If the changes come from the rewriter itself we should validate instead
of amend.

Change-Id: I9f8c00631379608b0bb114d4520631b550012a58
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent 8aadf9e7
......@@ -493,6 +493,8 @@ void RewriterView::applyChanges()
throw RewritingException(__LINE__, __FUNCTION__, __FILE__, "RewriterView::applyChanges() already in error state", content);
}
m_differenceHandling = Validate;
try {
modelToTextMerger()->applyChanges();
if (!errors().isEmpty()) {
......@@ -505,6 +507,8 @@ void RewriterView::applyChanges()
enterErrorState(e.description());
}
m_differenceHandling = Amend;
if (inErrorState()) {
const QString content = textModifierContent();
qDebug() << "RewriterException:" << m_rewritingErrorMessage;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment