Skip to content

Commit 2576279

Browse files
authored
Show the loaded classes with auto-complete (#12154)
Fixes #12152
1 parent 8c898aa commit 2576279

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

OMEdit/OMEditLIB/Editors/ModelicaEditor.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,7 @@ QList<LibraryTreeItem*> ModelicaEditor::getCandidateContexts(QStringList nameCom
155155
QList<LibraryTreeItem*> roots;
156156
LibraryTreeItem *pItem = getModelWidget()->getLibraryTreeItem();
157157
while (pItem) {
158-
if (!pItem->isRootItem()) {
159-
roots.append(pItem->getInheritedClassesDeepList());
160-
}
158+
roots.append(pItem->getInheritedClassesDeepList());
161159
pItem = pItem->parent();
162160
}
163161

OMEdit/OMEditLIB/Modeling/LibraryTreeWidget.cpp

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -702,17 +702,19 @@ const QList<LibraryTreeItem*> &LibraryTreeItem::getInheritedClasses()
702702
} else {
703703
if (!mInheritedClassesLoaded) {
704704
mInheritedClasses.clear();
705-
// get the inherited classes of the class
706-
QList<QString> inheritedClasses = MainWindow::instance()->getOMCProxy()->getInheritedClasses(getNameStructure());
707-
foreach (QString inheritedClass, inheritedClasses) {
708-
/* If the inherited class is one of the builtin type such as Real we can
709-
* stop here, because the class cannot contain any classes, etc.
710-
* Also check for cyclic loops.
711-
*/
712-
if (!(MainWindow::instance()->getOMCProxy()->isBuiltinType(inheritedClass) || inheritedClass.compare(getNameStructure()) == 0)) {
713-
LibraryTreeItem *pInheritedLibraryTreeItem = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->findLibraryTreeItem(inheritedClass);
714-
if (pInheritedLibraryTreeItem) {
715-
mInheritedClasses.append(pInheritedLibraryTreeItem);
705+
if (!isRootItem()) {
706+
// get the inherited classes of the class
707+
QList<QString> inheritedClasses = MainWindow::instance()->getOMCProxy()->getInheritedClasses(getNameStructure());
708+
foreach (QString inheritedClass, inheritedClasses) {
709+
/* If the inherited class is one of the builtin type such as Real we can
710+
* stop here, because the class cannot contain any classes, etc.
711+
* Also check for cyclic loops.
712+
*/
713+
if (!(MainWindow::instance()->getOMCProxy()->isBuiltinType(inheritedClass) || inheritedClass.compare(getNameStructure()) == 0)) {
714+
LibraryTreeItem *pInheritedLibraryTreeItem = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->findLibraryTreeItem(inheritedClass);
715+
if (pInheritedLibraryTreeItem) {
716+
mInheritedClasses.append(pInheritedLibraryTreeItem);
717+
}
716718
}
717719
}
718720
}

0 commit comments

Comments
 (0)