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

Minor: remove unused method

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-03-18 17:43:22 +04:00
parent 4a5d88c51d
commit c4de1898ce
6 changed files with 4 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java
+4 -28
View File
@@ -17,24 +17,21 @@
package org.jetbrains.jet.lang.resolve.lazy.declarations;
import com.google.common.base.Predicate;
import com.google.common.collect.*;
import com.intellij.psi.NavigatablePsiElement;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import com.google.common.collect.Collections2;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
import kotlin.Function0;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetPackageDirective;
import org.jetbrains.jet.lang.psi.JetPsiUtil;
import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.NamePackage;
import org.jetbrains.jet.storage.NotNullLazyValue;
import org.jetbrains.jet.storage.StorageManager;
import java.util.Collection;
import java.util.Collections;
import java.util.Set;
public class FileBasedDeclarationProviderFactory extends AbstractDeclarationProviderFactory {
@@ -94,27 +91,6 @@ public class FileBasedDeclarationProviderFactory extends AbstractDeclarationProv
});
}
/*package*/ Collection<NavigatablePsiElement> getPackageDeclarations(@NotNull final FqName fqName) {
if (fqName.isRoot()) {
return Collections.emptyList();
}
Collection<NavigatablePsiElement> resultElements = Lists.newArrayList();
for (FqName declaredPackage : index.invoke().filesByPackage.keys()) {
if (NamePackage.isSubpackageOf(declaredPackage, fqName)) {
Collection<JetFile> files = index.invoke().filesByPackage.get(declaredPackage);
resultElements.addAll(ContainerUtil.map(files, new Function<JetFile, NavigatablePsiElement>() {
@Override
public NavigatablePsiElement fun(JetFile file) {
return JetPsiUtil.getPackageReference(file, NamePackage.numberOfSegments(fqName) - 1);
}
}));
}
}
return resultElements;
}
@Nullable
@Override
protected PackageMemberDeclarationProvider createPackageMemberDeclarationProvider(@NotNull FqName packageFqName) {
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.java
-7
View File
@@ -16,7 +16,6 @@
package org.jetbrains.jet.lang.resolve.lazy.declarations;
import com.intellij.psi.NavigatablePsiElement;
import kotlin.Function0;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetDeclaration;
@@ -69,12 +68,6 @@ public class FileBasedPackageMemberDeclarationProvider extends AbstractPsiBasedD
return allDeclaredSubPackages.invoke();
}
@NotNull
@Override
public Collection<NavigatablePsiElement> getPackageDeclarations(@NotNull FqName fqName) {
return factory.getPackageDeclarations(fqName);
}
@NotNull
@Override
public Collection<JetFile> getPackageFiles() {
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PackageMemberDeclarationProvider.java
-5
View File
@@ -16,7 +16,6 @@
package org.jetbrains.jet.lang.resolve.lazy.declarations;
import com.intellij.psi.NavigatablePsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.ReadOnly;
import org.jetbrains.jet.lang.psi.JetFile;
@@ -30,10 +29,6 @@ public interface PackageMemberDeclarationProvider extends DeclarationProvider {
@NotNull
Collection<FqName> getAllDeclaredSubPackages();
@ReadOnly
@NotNull
Collection<NavigatablePsiElement> getPackageDeclarations(@NotNull FqName fqName);
@ReadOnly
@NotNull
Collection<JetFile> getPackageFiles();