SONARPY-954 Typeshed symbols retrieved by FQN should be consistent (#1034)

Author: andrea-guarino-sonarsource

python-frontend/src/main/java/org/sonar/python/types/TypeShed.java

@@ -187,6 +187,7 @@ public static Symbol symbolWithFQN(String stdLibModuleName, String fullyQualifie
     String[] fqnSplittedByDot = fullyQualifiedName.split("\\.");
     String symbolLocalNameFromFqn = fqnSplittedByDot[fqnSplittedByDot.length - 1];
 
+    // TODO: improve performance - see SONARPY-955
     Set<Symbol> matchByName = symbols.stream().filter(s -> symbolLocalNameFromFqn.equals(s.name())).collect(Collectors.toSet());
     if (matchByName.size() == 1) {
       return matchByName.iterator().next();
@@ -477,19 +478,9 @@ public static Symbol symbolWithFQN(String fullyQualifiedName) {
     if (builtinSymbol != null) {
       return builtinSymbol;
     }
-    for (Map<String, Symbol> symbolsByFqn : typeShedSymbols.values()) {
-      Symbol symbol = symbolsByFqn.get(fullyQualifiedName);
-      if (symbol != null) {
-        return symbol;
-      }
-    }
     String[] fqnSplittedByDot = fullyQualifiedName.split("\\.");
     String moduleName = Arrays.stream(fqnSplittedByDot, 0, fqnSplittedByDot.length - 1).collect(Collectors.joining("."));
-    Set<Symbol> symbols = symbolsForModule(moduleName);
-    if (!symbols.isEmpty()) {
-      return typeShedSymbols.get(moduleName).get(fullyQualifiedName);
-    }
-    return null;
+    return symbolWithFQN(moduleName, fullyQualifiedName);
   }
 
   public static String normalizedFqn(String fqn) {

python-frontend/src/test/java/org/sonar/python/types/TypeShedTest.java

@@ -448,6 +448,16 @@ public void pythonVersions() {
     setPythonVersions(PythonVersionUtils.allVersions());
   }
 
+  @Test
+  public void symbolWithFQN_should_be_consistent() {
+    // smtplib imports typing.Sequence only in Python3, hence typing.Sequence has kind CLASS
+    TypeShed.symbolsForModule("smtplib");
+    Symbol sequence = TypeShed.symbolWithFQN("typing.Sequence");
+    assertThat(sequence.kind()).isEqualTo(Kind.AMBIGUOUS);
+    Map<String, Symbol> typing = TypeShed.symbolsForModule("typing").stream().collect(Collectors.toMap(Symbol::name, Function.identity()));
+    assertThat(sequence).isSameAs(typing.get("Sequence"));
+  }
+
   private static SymbolsProtos.ModuleSymbol moduleSymbol(String protobuf) throws TextFormat.ParseException {
     SymbolsProtos.ModuleSymbol.Builder builder = SymbolsProtos.ModuleSymbol.newBuilder();
     TextFormat.merge(protobuf, builder);