From 34f4baa8a5b6d5e5d46b42e8e618d9772d7949d0 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 31 Mar 2014 15:28:40 +0200 Subject: [PATCH] toString --- .../constraints/InputOutputConstraintFormula.java | 2 +- .../constraints/LambdaExpressionCompatibilityConstraint.java | 2 +- .../constraints/PsiMethodReferenceCompatibilityConstraint.java | 2 +- .../graphInference/constraints/StrictSubtypingConstraint.java | 2 +- .../resolve/graphInference/constraints/SubtypingConstraint.java | 2 +- .../graphInference/constraints/TypeCompatibilityConstraint.java | 2 +- .../graphInference/constraints/TypeEqualityConstraint.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/InputOutputConstraintFormula.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/InputOutputConstraintFormula.java index 688aec9625af..6ff17092dfd6 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/InputOutputConstraintFormula.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/InputOutputConstraintFormula.java @@ -118,6 +118,6 @@ public abstract class InputOutputConstraintFormula implements ConstraintFormula @Override public String toString() { - return "T: " + getT().getCanonicalText() + "; expr : " + getExpression().getText(); + return getExpression().getText() + " -> " + getT().getPresentableText(); } } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/LambdaExpressionCompatibilityConstraint.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/LambdaExpressionCompatibilityConstraint.java index 20063af77749..8de976b55acd 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/LambdaExpressionCompatibilityConstraint.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/LambdaExpressionCompatibilityConstraint.java @@ -80,6 +80,6 @@ public class LambdaExpressionCompatibilityConstraint implements ConstraintFormul @Override public String toString() { - return "T: " + myT.getCanonicalText() +"; expr: " + myExpression.getText(); + return myExpression.getText() + " -> " + myT.getPresentableText(); } } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/PsiMethodReferenceCompatibilityConstraint.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/PsiMethodReferenceCompatibilityConstraint.java index 11245cdca2ac..9262a2d96c1e 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/PsiMethodReferenceCompatibilityConstraint.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/PsiMethodReferenceCompatibilityConstraint.java @@ -234,6 +234,6 @@ public class PsiMethodReferenceCompatibilityConstraint implements ConstraintForm @Override public String toString() { - return "T: " + myT.getCanonicalText() +"; expr: " + myExpression.getText(); + return myExpression.getText() + " -> " + myT.getPresentableText(); } } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java index cef89a1bb0c3..92745cb14d01 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java @@ -144,6 +144,6 @@ public class StrictSubtypingConstraint implements ConstraintFormula { @Override public String toString() { - return "T: " + myT.getCanonicalText() +"; myS: " + myS.getCanonicalText(); + return myS.getPresentableText() + " < " + myT.getPresentableText(); } } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/SubtypingConstraint.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/SubtypingConstraint.java index 38c2c910e5b7..e539e943a433 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/SubtypingConstraint.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/SubtypingConstraint.java @@ -131,6 +131,6 @@ public class SubtypingConstraint implements ConstraintFormula { @Override public String toString() { - return "T: " + myT.getCanonicalText() +"; myS: " + myS.getCanonicalText(); + return myS.getPresentableText() + " <= " + myT.getPresentableText(); } } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeCompatibilityConstraint.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeCompatibilityConstraint.java index 216b6fde5847..4038f9af5125 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeCompatibilityConstraint.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeCompatibilityConstraint.java @@ -111,6 +111,6 @@ public class TypeCompatibilityConstraint implements ConstraintFormula { @Override public String toString() { - return "T: " + myT.getCanonicalText() +"; myS: " + myS.getCanonicalText(); + return myS.getPresentableText() + " -> " + myT.getPresentableText(); } } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java index 5f94b2b1c433..1f4717ddc79e 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java @@ -148,6 +148,6 @@ public class TypeEqualityConstraint implements ConstraintFormula { @Override public String toString() { - return "T: " + myT.getCanonicalText() +"; myS: " + myS.getCanonicalText(); + return myT.getPresentableText() + " == " + myS.getPresentableText(); } }