[CORRECTIVE] Fix replacing selected text in expression

hagantsa · hagantsa · commit 448ec2b7ad0f · 2026-06-17T16:59:09.000+03:00
diff --git a/editors/ComponentEditor/common/MasterExpressionEditor.cpp b/editors/ComponentEditor/common/MasterExpressionEditor.cpp
@@ -497,7 +497,9 @@ void MasterExpressionEditor::replaceSelectionInExpression(QKeyEvent* keyEvent)
 
     int firstTermPos = indexOfNthWord(firstWord, expression_);
     expression_.remove(expression_.indexOf(selectedText, firstTermPos), selectedText.length());
-    expression_.insert(getSelectionStartIndex(), keyEvent->text()); // Don't just remove selection, also insert whatever was typed.
+
+    // Replace selected text at correct position in raw expression with whatever was typed.
+    expression_.insert(indexOfNthWord(firstWord, expression_), keyEvent->text());
 }
 
 //-----------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,9 @@ void MasterExpressionEditor::replaceSelectionInExpression(QKeyEvent* keyEvent)`
`497`	`497`
`498`	`498`	`int firstTermPos = indexOfNthWord(firstWord, expression_);`
`499`	`499`	`expression_.remove(expression_.indexOf(selectedText, firstTermPos), selectedText.length());`
`500`		`- expression_.insert(getSelectionStartIndex(), keyEvent->text()); // Don't just remove selection, also insert whatever was typed.`
	`500`	`+`
	`501`	`+ // Replace selected text at correct position in raw expression with whatever was typed.`
	`502`	`+ expression_.insert(indexOfNthWord(firstWord, expression_), keyEvent->text());`
`501`	`503`	`}`
`502`	`504`
`503`	`505`	`//-----------------------------------------------------------------------------`