diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/PsiTypeVariableFactory.java b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/PsiTypeVariableFactory.java index 7725528b7719..463a248ea5b5 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/PsiTypeVariableFactory.java +++ b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/PsiTypeVariableFactory.java @@ -158,12 +158,6 @@ public class PsiTypeVariableFactory { return getPresentableText(); } - @Override - @NotNull - public String getInternalCanonicalText() { - return getCanonicalText(); - } - @Override public boolean isValid() { return true; @@ -206,4 +200,4 @@ public class PsiTypeVariableFactory { } }; } -} +} \ No newline at end of file diff --git a/java/java-psi-api/src/com/intellij/psi/PsiLambdaExpressionType.java b/java/java-psi-api/src/com/intellij/psi/PsiLambdaExpressionType.java index 7f6b0e7e53d2..e3427226abde 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiLambdaExpressionType.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiLambdaExpressionType.java @@ -16,7 +16,6 @@ package com.intellij.psi; import com.intellij.psi.search.GlobalSearchScope; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; /** @@ -25,7 +24,7 @@ import org.jetbrains.annotations.NotNull; public class PsiLambdaExpressionType extends PsiType { private final PsiLambdaExpression myExpression; - public PsiLambdaExpressionType(PsiLambdaExpression expression) { + public PsiLambdaExpressionType(@NotNull PsiLambdaExpression expression) { super(TypeAnnotationProvider.EMPTY); myExpression = expression; } @@ -33,19 +32,13 @@ public class PsiLambdaExpressionType extends PsiType { @NotNull @Override public String getPresentableText() { - return ""; + return getCanonicalText(); } @NotNull @Override public String getCanonicalText() { - return getPresentableText(); - } - - @NotNull - @Override - public String getInternalCanonicalText() { - return getCanonicalText(); + return ""; } @Override @@ -54,12 +47,12 @@ public class PsiLambdaExpressionType extends PsiType { } @Override - public boolean equalsToText(@NotNull @NonNls final String text) { + public boolean equalsToText(@NotNull String text) { return false; } @Override - public A accept(@NotNull final PsiTypeVisitor visitor) { + public A accept(@NotNull PsiTypeVisitor visitor) { return visitor.visitLambdaExpressionType(this); } diff --git a/java/java-psi-api/src/com/intellij/psi/PsiLambdaParameterType.java b/java/java-psi-api/src/com/intellij/psi/PsiLambdaParameterType.java index 9d0e550c6feb..bdef7534dbd8 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiLambdaParameterType.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiLambdaParameterType.java @@ -16,7 +16,6 @@ package com.intellij.psi; import com.intellij.psi.search.GlobalSearchScope; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; /** @@ -25,7 +24,7 @@ import org.jetbrains.annotations.NotNull; public class PsiLambdaParameterType extends PsiType { private final PsiParameter myParameter; - public PsiLambdaParameterType(PsiParameter parameter) { + public PsiLambdaParameterType(@NotNull PsiParameter parameter) { super(TypeAnnotationProvider.EMPTY); myParameter = parameter; } @@ -33,19 +32,13 @@ public class PsiLambdaParameterType extends PsiType { @NotNull @Override public String getPresentableText() { - return ""; + return getCanonicalText(); } @NotNull @Override public String getCanonicalText() { - return getPresentableText(); - } - - @NotNull - @Override - public String getInternalCanonicalText() { - return getCanonicalText(); + return ""; } @Override @@ -54,12 +47,12 @@ public class PsiLambdaParameterType extends PsiType { } @Override - public boolean equalsToText(@NotNull @NonNls final String text) { + public boolean equalsToText(@NotNull String text) { return false; } @Override - public A accept(@NotNull final PsiTypeVisitor visitor) { + public A accept(@NotNull PsiTypeVisitor visitor) { return visitor.visitType(this); } diff --git a/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceType.java b/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceType.java index 08fa9d3f735c..fa995c96e4aa 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceType.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,17 +16,15 @@ package com.intellij.psi; import com.intellij.psi.search.GlobalSearchScope; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; /** * A type which represents a function denoted by a method reference. */ public class PsiMethodReferenceType extends PsiType { - @NotNull private final PsiMethodReferenceExpression myReference; - public PsiMethodReferenceType(@NotNull final PsiMethodReferenceExpression reference) { + public PsiMethodReferenceType(@NotNull PsiMethodReferenceExpression reference) { super(PsiAnnotation.EMPTY_ARRAY); myReference = reference; } @@ -34,19 +32,13 @@ public class PsiMethodReferenceType extends PsiType { @NotNull @Override public String getPresentableText() { - return ""; + return getCanonicalText(); } @NotNull @Override public String getCanonicalText() { - return getPresentableText(); - } - - @NotNull - @Override - public String getInternalCanonicalText() { - return getPresentableText(); + return ""; } @Override @@ -55,12 +47,12 @@ public class PsiMethodReferenceType extends PsiType { } @Override - public boolean equalsToText(@NotNull @NonNls final String text) { + public boolean equalsToText(@NotNull String text) { return false; } @Override - public A accept(@NotNull final PsiTypeVisitor visitor) { + public A accept(@NotNull PsiTypeVisitor visitor) { return visitor.visitMethodReferenceType(this); } @@ -78,4 +70,4 @@ public class PsiMethodReferenceType extends PsiType { public PsiMethodReferenceExpression getExpression() { return myReference; } -} +} \ No newline at end of file diff --git a/java/java-psi-api/src/com/intellij/psi/PsiPrimitiveType.java b/java/java-psi-api/src/com/intellij/psi/PsiPrimitiveType.java index a91ab231de2d..a2d3e817c218 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiPrimitiveType.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiPrimitiveType.java @@ -74,11 +74,11 @@ public class PsiPrimitiveType extends PsiType.Stub { @NotNull @Override public String getInternalCanonicalText() { - return getText(true, true); + return getCanonicalText(true); } private String getText(boolean qualified, boolean annotated) { - PsiAnnotation[] annotations = annotated ? getAnnotations() : PsiAnnotation.EMPTY_ARRAY; ; + PsiAnnotation[] annotations = annotated ? getAnnotations() : PsiAnnotation.EMPTY_ARRAY; if (annotations.length == 0) return myName; StringBuilder sb = new StringBuilder(); diff --git a/java/java-psi-api/src/com/intellij/psi/PsiType.java b/java/java-psi-api/src/com/intellij/psi/PsiType.java index 69ae291af077..93c7a29b71c9 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiType.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiType.java @@ -128,7 +128,9 @@ public abstract class PsiType implements PsiAnnotationOwner, Cloneable { * todo[r.sh] merge with getPresentableText() */ @NotNull - public abstract String getInternalCanonicalText(); + public String getInternalCanonicalText() { + return getCanonicalText(); + } /** * Checks if the type is currently valid. diff --git a/java/java-psi-impl/src/com/intellij/psi/Bottom.java b/java/java-psi-impl/src/com/intellij/psi/Bottom.java index c128579b50cc..defa11b4b1a2 100644 --- a/java/java-psi-impl/src/com/intellij/psi/Bottom.java +++ b/java/java-psi-impl/src/com/intellij/psi/Bottom.java @@ -31,7 +31,7 @@ public class Bottom extends PsiType { @NotNull @Override public String getPresentableText() { - return "_"; + return getCanonicalText(); } @NotNull @@ -40,12 +40,6 @@ public class Bottom extends PsiType { return "_"; } - @NotNull - @Override - public String getInternalCanonicalText() { - return getCanonicalText(); - } - @Override public boolean isValid() { return true; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassReferenceType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassReferenceType.java index 3545f6e3213a..084e2440d5a3 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassReferenceType.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassReferenceType.java @@ -206,7 +206,7 @@ public class PsiClassReferenceType extends PsiClassType.Stub { @NotNull @Override public String getInternalCanonicalText() { - return getText(true); + return getCanonicalText(true); } private String getText(boolean annotated) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrAnonymousClassType.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrAnonymousClassType.java index 0ca67557c2b0..45d6c72f4db5 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrAnonymousClassType.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrAnonymousClassType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -74,12 +74,6 @@ public class GrAnonymousClassType extends GrLiteralClassType { return new GrAnonymousClassType(languageLevel, myScope, myFacade, myAnonymous); } - @NotNull - @Override - public String getInternalCanonicalText() { - return getCanonicalText(); - } - @Override public boolean isValid() { return myAnonymous.isValid(); @@ -94,4 +88,4 @@ public class GrAnonymousClassType extends GrLiteralClassType { public PsiClassType getSimpleClassType() { return new GrClassReferenceType(myAnonymous.getBaseClassReferenceGroovy(), myLanguageLevel); } -} +} \ No newline at end of file diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java index 83f8ae67b63a..e8ad34dd74ef 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,13 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.jetbrains.plugins.groovy.lang.psi.impl; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.lang.psi.GrReferenceElement; @@ -132,21 +130,14 @@ public class GrClassReferenceType extends PsiClassType { return myReferenceElement.getCanonicalText(); } - @NotNull - @Override - public String getInternalCanonicalText() { - return getCanonicalText(); - } - @Override public boolean isValid() { return myReferenceElement.isValid(); } @Override - public boolean equalsToText(@NotNull @NonNls String text) { - return text.endsWith(getPresentableText()) && //optimization - text.equals(getCanonicalText()); + public boolean equalsToText(@NotNull String text) { + return text.endsWith(getPresentableText()) /*optimization*/ && text.equals(getCanonicalText()); } @Override @@ -170,4 +161,4 @@ public class GrClassReferenceType extends PsiClassType { public GrReferenceElement getReference() { return myReferenceElement; } -} +} \ No newline at end of file diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClosureType.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClosureType.java index 00074c599143..f1b82f9e0e7f 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClosureType.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClosureType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.jetbrains.plugins.groovy.lang.psi.impl; import com.intellij.openapi.util.Comparing; @@ -110,12 +109,6 @@ public class GrClosureType extends GrLiteralClassType { return new GrClosureType(getLanguageLevel(), getResolveScope(), myFacade, mySignature, false); } - @Override - @NotNull - public String getInternalCanonicalText() { - return getCanonicalText(); - } - @Override public boolean isValid() { return mySignature.isValid(); @@ -195,4 +188,4 @@ public class GrClosureType extends GrLiteralClassType { public GrSignature getSignature() { return mySignature; } -} +} \ No newline at end of file diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrPsiTypeStub.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrPsiTypeStub.java index aceb5b5bbf55..3a2d0534d625 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrPsiTypeStub.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrPsiTypeStub.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ import com.intellij.psi.PsiAnnotation; import com.intellij.psi.PsiType; import com.intellij.psi.PsiTypeVisitor; import com.intellij.psi.search.GlobalSearchScope; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,7 +30,7 @@ public class GrPsiTypeStub extends PsiType { @NotNull @Override public String getPresentableText() { - return "?"; + return getCanonicalText(); } @NotNull @@ -40,19 +39,13 @@ public class GrPsiTypeStub extends PsiType { return "?"; } - @NotNull - @Override - public String getInternalCanonicalText() { - return "?"; - } - @Override public boolean isValid() { return true; } @Override - public boolean equalsToText(@NotNull @NonNls String text) { + public boolean equalsToText(@NotNull String text) { return false; } @@ -72,4 +65,4 @@ public class GrPsiTypeStub extends PsiType { public PsiType[] getSuperTypes() { return EMPTY_ARRAY; } -} +} \ No newline at end of file