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
idea/src/org/jetbrains/jet/plugin/stubindex/resolve/CombinedPackageMemberDeclarationProvider.kt
-6
View File
@@ -16,18 +16,12 @@
package org.jetbrains.jet.plugin.stubindex.resolve
import com.intellij.psi.NavigatablePsiElement
import org.jetbrains.jet.lang.psi.*
import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedPackageMemberDeclarationProvider
import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider
import org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.lang.resolve.name.Name
public class CombinedPackageMemberDeclarationProvider(val providers: Collection<PackageMemberDeclarationProvider>) : PackageMemberDeclarationProvider {
override fun getAllDeclaredSubPackages() = providers.flatMap { it.getAllDeclaredSubPackages() }
override fun getPackageDeclarations(fqName: FqName) = providers.flatMap { it.getPackageDeclarations(fqName) }
override fun getPackageFiles() = providers.flatMap { it.getPackageFiles() }
override fun getAllDeclarations() = providers.flatMap { it.getAllDeclarations() }
idea/src/org/jetbrains/jet/plugin/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt
-17
View File
@@ -17,20 +17,15 @@
package org.jetbrains.jet.plugin.stubindex.resolve
import com.intellij.openapi.project.Project
import com.intellij.psi.NavigatablePsiElement
import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.stubs.StringStubIndexExtension
import org.jetbrains.jet.lang.psi.*
import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider
import org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.lang.resolve.name.Name
import org.jetbrains.jet.plugin.stubindex.JetAllPackagesIndex
import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex
import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionsFqnNameIndex
import org.jetbrains.jet.plugin.stubindex.JetTopLevelPropertiesFqnNameIndex
import java.util.*
import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope.kotlinSources
import org.jetbrains.jet.lang.resolve.name.numberOfSegments
import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil
public class StubBasedPackageMemberDeclarationProvider(
@@ -63,18 +58,6 @@ public class StubBasedPackageMemberDeclarationProvider(
return PackageIndexUtil.getSubPackageFqNames(fqName, searchScope, project)
}
override fun getPackageDeclarations(fqName: FqName): Collection<NavigatablePsiElement> {
if (fqName.isRoot()) {
return Collections.emptyList()
}
val files = JetAllPackagesIndex.getInstance().get(fqName.asString(), project, searchScope)
return files.map {
file ->
JetPsiUtil.getPackageReference(file, fqName.numberOfSegments() - 1)
}.filterNotNull()
}
override fun getPackageFiles(): Collection<JetFile> {
return PackageIndexUtil.findFilesWithExactPackage(fqName, searchScope, project)
}
idea/tests/org/jetbrains/jet/plugin/stubs/resolve/JetStubResolveTest.java
-12
View File
@@ -81,16 +81,4 @@ public class JetStubResolveTest extends LightCodeInsightFixtureTestCase {
assertSize(1, testProperties);
assertEquals("val test = 12", testProperties.get(0).getText());
}
public void testGetPackageByIntermediatePartition() {
myFixture.configureByText(JetFileType.INSTANCE, "package first.second.third");
StubBasedPackageMemberDeclarationProvider provider = new StubBasedPackageMemberDeclarationProvider(
new FqName("first.second"), getProject(), GlobalSearchScope.projectScope(getProject()));
Collection<NavigatablePsiElement> packageDeclarations = provider.getPackageDeclarations(new FqName("first.second"));
assertSize(1, packageDeclarations);
assertEquals("second", packageDeclarations.iterator().next().getText());
}
}