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

QmlDesigner: Adjust ComponentTextModifier offsets on doc text change

Browse Source 
ComponentTextModifier offsets were set at modifier creation time, and
were not adjusted for changes on the document before the subcomponent
code. Added rudimentary change detection logic for code additions and
removals before subcomponent code and adjust offsets accordingly.

Fixes: QDS-5305
Change-Id: I816adc1fc867b7135b992fb50a5d96e2cfd3f0d2
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Miikka Heikkinen
2021-10-28 15:50:11 +03:00
parent 761ce1feb1
commit dc9dc6b002
2 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/designercore/include/componenttextmodifier.h
View File

@@ -62,11 +62,14 @@ public:
{ return false; }
private:
void handleOriginalTextChanged();
TextModifier *m_originalModifier;
int m_componentStartOffset;
int m_componentEndOffset;
int m_rootStartOffset;
int m_startLength;
QString m_originalText;
};
} // namespace QmlDesigner

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

@@ -33,10 +33,13 @@ ComponentTextModifier::ComponentTextModifier(TextModifier *originalModifier, int
m_componentEndOffset(componentEndOffset),
m_rootStartOffset(rootStartOffset)
{
connect(m_originalModifier, &TextModifier::textChanged, this, &TextModifier::textChanged);
connect(m_originalModifier, &TextModifier::textChanged,
this, &ComponentTextModifier::handleOriginalTextChanged);
connect(m_originalModifier, &TextModifier::replaced, this, &TextModifier::replaced);
connect(m_originalModifier, &TextModifier::moved, this, &TextModifier::moved);
m_originalText = m_originalModifier->text();
}
ComponentTextModifier::~ComponentTextModifier() = default;
@@ -146,3 +149,45 @@ void ComponentTextModifier::reactivateChangeSignals()
{
m_originalModifier->reactivateChangeSignals();
}
void ComponentTextModifier::handleOriginalTextChanged()
{
// Update offsets when original text changes, if necessary
// Detect and adjust for removal/addition of unrelated text before the subcomponent code,
// as that can happen even without user editing the text (e.g. whitespace removal at save time)
const QString currentText = m_originalModifier->text();
if (m_originalText.left(m_componentStartOffset) != currentText.left(m_componentStartOffset)) {
// Subcomponent item id is the only reliable indicator for adjustment
const int idIndex = m_originalText.indexOf("id:", m_componentStartOffset);
if (idIndex != -1 && idIndex < m_componentEndOffset) {
int newLineIndex = m_originalText.indexOf('\n', idIndex);
if (newLineIndex != -1) {
const QString checkLine = m_originalText.mid(idIndex, newLineIndex - idIndex);
int lineIndex = currentText.indexOf(checkLine);
if (lineIndex != -1) {
// Paranoia check - This shouldn't happen except when modifying text manually,
// but it's possible something was inserted between id and start
// of the component, which would throw off the calculation, so check that
// the first line is still correct even with new offset.
const int diff = idIndex - lineIndex;
newLineIndex = m_originalText.indexOf('\n', m_componentStartOffset);
if (newLineIndex != -1) {
const QString firstLine = m_originalText.mid(m_componentStartOffset,
newLineIndex - m_componentStartOffset);
const int newStart = m_componentStartOffset - diff;
if (firstLine == currentText.mid(newStart, firstLine.size())) {
m_componentEndOffset -= diff;
m_componentStartOffset = newStart;
m_originalText = currentText;
}
}
}
}
}
}
emit textChanged();
}