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

Check absence of explicit initializer in field annotation

Browse Source
This commit is contained in:
Nikolay Krasko
2012-10-08 20:39:12 +04:00
parent 3a410064be
commit d0b41ff153
6 changed files with 54 additions and 6 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
+18 -5
View File
@@ -70,11 +70,7 @@ public class AlternativeFieldSignatureData extends ElementAlternativeSignatureDa
}
private static void checkFieldAnnotation(JetProperty altProperty, PsiFieldWrapper fieldWrapper, boolean isVar) {
PsiClass containingClass = fieldWrapper.getPsiField().getContainingClass();
String fieldLink = containingClass != null ?
String.format("%s.%s", containingClass.getQualifiedName(), fieldWrapper.getName()) :
fieldWrapper.getName();
assert (fieldLink != null);
String fieldLink = getFieldQualifiedName(fieldWrapper);
if (!ComparatorUtil.equalsNullable(fieldWrapper.getName(), altProperty.getName())) {
throw new AlternativeSignatureMismatchException(
@@ -99,5 +95,22 @@ public class AlternativeFieldSignatureData extends ElementAlternativeSignatureDa
"Wrong mutability in annotation for field '%s'",
fieldLink);
}
if (altProperty.getInitializer() != null) {
throw new AlternativeSignatureMismatchException(
"Default value is not expected in annotation for field '%s'",
fieldLink);
}
}
@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;
}
}