Fixes #3698. Don't try to merge AST just replace it.

OpenModelica · Feb 20, 2016 · c5333e1 · c5333e1
1 parent ab3521f
commit c5333e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/OMEdit/OMEditGUI/Editors/ModelicaTextEditor.cpp b/OMEdit/OMEditGUI/Editors/ModelicaTextEditor.cpp
@@ -154,7 +154,7 @@ QStringList ModelicaTextEditor::getClassNames(QString *errorString)
     if (!modelicaText.startsWith("within")) {
       stringToParse = QString("within %1;%2").arg(pLibraryTreeItem->parent()->getNameStructure()).arg(modelicaText);
     }
-    classNames = pOMCProxy->parseString(stringToParse, pLibraryTreeItem->getNameStructure());
+    classNames = pOMCProxy->parseString(stringToParse, pLibraryTreeItem->getFileName());
   }
   // if user is defining multiple top level classes.
   if (classNames.size() > 1) {

diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -2781,12 +2781,12 @@ bool ModelWidget::modelicaEditorTextChanged()
   LibraryTreeItem *pParentLibraryTreeItem= mpModelWidgetContainer->getMainWindow()->getLibraryWidget()->getLibraryTreeModel()->getContainingFileParentLibraryTreeItem(mpLibraryTreeItem);
   if (pParentLibraryTreeItem != mpLibraryTreeItem) {
     stringToLoad = mpLibraryTreeItem->getClassTextBefore() + modelicaText + mpLibraryTreeItem->getClassTextAfter();
-    if (!pOMCProxy->loadString(stringToLoad, pParentLibraryTreeItem->getFileName(), Helper::utf8, true)) {
+    if (!pOMCProxy->loadString(stringToLoad, pParentLibraryTreeItem->getFileName(), Helper::utf8, false, true)) {
       return false;
     }
   } else {
     stringToLoad = modelicaText;
-    if (!pOMCProxy->loadString(stringToLoad, mpLibraryTreeItem->getFileName(), Helper::utf8, true)) {
+    if (!pOMCProxy->loadString(stringToLoad, mpLibraryTreeItem->getFileName(), Helper::utf8, false, true)) {
       return false;
     }
   }