Cherry pick fixes for 1.25.2 (#14235)

perost · web-flow · commit 2bab289147e2 · 2025-08-22T11:40:04.000+02:00
* Avoid dangerous Element->getModel()->isConnector() (#14180) - Fix missing checks for if an elements model exists before trying to use it by adding `Element::isConnector` and using that instead of `Element->getModel()->isConnector()`. * Fix URL for OMSimulator documentation in OMEdit (#14175) * Fix copyClass (#14222) - Rewrite `AbsynUtil.pathStripSamePrefix` to return an option, to be able to handle the case where the whole path is a prefix. - Fix NFApi.updateMovedPath/Cref to skip prefixing the path when the whole qualified path is a prefix.
diff --git a/OMCompiler/Compiler/FrontEnd/AbsynUtil.mo b/OMCompiler/Compiler/FrontEnd/AbsynUtil.mo
@@ -1539,19 +1539,28 @@ public function pathStripSamePrefix
   "strips the same prefix paths and returns the stripped path. e.g pathStripSamePrefix(P.M.A, P.M.B) => A"
   input Absyn.Path inPath1;
   input Absyn.Path inPath2;
-  output Absyn.Path outPath = inPath1;
+  output Option<Absyn.Path> outPath;
 protected
-  Absyn.Path path2 = inPath2;
+  Absyn.Path path1 = inPath1, path2 = inPath2;
 algorithm
-  while pathFirstIdent(outPath) == pathFirstIdent(path2) loop
-    outPath := pathRest(outPath);
+  while pathFirstIdent(path1) == pathFirstIdent(path2) loop
+    if pathIsIdent(path1) then
+      // The whole first path is a prefix of the second.
+      outPath := NONE();
+      return;
+    end if;
+
+    path1 := pathRest(path1);
 
     if pathIsIdent(path2) then
-      return;
+      // The whole second path is a prefix of the first.
+      break;
     end if;
 
     path2 := pathRest(path2);
   end while;
+
+  outPath := SOME(path1);
 end pathStripSamePrefix;
 
 public function pathPrefix
diff --git a/OMCompiler/Compiler/Script/Interactive.mo b/OMCompiler/Compiler/Script/Interactive.mo
@@ -5451,7 +5451,7 @@ algorithm
     modification := InteractiveUtil.makeModifierFromArgs(bindingExp, modifier, info);
     (io, redecl, attr) := getDefaultPrefixes(program, typeName);
 
-    ty_path := AbsynUtil.pathStripSamePrefix(typeName, classPath);
+    SOME(ty_path) := AbsynUtil.pathStripSamePrefix(typeName, classPath);
 
     if AbsynUtil.pathContains(classPath, AbsynUtil.pathFirstIdent(ty_path)) then
       // Keep the full type name if the first identifier of the stripped name
diff --git a/OMCompiler/Compiler/Script/NFApi.mo b/OMCompiler/Compiler/Script/NFApi.mo
@@ -2724,6 +2724,7 @@ function updateMovedPath
   input MoveEnv env;
 protected
   Absyn.Path qualified_path;
+  Option<Absyn.Path> opt_path;
 algorithm
   // Try to look up the qualified path needed to be able to find the name in
   // this scope even if the root class that contains the scope is moved elsewhere.
@@ -2742,10 +2743,16 @@ algorithm
     if AbsynUtil.pathIsQual(qualified_path) then
       // If the path is qualified it needs to be joined with the original path,
       // but we remove any part of the path that's the same as the destination.
-      qualified_path := AbsynUtil.pathStripSamePrefix(qualified_path, env.destinationPath);
+      opt_path := AbsynUtil.pathStripSamePrefix(qualified_path, env.destinationPath);
 
-      if AbsynUtil.pathIsQual(qualified_path) then
-        path := AbsynUtil.joinPaths(AbsynUtil.pathPrefix(qualified_path), path);
+      if isSome(opt_path) then
+        SOME(qualified_path) := opt_path;
+
+        if AbsynUtil.pathIsQual(qualified_path) then
+          path := AbsynUtil.joinPaths(AbsynUtil.pathPrefix(qualified_path), path);
+        end if;
+      else
+        fail();
       end if;
     elseif AbsynUtil.pathFirstIdent(qualified_path) == AbsynUtil.pathFirstIdent(env.destinationPath) then
       // Special case, the path refers to the destination package, e.g. moving path A.B.C into A.
@@ -2834,6 +2841,7 @@ function updateMovedCref
   input MoveEnv env;
 protected
   Absyn.Path qualified_path;
+  Option<Absyn.Path> opt_path;
 algorithm
   if AbsynUtil.crefIsFullyQualified(cref) or AbsynUtil.crefIsWild(cref) then
     return;
@@ -2856,10 +2864,14 @@ algorithm
     if AbsynUtil.pathIsQual(qualified_path) then
       // If the path is qualified it needs to be joined with the original cref,
       // but we remove any part of the path that's the same as the destination.
-      qualified_path := AbsynUtil.pathStripSamePrefix(qualified_path, env.destinationPath);
+      opt_path := AbsynUtil.pathStripSamePrefix(qualified_path, env.destinationPath);
+
+      if isSome(opt_path) then
+        SOME(qualified_path) := opt_path;
 
-      if AbsynUtil.pathIsQual(qualified_path) then
-        cref := AbsynUtil.joinCrefs(AbsynUtil.pathToCref(AbsynUtil.pathPrefix(qualified_path)), cref);
+        if AbsynUtil.pathIsQual(qualified_path) then
+          cref := AbsynUtil.joinCrefs(AbsynUtil.pathToCref(AbsynUtil.pathPrefix(qualified_path)), cref);
+        end if;
       end if;
     elseif AbsynUtil.pathFirstIdent(qualified_path) == AbsynUtil.pathFirstIdent(env.destinationPath) then
       // Special case, the cref refers to the destination package, e.g. moving path A.B.C into A.
diff --git a/OMEdit/OMEditLIB/Annotations/LineAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/LineAnnotation.cpp
@@ -1411,7 +1411,7 @@ void LineAnnotation::handleCollidingConnections()
   QList<QGraphicsItem*> items = collidingItems(Qt::IntersectsItemShape);
   for (int i = 0; i < items.size(); ++i) {
     if (Element *pElement = dynamic_cast<Element*>(items.at(i))) {
-      if ((pElement->getModel() && pElement->getModel()->isConnector())
+      if (pElement->isConnector()
           || (pElement->getLibraryTreeItem() && (pElement->getLibraryTreeItem()->getOMSConnector() || pElement->getLibraryTreeItem()->getOMSBusConnector()
                                                  || pElement->getLibraryTreeItem()->getOMSTLMBusConnector()))) {
         mCollidingConnectorElements.append(pElement);
diff --git a/OMEdit/OMEditLIB/Element/Element.cpp b/OMEdit/OMEditLIB/Element/Element.cpp
@@ -401,7 +401,7 @@ QRectF Element::boundingRect() const
   } else if (isPort()) {
     ExtentAnnotation extent;
     if (mpModelComponent) {
-      if (mpModelComponent->getModel()->isConnector() && (mpGraphicsView->isDiagramView()) && canUseDiagramAnnotation()) {
+      if (mpModelComponent->isConnector() && (mpGraphicsView->isDiagramView()) && canUseDiagramAnnotation()) {
         mpModelComponent->getAnnotation()->getPlacementAnnotation().getTransformation().getExtent();
       } else {
         mpModelComponent->getAnnotation()->getPlacementAnnotation().getIconTransformation().getExtent();
@@ -557,7 +557,7 @@ ModelInstance::CoordinateSystem Element::getCoordinateSystem() const
 {
   ModelInstance::CoordinateSystem coordinateSystem;
   if (mpModelComponent && mpModel) {
-    if (mpModelComponent->getModel()->isConnector() && (mpGraphicsView->isDiagramView()) && canUseDiagramAnnotation()) {
+    if (mpModelComponent->isConnector() && (mpGraphicsView->isDiagramView()) && canUseDiagramAnnotation()) {
       coordinateSystem = mpModel->getAnnotation()->getDiagramAnnotation()->mMergedCoordinateSystem;
     } else {
       coordinateSystem = mpModel->getAnnotation()->getIconAnnotation()->mMergedCoordinateSystem;
@@ -626,7 +626,7 @@ QString Element::getPlacementAnnotation(bool ModelicaSyntax)
       placementAnnotationString.append(QString("visible=%1,").arg(mTransformation.getVisible().toQString()));
     }
   }
-  if ((mpLibraryTreeItem && mpLibraryTreeItem->isConnector()) || (mpModelComponent && mpModelComponent->getModel()->isConnector())) {
+  if ((mpLibraryTreeItem && mpLibraryTreeItem->isConnector()) || (mpModelComponent && mpModelComponent->isConnector())) {
     if (mpGraphicsView->isIconView()) {
       // first get the component from diagram view and get the transformations
       Element *pElement = mpGraphicsView->getModelWidget()->getDiagramGraphicsView()->getElementObject(getName());
@@ -692,7 +692,7 @@ QString Element::getOMCPlacementAnnotation(QPointF position)
   if (mTransformation.isValid()) {
     placementAnnotationString.append(mTransformation.getVisible() ? "true" : "false");
   }
-  if ((mpLibraryTreeItem && mpLibraryTreeItem->isConnector()) || (mpModelComponent && mpModelComponent->getModel()->isConnector())) {
+  if ((mpLibraryTreeItem && mpLibraryTreeItem->isConnector()) || (mpModelComponent && mpModelComponent->isConnector())) {
     if (mpGraphicsView->isIconView()) {
       // first get the component from diagram view and get the transformations
       Element *pElement;
@@ -746,6 +746,16 @@ QString Element::getTransformationExtent()
   return transformationExtent;
 }
 
+/*!
+ * \brief Element::isConnector
+ * Returns true if the Element class is connector.
+ * \return
+ */
+bool Element::isConnector() const
+{
+  return mpModel && mpModel->isConnector();
+}
+
 /*!
  * \brief Element::isExpandableConnector
  * Returns true if the Element class is expandable connector.
@@ -891,7 +901,7 @@ void Element::createClassElements()
     foreach (auto pElement, elements) {
       if (pElement->isComponent()) {
         auto pComponent = dynamic_cast<ModelInstance::Component*>(pElement);
-        if (pComponent->isPublic() && pComponent->getModel() && pComponent->getModel()->isConnector()) {
+        if (pComponent->isPublic() && pComponent->isConnector()) {
           mElementsList.append(new Element(pComponent, this, getRootParentElement()));
         }
       }
@@ -1617,11 +1627,11 @@ void Element::createClassShapes()
     // Always use the IconMap here. Only IconMap makes sense for drawing icons of Element.
     if (!(pExtendModel && !pExtendModel->getIconDiagramMapPrimitivesVisible(true))) {
       /* issue #12074
-       * Use mpModelComponent->getModel()->isConnector() here instead of mpModel->isConnector()
+       * Use mpModelComponent->isConnector() here instead of mpModel->isConnector()
        * So when called for extends we use the top level element restriction.
        * We use the same mpModelComponent for top level and extends elements. See Element constructor above for extends element type.
        */
-      if (mpModelComponent && mpModelComponent->getModel()->isConnector() && mpGraphicsView->isDiagramView() && canUseDiagramAnnotation()) {
+      if (mpModelComponent && mpModelComponent->isConnector() && mpGraphicsView->isDiagramView() && canUseDiagramAnnotation()) {
         shapes = mpModel->getAnnotation()->getDiagramAnnotation()->getGraphics();
       } else {
         shapes = mpModel->getAnnotation()->getIconAnnotation()->getGraphics();
diff --git a/OMEdit/OMEditLIB/Element/Element.h b/OMEdit/OMEditLIB/Element/Element.h
@@ -159,6 +159,7 @@ class Element : public QObject, public QGraphicsItem
   QString getOMCPlacementAnnotation(QPointF position);
   QString getTransformationOrigin();
   QString getTransformationExtent();
+  bool isConnector() const;
   bool isExpandableConnector() const;
   bool isArray() const;
   QStringList getAbsynArrayIndexes() const;
diff --git a/OMEdit/OMEditLIB/MainWindow.cpp b/OMEdit/OMEditLIB/MainWindow.cpp
@@ -3073,7 +3073,7 @@ void MainWindow::openModelicaDocumentation()
  */
 void MainWindow::openOMSimulatorUsersGuide()
 {
-  QUrl OMSimulatorUsersGuideUrl("https://openmodelica.org/doc/OMSimulator/master/html/");
+  QUrl OMSimulatorUsersGuideUrl("https://openmodelica.org/doc/OMSimulator/master/OMSimulator/UsersGuide/html/");
   QDesktopServices::openUrl(OMSimulatorUsersGuideUrl);
 }
 
diff --git a/OMEdit/OMEditLIB/Modeling/Commands.cpp b/OMEdit/OMEditLIB/Modeling/Commands.cpp
@@ -234,7 +234,7 @@ void UpdateComponentTransformationsCommand::redoInternal()
 {
   ModelWidget *pModelWidget = mpComponent->getGraphicsView()->getModelWidget();
   if (mMoveConnectorsTogether && pModelWidget->getLibraryTreeItem()->isModelica()
-      && (mpComponent->getModel() && mpComponent->getModel()->isConnector())) {
+      && mpComponent->isConnector()) {
     GraphicsView *pGraphicsView;
     if (mpComponent->getGraphicsView()->isIconView()) {
       pGraphicsView = pModelWidget->getDiagramGraphicsView();
@@ -274,8 +274,7 @@ void UpdateComponentTransformationsCommand::redoInternal()
 void UpdateComponentTransformationsCommand::undo()
 {
   ModelWidget *pModelWidget = mpComponent->getGraphicsView()->getModelWidget();
-  if (mMoveConnectorsTogether && pModelWidget->getLibraryTreeItem()->isModelica()
-      && (mpComponent->getModel() && mpComponent->getModel()->isConnector())) {
+  if (mMoveConnectorsTogether && pModelWidget->getLibraryTreeItem()->isModelica() && mpComponent->isConnector()) {
     GraphicsView *pGraphicsView;
     if (mpComponent->getGraphicsView()->isIconView()) {
       pGraphicsView = pModelWidget->getDiagramGraphicsView();
diff --git a/OMEdit/OMEditLIB/Modeling/Model.cpp b/OMEdit/OMEditLIB/Modeling/Model.cpp
@@ -1514,7 +1514,7 @@ namespace ModelInstance
     if (connector.size() == 1) return true;
 
     auto elem = model.lookupElement(connector.first().getName(false));
-    return elem && elem->getModel() && elem->getModel()->isConnector();
+    return elem && elem->isConnector();
   }
 
   bool isCompatibleConnectorDirection(const Element &lhs, bool lhsOutside, const Element &rhs, bool rhsOutside)
@@ -2069,6 +2069,16 @@ namespace ModelInstance
     return mpPrefixes ? mpPrefixes.get()->isRedeclare() : false;
   }
 
+  bool Element::isConnector() const
+  {
+    return mpModel && mpModel->isConnector();
+  }
+
+  bool Element::isExpandableConnector() const
+  {
+    return mpModel && mpModel->isExpandableConnector();
+  }
+
   QString Element::getConnector() const
   {
     return mpPrefixes ? mpPrefixes.get()->getConnector() : "";
diff --git a/OMEdit/OMEditLIB/Modeling/Model.h b/OMEdit/OMEditLIB/Modeling/Model.h
@@ -694,6 +694,8 @@ namespace ModelInstance
     bool isOuter() const;
     Replaceable *getReplaceable() const;
     bool isRedeclare() const;
+    bool isConnector() const;
+    bool isExpandableConnector() const;
     QString getConnector() const;
     QString getVariability() const;
     QString getDirectionPrefix() const;
diff --git a/OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.cpp
@@ -370,7 +370,7 @@ void GraphicsView::drawElements(ModelInstance::Model *pModelInstance, bool inher
       if (pModelInstanceElement->isComponent() && pModelInstanceElement->getModel()) {
         auto pModelInstanceComponent = dynamic_cast<ModelInstance::Component*>(pModelInstanceElement);
         elementIndex++;
-        if (pModelInstanceComponent->getModel()->isConnector()) {
+        if (pModelInstanceComponent->isConnector()) {
           connectorIndex++;
         }
         if (modelInfo.mDiagramElementsList.isEmpty() || inherited) {
@@ -386,7 +386,7 @@ void GraphicsView::drawElements(ModelInstance::Model *pModelInstance, bool inher
               pDiagramGraphicsView->addElementItem(pDiagramElement);
               pDiagramGraphicsView->addElementToList(pDiagramElement);
               pDiagramGraphicsView->deleteElementFromOutOfSceneList(pDiagramElement);
-              if (pModelInstanceComponent->getModel()->isConnector() && connectorIndex < modelInfo.mIconElementsList.size()) {
+              if (pModelInstanceComponent->isConnector() && connectorIndex < modelInfo.mIconElementsList.size()) {
                 Element *pIconElement = modelInfo.mIconElementsList.at(connectorIndex);
                 if (pIconElement) {
                   pIconElement->setModelComponent(pModelInstanceComponent);
@@ -938,14 +938,14 @@ void GraphicsView::addElementToView(ModelInstance::Component *pComponent, bool i
   GraphicsView *pDiagramGraphicsView = mpModelWidget->getDiagramGraphicsView();
 
   // if element is of connector type.
-  if (pComponent && pComponent->getModel()->isConnector()) {
+  if (pComponent && pComponent->isConnector()) {
     // Connector type elements exists on icon view as well
     pIconElement = new Element(pComponent, inherited, pIconGraphicsView, createTransformation, position, placementAnnotation);
   }
   pDiagramElement = new Element(pComponent, inherited, pDiagramGraphicsView, createTransformation, position, placementAnnotation);
 
   // if element is of connector type && containing class is Modelica type.
-  if (pIconElement && pComponent->getModel()->isConnector()) {
+  if (pIconElement && pComponent->isConnector()) {
     // Connector type elements exists on icon view as well
     if (pIconElement->mTransformation.isValid() && pIconElement->mTransformation.getVisible()) {
       pIconGraphicsView->addElementItem(pIconElement);
@@ -1120,7 +1120,7 @@ void GraphicsView::deleteElement(Element *pElement)
   if (mpModelWidget->getLibraryTreeItem()->isSSP()) {
     OMSProxy::instance()->omsDelete(pElement->getLibraryTreeItem()->getNameStructure());
   } else {
-    if (pElement->getModel() && pElement->getModel()->isConnector()) {
+    if (pElement->isConnector()) {
       GraphicsView *pGraphicsView;
       if (isIconView()) {
         pGraphicsView = mpModelWidget->getDiagramGraphicsView();
@@ -3113,12 +3113,12 @@ Element* GraphicsView::connectorElementAtPosition(QPoint position)
         return 0;
       } else if (pRootElement && !pRootElement->isSelected()) {
         // Issue #11310. If both root and element are connectors then use the root.
-        if (pRootElement->getModel() && pRootElement->getModel()->isConnector() && pElement && pElement->getModel() && pElement->getModel()->isConnector()) {
+        if (pRootElement->isConnector() && pElement && pElement->isConnector()) {
           pElement = pRootElement;
         }
         if (MainWindow::instance()->getConnectModeAction()->isChecked() && isDiagramView() &&
             !(mpModelWidget->getLibraryTreeItem()->isSystemLibrary() || mpModelWidget->isElementMode() || isVisualizationView()) &&
-            ((pElement->getModel() && pElement->getModel()->isConnector()) ||
+            (pElement->isConnector() ||
              (mpModelWidget->getLibraryTreeItem()->isSSP() &&
               (pElement->getLibraryTreeItem()->getOMSConnector() || pElement->getLibraryTreeItem()->getOMSBusConnector()
                || pElement->getLibraryTreeItem()->getOMSTLMBusConnector() || pElement->isPort())))) {
@@ -3640,7 +3640,7 @@ void GraphicsView::copyItems(bool cut)
           QJsonObject componentJsonObject;
           componentJsonObject.insert(QLatin1String("classname"), pElement->getClassName());
           componentJsonObject.insert(QLatin1String("name"), pElement->getName());
-          componentJsonObject.insert(QLatin1String("connector"), pElement->getModel() ? pElement->getModel()->isConnector() : false);
+          componentJsonObject.insert(QLatin1String("connector"), pElement->isConnector());
           componentJsonObject.insert(QLatin1String("placement"), pElement->getOMCPlacementAnnotation(QPointF(0, 0)));
           componentsJsonArray.append(componentJsonObject);
         } else if (ShapeAnnotation *pShapeAnnotation = dynamic_cast<ShapeAnnotation*>(itemsList.at(i))) {
@@ -7018,7 +7018,7 @@ void ModelWidget::selectDeselectElement(const QString &name, bool selected)
       pDiagramElement->setIgnoreSelection(true);
       pDiagramElement->setSelected(selected);
       pDiagramElement->setIgnoreSelection(false);
-      if (mpIconGraphicsView && pDiagramElement->getModel() && pDiagramElement->getModel()->isConnector()) {
+      if (mpIconGraphicsView && pDiagramElement->isConnector()) {
         Element *pIconElement = mpIconGraphicsView->getElementObjectFromQualifiedName(name);
         pIconElement->setIgnoreSelection(true);
         pIconElement->setSelected(selected);

Original file line number	Diff line number	Diff line change
`@@ -3073,7 +3073,7 @@ void MainWindow::openModelicaDocumentation()`
`3073`	`3073`	`*/`
`3074`	`3074`	`void MainWindow::openOMSimulatorUsersGuide()`
`3075`	`3075`	`{`
`3076`		`- QUrl OMSimulatorUsersGuideUrl("https://openmodelica.org/doc/OMSimulator/master/html/");`
	`3076`	`+ QUrl OMSimulatorUsersGuideUrl("https://openmodelica.org/doc/OMSimulator/master/OMSimulator/UsersGuide/html/");`
`3077`	`3077`	`QDesktopServices::openUrl(OMSimulatorUsersGuideUrl);`
`3078`	`3078`	`}`
`3079`	`3079`