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

code review

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-08-05 17:57:57 +02:00
parent c29ebfbb04
commit 43bbed495b
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt
+1 -1
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.*
public interface KotlinFileStub : PsiFileStub<JetFile> { public interface KotlinFileStub : PsiFileStub<JetFile> {
public fun getPackageFqName(): FqName public fun getPackageFqName(): FqName
public fun isScript(): Boolean public fun isScript(): Boolean
public fun findImportByAlias(alias: String): KotlinImportDirectiveStub? public fun findImportsByAlias(alias: String): List<KotlinImportDirectiveStub>
} }
public interface KotlinPlaceHolderStub<T : JetElement> : StubElement<T> public interface KotlinPlaceHolderStub<T : JetElement> : StubElement<T>
compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFileStubImpl.kt
+3 -3
View File
@@ -45,8 +45,8 @@ public class KotlinFileStubImpl(jetFile: JetFile?, private val packageName: Stri
return childrenStubs.filterIsInstance<PsiClassStub<*>>().map { it.psi }.toTypedArray() return childrenStubs.filterIsInstance<PsiClassStub<*>>().map { it.psi }.toTypedArray()
} }
override fun findImportByAlias(alias: String): KotlinImportDirectiveStub? { override fun findImportsByAlias(alias: String): List<KotlinImportDirectiveStub> {
val importList = childrenStubs.firstOrNull { it.stubType == JetStubElementTypes.IMPORT_LIST } ?: return null val importList = childrenStubs.firstOrNull { it.stubType == JetStubElementTypes.IMPORT_LIST } ?: return emptyList()
return importList.childrenStubs.filterIsInstance<KotlinImportDirectiveStub>().firstOrNull { it.getAliasName() == alias } return importList.childrenStubs.filterIsInstance<KotlinImportDirectiveStub>().filter { it.getAliasName() == alias }
} }
} }
idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StubIndexServiceImpl.java
+5 -3
View File
@@ -24,6 +24,8 @@ import org.jetbrains.kotlin.psi.stubs.*;
import org.jetbrains.kotlin.psi.stubs.elements.StubIndexService; import org.jetbrains.kotlin.psi.stubs.elements.StubIndexService;
import org.jetbrains.kotlin.util.UtilPackage; import org.jetbrains.kotlin.util.UtilPackage;
import java.util.List;
public class StubIndexServiceImpl implements StubIndexService { public class StubIndexServiceImpl implements StubIndexService {
@Override @Override
@@ -127,9 +129,9 @@ public class StubIndexServiceImpl implements StubIndexService {
KotlinFileStub fileStub = getContainingFileStub(stub); KotlinFileStub fileStub = getContainingFileStub(stub);
if (fileStub != null) { if (fileStub != null) {
KotlinImportDirectiveStub aliasImportStub = fileStub.findImportByAlias(stub.getShortName()); List<KotlinImportDirectiveStub> aliasImportStubs = fileStub.findImportsByAlias(stub.getShortName());
if (aliasImportStub != null) { for (KotlinImportDirectiveStub importStub : aliasImportStubs) {
sink.occurrence(JetAnnotationsIndex.getInstance().getKey(), aliasImportStub.getImportedFqName().shortName().asString()); sink.occurrence(JetAnnotationsIndex.getInstance().getKey(), importStub.getImportedFqName().shortName().asString());
} }
} }
} }
idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt
+2 -1
View File
@@ -33,6 +33,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.stubindex.JetAnnotationsIndex import org.jetbrains.kotlin.idea.stubindex.JetAnnotationsIndex
import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType
import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
@@ -91,7 +92,7 @@ public class KotlinAnnotatedElementsSearcher : QueryExecutor<PsiModifierListOwne
return JetAnnotationsIndex.getInstance().get(name, annClass.getProject(), useScope) return JetAnnotationsIndex.getInstance().get(name, annClass.getProject(), useScope)
} }
return (useScope as LocalSearchScope).scope.flatMap { it.getChildrenOfType<JetAnnotationEntry>().asIterable() } return (useScope as LocalSearchScope).scope.flatMap { it.collectDescendantsOfType<JetAnnotationEntry>() }
}) })
} }