From e28873298c558c6c6e84e26aee8b85ffcd68bef9 Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Tue, 22 Jan 2019 19:49:53 +0300
Subject: [PATCH] [groovy] better #toString for TypeDfaState, DFAType and Mixin

---
 .../plugins/groovy/lang/psi/dataFlow/DFAType.java     | 11 ++---------
 .../lang/psi/dataFlow/types/TypesSemilattice.java     |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAType.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAType.java
index 37ed3ead13bf..acea0c9b38b2 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAType.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAType.java
@@ -38,11 +38,7 @@ public class DFAType {
 
     @Override
     public String toString() {
-      return "Mixin{" +
-             "myType=" + myType +
-             ", myCondition=" + myCondition +
-             ", myNegated=" + myNegated +
-             '}';
+      return (myNegated ? "!" : "") + myType;
     }
 
     @Override
@@ -174,9 +170,6 @@ public class DFAType {
 
   @Override
   public String toString() {
-    return "DFAType{" +
-           "primary=" + primary +
-           ", mixins=" + mixins +
-           '}';
+    return "{" + primary + " : " + mixins + "}";
   }
 }
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/types/TypesSemilattice.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/types/TypesSemilattice.java
index b665b4ea779c..5cefaaf2c075 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/types/TypesSemilattice.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/types/TypesSemilattice.java
@@ -113,7 +113,7 @@ class TypeDfaState {
 
   @Override
   public String toString() {
-    return "TypeDfaState{" + myVarTypes + '}';
+    return myVarTypes.toString();
   }
 
   public boolean containsVariable(@NotNull String variableName) {