azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't repeat full qualified name in error messages for field annotations

Browse Source
This commit is contained in:
Nikolay Krasko
2012-10-08 20:47:51 +04:00
parent d0b41ff153
commit a145e93ebb
1 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java
+6 -29
View File
@@ -17,7 +17,6 @@
package org.jetbrains.jet.lang.resolve.java.kotlinSignature;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiClass;
import com.intellij.util.containers.ComparatorUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
@@ -70,47 +69,25 @@ public class AlternativeFieldSignatureData extends ElementAlternativeSignatureDa
}
private static void checkFieldAnnotation(JetProperty altProperty, PsiFieldWrapper fieldWrapper, boolean isVar) {
String fieldLink = getFieldQualifiedName(fieldWrapper);
if (!ComparatorUtil.equalsNullable(fieldWrapper.getName(), altProperty.getName())) {
throw new AlternativeSignatureMismatchException(
"Field name mismatch, original: %s, alternative: %s",
fieldLink, altProperty.getName());
throw new AlternativeSignatureMismatchException("Field name mismatch, original: %s, alternative: %s",
fieldWrapper.getName(), altProperty.getName());
}
if (altProperty.getTypeRef() == null) {
throw new AlternativeSignatureMismatchException(
"Field annotation for '%s' shouldn't have type reference",
fieldLink);
throw new AlternativeSignatureMismatchException("Field annotation for shouldn't have type reference");
}
if (altProperty.getGetter() != null || altProperty.getSetter() != null) {
throw new AlternativeSignatureMismatchException(
"Field annotation for '%s' shouldn't have getters and setters",
fieldLink);
throw new AlternativeSignatureMismatchException("Field annotation for shouldn't have getters and setters");
}
if (altProperty.isVar() != isVar) {
throw new AlternativeSignatureMismatchException(
"Wrong mutability in annotation for field '%s'",
fieldLink);
throw new AlternativeSignatureMismatchException("Wrong mutability in annotation for field");
}
if (altProperty.getInitializer() != null) {
throw new AlternativeSignatureMismatchException(
"Default value is not expected in annotation for field '%s'",
fieldLink);
throw new AlternativeSignatureMismatchException("Default value is not expected in annotation for field");
}
}
@NotNull
private static String getFieldQualifiedName(PsiFieldWrapper fieldWrapper) {
PsiClass containingClass = fieldWrapper.getPsiField().getContainingClass();
String fieldLink = containingClass != null ?
String.format("%s.%s", containingClass.getQualifiedName(), fieldWrapper.getName()) :
fieldWrapper.getName();
assert (fieldLink != null);
return fieldLink;
}
}