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

Minor. Nullability annotations.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-11-27 18:24:55 +04:00
parent e680567290
commit 3f790f5f0c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java
+1 -1
View File
@@ -358,7 +358,7 @@ public class JetFlowInformationProvider {
if (variableDescriptor.isVar() && variableDescriptor instanceof PropertyDescriptor) { if (variableDescriptor.isVar() && variableDescriptor instanceof PropertyDescriptor) {
DeclarationDescriptor descriptor = BindingContextUtils.getEnclosingDescriptor(trace.getBindingContext(), expression); DeclarationDescriptor descriptor = BindingContextUtils.getEnclosingDescriptor(trace.getBindingContext(), expression);
PropertySetterDescriptor setterDescriptor = ((PropertyDescriptor) variableDescriptor).getSetter(); PropertySetterDescriptor setterDescriptor = ((PropertyDescriptor) variableDescriptor).getSetter();
if (Visibilities.isVisible(variableDescriptor, descriptor) && !Visibilities.isVisible(setterDescriptor, descriptor) && setterDescriptor != null) { if (Visibilities.isVisible(variableDescriptor, descriptor) && setterDescriptor != null && !Visibilities.isVisible(setterDescriptor, descriptor)) {
report(Errors.INVISIBLE_SETTER.on(expression, variableDescriptor, setterDescriptor.getVisibility(), report(Errors.INVISIBLE_SETTER.on(expression, variableDescriptor, setterDescriptor.getVisibility(),
variableDescriptor.getContainingDeclaration()), ctxt); variableDescriptor.getContainingDeclaration()), ctxt);
return true; return true;
core/descriptors/src/org/jetbrains/jet/lang/descriptors/Visibilities.java
+3 -2
View File
@@ -111,12 +111,13 @@ public class Visibilities {
private Visibilities() { private Visibilities() {
} }
public static boolean isVisible(@Nullable DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) { public static boolean isVisible(@NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) {
return findInvisibleMember(what, from) == null; return findInvisibleMember(what, from) == null;
} }
@Nullable
public static DeclarationDescriptorWithVisibility findInvisibleMember( public static DeclarationDescriptorWithVisibility findInvisibleMember(
@Nullable DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptorWithVisibility what,
@NotNull DeclarationDescriptor from @NotNull DeclarationDescriptor from
) { ) {
if (from instanceof PackageViewDescriptor) { if (from instanceof PackageViewDescriptor) {