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

Annotated with @Nullable/@NotNull.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-29 16:06:26 +04:00
parent 5314b7a81e
commit 9684f05e7c
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
+12 -8
View File
@@ -118,6 +118,7 @@ public class JetSourceNavigationHelper {
return resultScope; return resultScope;
} }
@NotNull
private static List<JetFile> findAllSourceFilesWhichContainIdentifier(@NotNull JetDeclaration jetDeclaration) { private static List<JetFile> findAllSourceFilesWhichContainIdentifier(@NotNull JetDeclaration jetDeclaration) {
VirtualFile libraryFile = jetDeclaration.getContainingFile().getVirtualFile(); VirtualFile libraryFile = jetDeclaration.getContainingFile().getVirtualFile();
String name = jetDeclaration.getName(); String name = jetDeclaration.getName();
@@ -139,6 +140,7 @@ public class JetSourceNavigationHelper {
return jetFiles; return jetFiles;
} }
@Nullable
private static <Decl extends JetDeclaration> Pair<BindingContext, JetScope> getBindingContextAndMemberScopeForLibrarySources( private static <Decl extends JetDeclaration> Pair<BindingContext, JetScope> getBindingContextAndMemberScopeForLibrarySources(
@NotNull Decl decompiledDeclaration) { @NotNull Decl decompiledDeclaration) {
PsiElement declarationContainer = decompiledDeclaration.getParent(); PsiElement declarationContainer = decompiledDeclaration.getParent();
@@ -187,8 +189,8 @@ public class JetSourceNavigationHelper {
@Nullable @Nullable
private static <Decl extends JetDeclaration, Descr extends CallableDescriptor> JetDeclaration private static <Decl extends JetDeclaration, Descr extends CallableDescriptor> JetDeclaration
getSourcePropertyOrFunction( getSourcePropertyOrFunction(
final @NotNull Decl decompiledDeclaration, @NotNull Decl decompiledDeclaration,
NavigationStrategy<Decl, Descr> navigationStrategy @NotNull NavigationStrategy<Decl, Descr> navigationStrategy
) { ) {
String memberNameAsString = decompiledDeclaration.getName(); String memberNameAsString = decompiledDeclaration.getName();
assert memberNameAsString != null; assert memberNameAsString != null;
@@ -236,16 +238,16 @@ public class JetSourceNavigationHelper {
} }
private interface NavigationStrategy<Decl extends JetDeclaration, Descr extends CallableDescriptor> { private interface NavigationStrategy<Decl extends JetDeclaration, Descr extends CallableDescriptor> {
boolean declarationAndDescriptorMatch(Decl declaration, Descr descriptor); boolean declarationAndDescriptorMatch(@NotNull Decl declaration, @NotNull Descr descriptor);
Collection<Descr> getCandidateDescriptors(JetScope scope, Name name); @NotNull Collection<Descr> getCandidateDescriptors(@NotNull JetScope scope, @NotNull Name name);
@Nullable JetTypeReference getReceiverType(@NotNull Decl declaration); @Nullable JetTypeReference getReceiverType(@NotNull Decl declaration);
} }
private static class FunctionNavigationStrategy implements NavigationStrategy<JetFunction, FunctionDescriptor> { private static class FunctionNavigationStrategy implements NavigationStrategy<JetFunction, FunctionDescriptor> {
@Override @Override
public boolean declarationAndDescriptorMatch(JetFunction declaration, FunctionDescriptor descriptor) { public boolean declarationAndDescriptorMatch(@NotNull JetFunction declaration, @NotNull FunctionDescriptor descriptor) {
List<JetParameter> declarationParameters = declaration.getValueParameters(); List<JetParameter> declarationParameters = declaration.getValueParameters();
List<ValueParameterDescriptor> descriptorParameters = descriptor.getValueParameters(); List<ValueParameterDescriptor> descriptorParameters = descriptor.getValueParameters();
if (descriptorParameters.size() != declarationParameters.size()) { if (descriptorParameters.size() != declarationParameters.size()) {
@@ -275,8 +277,9 @@ public class JetSourceNavigationHelper {
return true; return true;
} }
@NotNull
@Override @Override
public Collection<FunctionDescriptor> getCandidateDescriptors(JetScope scope, Name name) { public Collection<FunctionDescriptor> getCandidateDescriptors(@NotNull JetScope scope, @NotNull Name name) {
return scope.getFunctions(name); return scope.getFunctions(name);
} }
@@ -289,12 +292,13 @@ public class JetSourceNavigationHelper {
private static class PropertyNavigationStrategy implements NavigationStrategy<JetProperty, VariableDescriptor> { private static class PropertyNavigationStrategy implements NavigationStrategy<JetProperty, VariableDescriptor> {
@Override @Override
public boolean declarationAndDescriptorMatch(JetProperty declaration, VariableDescriptor descriptor) { public boolean declarationAndDescriptorMatch(@NotNull JetProperty declaration, @NotNull VariableDescriptor descriptor) {
return true; return true;
} }
@NotNull
@Override @Override
public Collection<VariableDescriptor> getCandidateDescriptors(JetScope scope, Name name) { public Collection<VariableDescriptor> getCandidateDescriptors(@NotNull JetScope scope, @NotNull Name name) {
return scope.getProperties(name); return scope.getProperties(name);
} }