Got rid of possible NPE
This commit is contained in:
+10
-3
@@ -93,9 +93,16 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider {
|
|||||||
private static String getKotlinSignature(@NotNull PsiAnnotation kotlinSignatureAnnotation) {
|
private static String getKotlinSignature(@NotNull PsiAnnotation kotlinSignatureAnnotation) {
|
||||||
PsiNameValuePair pair = kotlinSignatureAnnotation.getParameterList().getAttributes()[0];
|
PsiNameValuePair pair = kotlinSignatureAnnotation.getParameterList().getAttributes()[0];
|
||||||
PsiAnnotationMemberValue value = pair.getValue();
|
PsiAnnotationMemberValue value = pair.getValue();
|
||||||
return value == null ? "null" : value instanceof PsiLiteralExpression
|
if (value == null) {
|
||||||
? StringUtil.unescapeStringCharacters(((PsiLiteralExpression) value).getValue().toString())
|
return "null";
|
||||||
: value.getText();
|
}
|
||||||
|
else if (value instanceof PsiLiteralExpression) {
|
||||||
|
Object valueObject = ((PsiLiteralExpression) value).getValue();
|
||||||
|
return valueObject == null ? "null" : StringUtil.unescapeStringCharacters(valueObject.toString());
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return value.getText();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user