Fixed FQN bug with aliasing

sallaigy · andrea-guarino-sonarsource · commit f820a1d8c889 · 2020-03-16T15:07:35.000+01:00
diff --git a/python-frontend/src/main/java/org/sonar/python/semantic/SymbolTableBuilder.java b/python-frontend/src/main/java/org/sonar/python/semantic/SymbolTableBuilder.java
@@ -320,8 +320,12 @@ private void createImportedNames(List<AliasedName> importedNames, @Nullable Stri
         Name alias = module.alias();
         if (fromModuleName != null) {
           currentScope().addImportedSymbol(alias == null ? nameTree : alias, fullyQualifiedName, globalSymbolsByFQN);
+        } else if (alias != null) {
+          String fullName = module.dottedName().names().stream().map(Name::name).collect(Collectors.joining("."));
+          currentScope().addModuleSymbol(alias, fullName, globalSymbolsByModuleName, globalSymbolsByFQN);
         } else {
-          currentScope().addModuleSymbol(alias == null ? nameTree : alias, fullyQualifiedName, globalSymbolsByModuleName, globalSymbolsByFQN);
+          // It's a simple case - no "from" imports or aliasing
+          currentScope().addModuleSymbol(nameTree, fullyQualifiedName, globalSymbolsByModuleName, globalSymbolsByFQN);
         }
       });
     }
diff --git a/python-frontend/src/test/java/org/sonar/python/semantic/FullyQualifiedNameTest.java b/python-frontend/src/test/java/org/sonar/python/semantic/FullyQualifiedNameTest.java
@@ -64,6 +64,15 @@ public void callee_qualified_expression_alias() {
     assertNameAndQualifiedName(tree, "fn", "mod.fn");
   }
 
+  @Test
+  public void submodule_alias() {
+    FileInput tree = parse(
+      "import mod.submod as alias",
+      "alias.fn()"
+    );
+    assertNameAndQualifiedName(tree, "fn", "mod.submod.fn");
+  }
+
   @Test
   public void import_alias_reassigned() {
     FileInput tree = parse(
@@ -375,6 +384,15 @@ public void from_import_alias() {
     assertNameAndQualifiedName(tree, "g", "mod.fn");
   }
 
+  @Test
+  public void from_import_submodule_alias() {
+    FileInput tree = parse(
+      "from mod.submod import fn as g",
+      "g('foo')"
+    );
+    assertNameAndQualifiedName(tree, "g", "mod.submod.fn");
+  }
+
   @Test
   public void from_import_relative() {
     FileInput tree = parse(

Original file line number	Diff line number	Diff line change
`@@ -320,8 +320,12 @@ private void createImportedNames(List<AliasedName> importedNames, @Nullable Stri`
`320`	`320`	`Name alias = module.alias();`
`321`	`321`	`if (fromModuleName != null) {`
`322`	`322`	`currentScope().addImportedSymbol(alias == null ? nameTree : alias, fullyQualifiedName, globalSymbolsByFQN);`
	`323`	`+ } else if (alias != null) {`
	`324`	`+ String fullName = module.dottedName().names().stream().map(Name::name).collect(Collectors.joining("."));`
	`325`	`+ currentScope().addModuleSymbol(alias, fullName, globalSymbolsByModuleName, globalSymbolsByFQN);`
`323`	`326`	`} else {`
`324`		`- currentScope().addModuleSymbol(alias == null ? nameTree : alias, fullyQualifiedName, globalSymbolsByModuleName, globalSymbolsByFQN);`
	`327`	`+ // It's a simple case - no "from" imports or aliasing`
	`328`	`+ currentScope().addModuleSymbol(nameTree, fullyQualifiedName, globalSymbolsByModuleName, globalSymbolsByFQN);`
`325`	`329`	`}`
`326`	`330`	`});`
`327`	`331`	`}`