Fix remaining StackOverflowError condition (#1039)

Author: guillaume-dequenne

python-frontend/src/main/java/org/sonar/python/index/DescriptorUtils.java

@@ -167,7 +167,7 @@ private static void addSuperClasses(ClassSymbolImpl classSymbol, ClassDescriptor
           if (createdSymbols.containsKey(superClassFqn)) {
             return createdSymbols.get(superClassFqn);
           }
-          Symbol symbol = projectLevelSymbolTable.getSymbol(superClassFqn);
+          Symbol symbol = projectLevelSymbolTable.getSymbol(superClassFqn, null, createdSymbols);
           symbol = symbol != null ? symbol : typeshedSymbolWithFQN(superClassFqn);
           createdSymbols.put(superClassFqn, symbol);
           return symbol;
@@ -188,7 +188,7 @@ private static void addParameters(FunctionSymbolImpl functionSymbol, FunctionDes
     functionDescriptor.parameters().stream().map(p -> {
       FunctionSymbolImpl.ParameterImpl parameter = new FunctionSymbolImpl.ParameterImpl(p);
       Symbol existingSymbol = createdSymbols.get(p.annotatedType());
-      Symbol typeSymbol = existingSymbol != null ? existingSymbol : projectLevelSymbolTable.getSymbol(p.annotatedType());
+      Symbol typeSymbol = existingSymbol != null ? existingSymbol : projectLevelSymbolTable.getSymbol(p.annotatedType(), null, createdSymbols);
       String annotatedTypeName = parameter.annotatedTypeName();
       if (typeSymbol == null && annotatedTypeName != null) {
         typeSymbol = typeshedSymbolWithFQN(annotatedTypeName);

python-frontend/src/main/java/org/sonar/python/semantic/ProjectLevelSymbolTable.java

@@ -50,7 +50,6 @@ public class ProjectLevelSymbolTable {
   private final Map<String, Set<Descriptor>> globalDescriptorsByModuleName;
   private Map<String, Descriptor> globalDescriptorsByFQN;
   private final Set<String> djangoViewsFQN = new HashSet<>();
-  private Set<String> queriedSymbolNames = new HashSet<>();
 
   public static ProjectLevelSymbolTable empty() {
     return new ProjectLevelSymbolTable(Collections.emptyMap());
@@ -138,24 +137,13 @@ public Symbol getSymbol(@Nullable String fullyQualifiedName) {
   }
 
   public Symbol getSymbol(@Nullable String fullyQualifiedName, @Nullable String localSymbolName) {
+    return getSymbol(fullyQualifiedName, localSymbolName, new HashMap<>());
+  }
+
+  public Symbol getSymbol(@Nullable String fullyQualifiedName, @Nullable String localSymbolName, Map<String, Symbol> createdSymbols) {
     if (fullyQualifiedName == null) return null;
-    if (queriedSymbolNames.contains(fullyQualifiedName)) {
-      // cyclic dependencies
-      queriedSymbolNames = new HashSet<>();
-      String[] fqnSplitByDot = fullyQualifiedName.split("\\.");
-      localSymbolName =  localSymbolName != null ? localSymbolName : fqnSplitByDot[fqnSplitByDot.length - 1];
-      return new SymbolImpl(localSymbolName, fullyQualifiedName);
-    }
     Descriptor descriptor = globalDescriptorsByFQN().get(fullyQualifiedName);
-    if (descriptor == null) {
-      queriedSymbolNames = new HashSet<>();
-      return null;
-    } else {
-      queriedSymbolNames.add(fullyQualifiedName);
-      Symbol symbol = DescriptorUtils.symbolFromDescriptor(descriptor, this, localSymbolName, new HashMap<>());
-      queriedSymbolNames = new HashSet<>();
-      return symbol;
-    }
+    return descriptor == null ? null : DescriptorUtils.symbolFromDescriptor(descriptor, this, localSymbolName, createdSymbols);
   }
 
   @CheckForNull

python-frontend/src/test/java/org/sonar/python/semantic/ProjectLevelSymbolTableTest.java

@@ -683,7 +683,7 @@ public void loop_in_class_inheritance() {
     ClassSymbolImpl parentOfImportedA = (ClassSymbolImpl) importedA.superClasses().iterator().next();
     assertThat(parentOfImportedA.superClasses())
       .extracting(Symbol::kind, Symbol::fullyQualifiedName)
-      .containsExactly(tuple(Symbol.Kind.OTHER, "foo.A"));
+      .containsExactly(tuple(Symbol.Kind.CLASS, "foo.A"));
   }
 
   @Test
@@ -741,6 +741,40 @@ public void class_with_method_parameter_of_same_type() {
     assertThat(declaredType.getTypeClass()).isSameAs(classSymbol);
   }
 
+  @Test
+  public void loop_in_inheritance_with_method_paraneters_of_same_type() {
+    String[] foo = {
+      "from bar import B",
+      "class A(B):",
+      "  def my_A_method(param: A): ...",
+      "  def my_A_other_method(param: B): ..."
+    };
+    String[] bar = {
+      "from foo import A",
+      "class B(A):",
+      "  def my_B_method(param: A): ...",
+      "  def my_B_other_method(param: B): ..."
+    };
+
+    ProjectLevelSymbolTable projectSymbolTable = new ProjectLevelSymbolTable();
+    projectSymbolTable.addModule(parseWithoutSymbols(foo), "", pythonFile("foo.py"));
+    projectSymbolTable.addModule(parseWithoutSymbols(bar), "", pythonFile("bar.py"));
+
+    Set<Symbol> fooSymbols = projectSymbolTable.getSymbolsFromModule("foo");
+    ClassSymbol classSymbolA = (ClassSymbol) fooSymbols.stream().filter(s -> s.fullyQualifiedName().equals("foo.A")).findFirst().get();
+    ClassSymbol classSymbolB = (ClassSymbol) classSymbolA.superClasses().get(0);
+
+    assertThat(classSymbolB.superClasses()).containsExactly(classSymbolA);
+    assertThat(classSymbolA.declaredMembers().stream()
+      .map(FunctionSymbol.class::cast)
+      .flatMap(f -> f.parameters().stream()
+        .map(FunctionSymbol.Parameter::declaredType)
+        .map(DeclaredType.class::cast))
+      .collect(Collectors.toList()))
+      .extracting(DeclaredType::getTypeClass)
+      .containsExactlyInAnyOrder(classSymbolA, classSymbolB);
+  }
+
   @Test
   public void django_views() {
     String[] urls = {