MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-179716 Cannot return Integer from method returning short. Fix docs.

Browse Source
This commit is contained in:
alexey.afanasiev
2017-10-10 17:45:46 +03:00
parent bc1f515ce8
commit 4ffd02dd8b
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/GroovyTypeCheckVisitor.java
+1 -1
View File
@@ -795,7 +795,7 @@ public class GroovyTypeCheckVisitor extends BaseInspectionVisitor {
);
}
//copypaste from org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.checkPossibleLooseOfPrecision()
//see org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.checkPossibleLooseOfPrecision()
static boolean isPossibleLooseOfPrecision(@NotNull PsiType targetType, @NotNull PsiType actualType, @NotNull GrExpression expression) {
int targetRank = getTypeRank(targetType);
int actualRank = getTypeRank(actualType);
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/typeEnhancers/GrContainerTypeConverter.java
+4 -3
View File
@@ -36,9 +36,10 @@ public class GrContainerTypeConverter extends GrTypeConverter {
return null;
}
private static ConversionResult isCSConvertible(PsiType targetType,
PsiType actualType,
GroovyPsiElement context) {
@Nullable
private static ConversionResult isCSConvertible(@NotNull PsiType targetType,
@NotNull PsiType actualType,
@NotNull GroovyPsiElement context) {
if (targetType instanceof PsiArrayType && actualType instanceof PsiArrayType) {
return TypesUtil.isAssignableByParameter(((PsiArrayType)targetType).getComponentType(), ((PsiArrayType)actualType).getComponentType(),
context) ? ConversionResult.OK : ConversionResult.ERROR;
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/typeEnhancers/GrNumberConverter.java
+3 -2
View File
@@ -28,14 +28,15 @@ public class GrNumberConverter extends GrTypeConverter {
@NotNull PsiType actualType,
@NotNull GroovyPsiElement context,
@NotNull ApplicableTo currentPosition) {
if (PsiUtil.isCompileStatic(context)) return isCSConvertible(targetType, actualType, context, currentPosition);
if (PsiUtil.isCompileStatic(context)) return isCSConvertible(targetType, actualType);
if (TypesUtil.isNumericType(targetType) && TypesUtil.isNumericType(actualType)) {
return OK;
}
return null;
}
private static ConversionResult isCSConvertible(PsiType targetType, PsiType actualType, GroovyPsiElement context, @NotNull ApplicableTo currentPosition) {
@Nullable
private static ConversionResult isCSConvertible(@NotNull PsiType targetType, @NotNull PsiType actualType) {
if (TypesUtil.isClassType(actualType, JAVA_MATH_BIG_DECIMAL))
return isFloatOrDoubleType(targetType) ? OK : null;