1c/v8-code-style
1
0
Fork 0
mirror of https://github.com/1C-Company/v8-code-style.git synced 2025-04-17 14:06:40 +02:00
Code Issues Releases Activity

Исправление возможных NPE

Browse Source
This commit is contained in:
Dmitriy Marmyshev 2022-06-23 19:29:36 +03:00
parent b9cc1e397c
commit 524fdbc125
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/comment/check/FieldDefinitionTypeWithLinkRefCheck.java
View File

@ -150,7 +150,7 @@ public class FieldDefinitionTypeWithLinkRefCheck
return false;
}
String typeName = type.getTypeName();
return types.contains(typeName);
return typeName != null && types.contains(typeName);
}
return false;
}

6
bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/strict/check/AbstractDynamicFeatureAccessTypeCheck.java
View File

@ -182,8 +182,10 @@ public abstract class AbstractDynamicFeatureAccessTypeCheck
}
List<TypeItem> types = computeTypes(source, actualEnvs);
return !monitor.isCanceled() && !types.isEmpty()
&& types.stream().anyMatch(t -> typeNames.contains(McoreUtil.getTypeName(t)));
return !monitor.isCanceled() && !types.isEmpty() && types.stream().anyMatch(t -> {
String typeName = McoreUtil.getTypeName(t);
return typeName != null && typeNames.contains(typeName);
});
}
}

13
bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/strict/check/FunctionCtorReturnSectionCheck.java
View File

@ -177,10 +177,11 @@ public class FunctionCtorReturnSectionCheck
Set<String> checkTypes = getCheckTypes(parameters);
List<String> computedReturnTypeNames = computedReturnTypes.stream()
Set<String> computedReturnTypeNames = computedReturnTypes.stream()
.map(McoreUtil::getTypeName)
.filter(Objects::nonNull)
.collect(Collectors.toList());
.collect(Collectors.toSet());
if (isUserDataTypes(computedReturnTypeNames, checkTypes))
{
@ -208,16 +209,16 @@ public class FunctionCtorReturnSectionCheck
for (TypeItem returnType : returnTypes)
{
String returnTypeName = McoreUtil.getTypeName(returnType);
if (computedReturnTypeNames.contains(returnTypeName))
if (returnTypeName != null && computedReturnTypeNames.contains(returnTypeName))
{
if (isUserDataTypes(List.of(returnTypeName), checkTypes))
{
Optional<Pair<Collection<Property>, TypeItem>> declaredProperties =
coputedProperties.stream()
.filter(t -> McoreUtil.getTypeName(t.getSecond()).equals(returnTypeName))
.filter(t -> returnTypeName.equals(McoreUtil.getTypeName(t.getSecond())))
.findAny();
Optional<Pair<Collection<Property>, TypeItem>> typeProperties = properties.stream()
.filter(t -> McoreUtil.getTypeName(t.getSecond()).equals(returnTypeName))
.filter(t -> returnTypeName.equals(McoreUtil.getTypeName(t.getSecond())))
.findAny();
checkTypeProperties(method, statment, isRussianScript, returnType,
@ -321,7 +322,7 @@ public class FunctionCtorReturnSectionCheck
return function.isExport();
}
private boolean isUserDataTypes(List<String> computedReturnTypeNames, Set<String> checkTypes)
private boolean isUserDataTypes(Collection<String> computedReturnTypeNames, Set<String> checkTypes)
{
if (computedReturnTypeNames.isEmpty())
{