Better support for forced resolve while debugging

2014-07-01 21:15:34 +04:00
parent b4f26bde44
commit c2a03d60f0
1 changed files with 9 additions and 7 deletions
@@ -83,19 +83,21 @@ public class ForceResolveUtil {
        }
    }

-    public static void forceResolveAllContents(@Nullable JetType type) {
-        if (type == null) return;
+    @Nullable
+    public static JetType forceResolveAllContents(@Nullable JetType type) {
+        if (type == null) return null;

        if (type instanceof FlexibleType) {
            FlexibleType flexibleType = (FlexibleType) type;
            forceResolveAllContents(flexibleType.getLowerBound());
            forceResolveAllContents(flexibleType.getUpperBound());
-            return;
        }
-
-        forceResolveAllContents(type.getConstructor());
-        for (TypeProjection projection : type.getArguments()) {
-            forceResolveAllContents(projection.getType());
+        else {
+            forceResolveAllContents(type.getConstructor());
+            for (TypeProjection projection : type.getArguments()) {
+                forceResolveAllContents(projection.getType());
+            }
        }
+        return type;
    }
 }