From e0555207521e149a05ea846d909beff3cd1d8570 Mon Sep 17 00:00:00 2001
From: Adeel Asghar <adeel.asghar@liu.se>
Date: Thu, 22 Feb 2024 12:20:39 +0100
Subject: [PATCH] Fix handling of final modifiers of replaceable components
 (#12022)

#11964
---
 OMEdit/OMEditLIB/Element/ElementProperties.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/OMEdit/OMEditLIB/Element/ElementProperties.cpp b/OMEdit/OMEditLIB/Element/ElementProperties.cpp
index 06a385a2e6d..a2a49573c42 100644
--- a/OMEdit/OMEditLIB/Element/ElementProperties.cpp
+++ b/OMEdit/OMEditLIB/Element/ElementProperties.cpp
@@ -482,7 +482,7 @@ void Parameter::setValueWidget(QString value, bool defaultValue, QString fromUni
       signalsState = mpValueCheckBox->blockSignals(true);
       mpValueCheckBox->setChecked(value.compare("true") == 0);
       mpValueCheckBox->blockSignals(signalsState);
-      mValueCheckBoxModified = valueModified;
+      mValueCheckBoxModified = valueModified && !defaultValue;
       break;
     case Parameter::Normal:
     default:
@@ -1643,7 +1643,7 @@ void ElementParameters::fetchElementModifiers()
   if (mpElement->getModifier()) {
     foreach (auto *pModifier, mpElement->getModifier()->getModifiers()) {
       Parameter *pParameter = findParameter(pModifier->getName());
-      ElementParameters::applyFinalStartFixedAndDisplayUnitModifiers(pParameter, pModifier, mInherited || mNested, true, false);
+      ElementParameters::applyFinalStartFixedAndDisplayUnitModifiers(pParameter, pModifier, mInherited || mNested, true, mNested);
       // set final and each checkboxes in the menu
       if (pParameter && !pParameter->isShowStartAndFixed()) {
         pParameter->getFinalEachMenu()->setFinal(pModifier->isFinal());
@@ -1901,6 +1901,7 @@ void ElementParameters::updateElementParameters()
     QStringList modifiersList;
     foreach (ElementModifier elementModifier, elementModifiersList) {
       int index = elementModifier.mValue.indexOf('(');
+      bool onlyName = false;
       QString modifierStartStr;
       if (index > -1) {
         modifierStartStr = elementModifier.mValue.left(index);
@@ -1909,6 +1910,7 @@ void ElementParameters::updateElementParameters()
       QString modifierValue;
       if (elementModifier.mValue.isEmpty()) {
         modifierValue = QString(elementModifier.mKey);
+        onlyName = true;
       } else if (elementModifier.mValue.startsWith(QStringLiteral("redeclare")) || ((index > -1) && (modifierStartStr.compare(elementModifier.mKey) == 0))) {
         modifierValue = QString(elementModifier.mValue);
       } else {
@@ -1932,6 +1934,10 @@ void ElementParameters::updateElementParameters()
           modifierValue.prepend(modifier);
         }
       }
+      // skip adding empty parameter names
+      if (onlyName && modifierValue.compare(elementModifier.mKey) == 0) {
+        continue;
+      }
       modifiersList.append(modifierValue);
     }
     if (mNested) {