Intern classes won't be displayed as superclasses in stub files

Safe-DS · Mar 4, 2024 · ccf5a12 · ccf5a12
1 parent bc9309c
commit ccf5a12
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 27 deletions.
diff --git a/src/safeds_stubgen/stubs_generator/_generate_stubs.py b/src/safeds_stubgen/stubs_generator/_generate_stubs.py
@@ -259,15 +259,20 @@ def _create_class_string(self, class_: Class, class_indentation: str = "") -> st
             superclass_names = []
             for superclass in superclasses:
                 superclass_name = superclass.split(".")[-1]
-                superclass_names.append(superclass_name)
                 self._add_to_imports(superclass)
 
-                # If the superclass was not added to the module_imports through the _add_to_imports method, it means
-                # that the superclass is a class from the same module.
-                # For internal superclasses, we have to add their public members to subclasses.
-                superclass_methods_text += self._create_internal_class_methods_string(superclass, inner_indentations)
+                if superclass not in self.module_imports and is_internal(superclass_name):
+                    # If the superclass was not added to the module_imports through the _add_to_imports method, it means
+                    # that the superclass is a class from the same module.
+                    # For internal superclasses, we have to add their public members to subclasses.
+                    superclass_methods_text += self._create_internal_class_methods_string(
+                        superclass=superclass,
+                        inner_indentations=inner_indentations
+                    )
+                else:
+                    superclass_names.append(superclass_name)
 
-            superclass_info = f" sub {', '.join(superclass_names)}"
+            superclass_info = f" sub {', '.join(superclass_names)}" if superclass_names else ""
 
         if len(superclasses) > 1:
             self._current_todo_msgs.add("multiple_inheritance")
@@ -761,25 +766,22 @@ def _create_type_string(self, type_data: dict | None) -> str:
         raise ValueError(f"Unexpected type: {kind}")  # pragma: no cover
 
     def _create_internal_class_methods_string(self, superclass: str, inner_indentations: str) -> str:
-        superclass_methods_text = ""
         superclass_name = superclass.split(".")[-1]
-        superclass_class = None
-        if superclass not in self.module_imports and is_internal(superclass_name):
-            superclass_class = self._get_class_in_module(superclass_name)
-            superclass_methods_text = self._create_class_method_string(
-                superclass_class.methods,
-                inner_indentations,
-                is_internal_class=True,
-            )
 
-        if superclass_class is not None:
-            for superclass_superclass in superclass_class.superclasses:
-                name = superclass_superclass.split(".")[-1]
-                if is_internal(name):
-                    superclass_methods_text += self._create_internal_class_methods_string(
-                        superclass_superclass,
-                        inner_indentations,
-                    )
+        superclass_class = self._get_class_in_module(superclass_name)
+        superclass_methods_text = self._create_class_method_string(
+            superclass_class.methods,
+            inner_indentations,
+            is_internal_class=True,
+        )
+
+        for superclass_superclass in superclass_class.superclasses:
+            name = superclass_superclass.split(".")[-1]
+            if is_internal(name):
+                superclass_methods_text += self._create_internal_class_methods_string(
+                    superclass_superclass,
+                    inner_indentations,
+                )
 
         return superclass_methods_text
 

diff --git a/.../test_generate_stubs/TestStubFileGeneration.test_stub_creation[aliasing_module_1].sdsstub b/.../test_generate_stubs/TestStubFileGeneration.test_stub_creation[aliasing_module_1].sdsstub
@@ -6,7 +6,7 @@ from variousModulesPackage.aliasing.aliasingModule3 import ImportMeAliasingModul
 
 class AliasingModuleClassB()
 
-class AliasingModuleClassC() sub _AliasingModuleClassA {
+class AliasingModuleClassC() {
 	@PythonName("typed_alias_attr")
 	static attr typedAliasAttr: AliasingModuleClassB
 	// TODO An internal class must not be used as a type in a public class.

diff --git a/...test_generate_stubs/TestStubFileGeneration.test_stub_creation[inheritance_module].sdsstub b/...test_generate_stubs/TestStubFileGeneration.test_stub_creation[inheritance_module].sdsstub
@@ -9,7 +9,7 @@ class PublicSuperClass() {
 
 class PublicSubClass() sub PublicSuperClass
 
-class PublicSubClass2() sub _PrivateInternalClass {
+class PublicSubClass2() {
 	@Pure
 	@PythonName("public_internal_class_method")
 	fun publicInternalClassMethod(
@@ -21,15 +21,15 @@ class PublicSubClass2() sub _PrivateInternalClass {
 	fun publicSubclassMethod() -> result1: String
 }
 
-class PublicSubClassFromNested() sub _PrivateInternalNestedClass {
+class PublicSubClassFromNested() {
 	@Pure
 	@PythonName("public_internal_nested_class_method")
 	fun publicInternalNestedClassMethod(
 		a: Nothing?
 	) -> result1: Boolean
 }
 
-class InheritTransitively() sub _TransitiveInternalClassB {
+class InheritTransitively() {
 	@Pure
 	@PythonName("transitive_class_fun")
 	fun transitiveClassFun(