SONARPY-938 Deserialize typeshed imported modules from protobuf

Author: andreaguarino

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

@@ -137,7 +137,7 @@ void addOrCreateChildUsage(Name name, Usage.Kind kind) {
     ((SymbolImpl) symbol).addUsage(name, kind);
   }
 
-  void addChildSymbol(Symbol symbol) {
+  public void addChildSymbol(Symbol symbol) {
     childrenSymbolByName.put(symbol.name(), symbol);
   }
 
@@ -167,7 +167,7 @@ public void removeUsages() {
     childrenSymbolByName.values().forEach(symbol -> ((SymbolImpl) symbol).removeUsages());
   }
 
-  Map<String, Symbol> getChildrenSymbolByName() {
+  public Map<String, Symbol> getChildrenSymbolByName() {
     return Collections.unmodifiableMap(childrenSymbolByName);
   }
 

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

@@ -165,7 +165,7 @@ private static Set<Symbol> commonSymbols(Map<String, Symbol> symbolsPython2, Map
   public static Set<Symbol> symbolsForModule(String moduleName) {
     if (!TypeShed.typeShedSymbols.containsKey(moduleName)) {
       Set<Symbol> symbols = searchTypeShedForModule(moduleName);
-      Map<String, Symbol> symbolsByFqn = symbols.stream().collect(Collectors.toMap(Symbol::fullyQualifiedName, s -> s));
+      Map<String, Symbol> symbolsByFqn = symbols.stream().collect(Collectors.toMap(Symbol::fullyQualifiedName, s -> s, (fst, snd) -> fst));
       typeShedSymbols.put(moduleName, symbolsByFqn);
       return symbols;
     }
@@ -470,7 +470,13 @@ public static Set<Symbol> symbolsFromDescriptor(Set<Object> descriptors, boolean
         symbols.add(fromOverloadedFunction(((OverloadedFunctionSymbol) descriptor), isInsideClass));
       }
       if (descriptor instanceof SymbolsProtos.VarSymbol) {
-        symbols.add(new SymbolImpl((SymbolsProtos.VarSymbol) descriptor));
+        SymbolsProtos.VarSymbol varSymbol = (SymbolsProtos.VarSymbol) descriptor;
+        SymbolImpl symbol = new SymbolImpl(varSymbol);
+        if (varSymbol.getIsImportedModule()) {
+          Set<Symbol> moduleExportedSymbols = searchTypeShedForModule(varSymbol.getFullyQualifiedName());
+          moduleExportedSymbols.forEach(symbol::addChildSymbol);
+        }
+        symbols.add(symbol);
       }
     }
     return symbols;

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

@@ -193,9 +193,10 @@ public void package_inner_submodules_symbols() {
   @Test
   public void package_relative_import() {
     Map<String, Symbol> osSymbols = symbolsForModule("os");
-    // TODO: Add imported symbols SONARPY-938
-    // Symbol sysSymbol = osSymbols.get("sys");
-    // assertThat(sysSymbol.kind()).isEqualTo(Kind.AMBIGUOUS);
+    Symbol sysSymbol = osSymbols.get("sys");
+    assertThat(sysSymbol.kind()).isEqualTo(Kind.OTHER);
+    Set<String> sysExportedSymbols = symbolsForModule("sys").keySet();
+    assertThat(((SymbolImpl) sysSymbol).getChildrenSymbolByName().values()).extracting(Symbol::name).containsAll(sysExportedSymbols);
 
     Symbol timesResult = osSymbols.get("times_result");
     assertThat(timesResult.kind()).isEqualTo(Kind.CLASS);