github653224
diff --git a/‎python-checks/src/test/resources/checks/incompatibleOperands/comparison.py‎
Lines changed: 1 addition & 1 deletion b/‎python-checks/src/test/resources/checks/incompatibleOperands/comparison.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎python-checks/src/test/resources/checks/nonCallableCalled.py‎
Lines changed: 1 addition & 1 deletion b/‎python-checks/src/test/resources/checks/nonCallableCalled.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎python-frontend/src/main/java/org/sonar/python/types/InferredTypes.java‎
Lines changed: 5 additions & 1 deletion b/‎python-frontend/src/main/java/org/sonar/python/types/InferredTypes.java‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎python-frontend/src/main/java/org/sonar/python/types/UnionType.java‎
Lines changed: 2 additions & 2 deletions b/‎python-frontend/src/main/java/org/sonar/python/types/UnionType.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎python-frontend/src/test/java/org/sonar/python/types/InferredTypesTest.java‎
Lines changed: 1 addition & 1 deletion b/‎python-frontend/src/test/java/org/sonar/python/types/InferredTypesTest.java‎
Lines changed: 1 addition & 1 deletion
@@ -10,7 +10,7 @@ def builtin_noncompliant(p):
     x = 42
   else:
     x = complex(1)
-  x > "1" # Noncompliant {{Fix this invalid ">" operation between incompatible types.}}
+  x > "1" # Noncompliant {{Fix this invalid ">" operation between incompatible types (Union[int, complex] and str).}}
   "1" < x # Noncompliant
 
 
 
@@ -37,7 +37,7 @@ def call_noncallable(p):
       x = 42
     else:
       x = 'str'
-    x() # Noncompliant {{Fix this call; "x" is not callable.}}
+    x() # Noncompliant {{Fix this call; "x" has type Union[int, str] and it is not callable.}}
 
 def flow_sensitivity():
   my_var = "hello"
 
@@ -23,9 +23,11 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
@@ -164,7 +166,7 @@ public static Collection<ClassSymbol> typeSymbols(InferredType inferredType) {
       return Collections.singleton(((RuntimeType) inferredType).getTypeClass());
     }
     if (inferredType instanceof UnionType) {
-      Set<ClassSymbol> typeClasses = new HashSet<>();
+      Set<ClassSymbol> typeClasses = new LinkedHashSet<>();
       ((UnionType) inferredType).types().forEach(type -> typeClasses.addAll(typeSymbols(type)));
       return typeClasses;
     }
@@ -176,6 +178,8 @@ public static String typeName(InferredType inferredType) {
     Collection<ClassSymbol> typeClasses = typeSymbols(inferredType);
     if (typeClasses.size() == 1) {
       return typeClasses.iterator().next().name();
+    } else if (typeClasses.size() > 1) {
+      return "Union[" + typeClasses.stream().map(ClassSymbol::name).collect(Collectors.joining(", ")) + "]";
     }
     return null;
   }
 
@@ -20,7 +20,7 @@
 package org.sonar.python.types;
 
 import java.util.Collections;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -45,7 +45,7 @@ public static InferredType or(InferredType type1, InferredType type2) {
     if (type1.equals(type2)) {
       return type1;
     }
-    Set<InferredType> types = new HashSet<>();
+    Set<InferredType> types = new LinkedHashSet<>();
     addTypes(type1, types);
     addTypes(type2, types);
     return new UnionType(types);
 
@@ -145,7 +145,7 @@ public void test_typeName() {
     ClassSymbol a = new ClassSymbolImpl("A", "mod.A");
     assertThat(InferredTypes.typeName(new RuntimeType(a))).isEqualTo("A");
 
-    assertThat(InferredTypes.typeName(or(STR, INT))).isNull();
+    assertThat(InferredTypes.typeName(or(STR, INT))).isEqualTo("Union[str, int]");
     assertThat(InferredTypes.typeName(InferredTypes.anyType())).isNull();
   }
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public void test_typeName() {`
`145`	`145`	`ClassSymbol a = new ClassSymbolImpl("A", "mod.A");`
`146`	`146`	`assertThat(InferredTypes.typeName(new RuntimeType(a))).isEqualTo("A");`
`147`	`147`
`148`		`- assertThat(InferredTypes.typeName(or(STR, INT))).isNull();`
	`148`	`+ assertThat(InferredTypes.typeName(or(STR, INT))).isEqualTo("Union[str, int]");`
`149`	`149`	`assertThat(InferredTypes.typeName(InferredTypes.anyType())).isNull();`
`150`	`150`	`}`
`151`	`151`