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

IdeStubIndexService: do not index annotations without name

Browse Source 
Fixes NPE after changes introduced in 8f8cbfcfa5
This commit is contained in:
Pavel V. Talanov
2018-02-22 15:10:25 +01:00
parent d7644559eb
commit 10f6d65e03
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java
+6 -2
View File
@@ -223,11 +223,15 @@ public class IdeStubIndexService extends StubIndexService {
@Override
public void indexAnnotation(KotlinAnnotationEntryStub stub, IndexSink sink) {
sink.occurrence(KotlinAnnotationsIndex.getInstance().getKey(), stub.getShortName());
String name = stub.getShortName();
if (name == null) {
return;
}
sink.occurrence(KotlinAnnotationsIndex.getInstance().getKey(), name);
KotlinFileStub fileStub = getContainingFileStub(stub);
if (fileStub != null) {
List<KotlinImportDirectiveStub> aliasImportStubs = fileStub.findImportsByAlias(stub.getShortName());
List<KotlinImportDirectiveStub> aliasImportStubs = fileStub.findImportsByAlias(name);
for (KotlinImportDirectiveStub importStub : aliasImportStubs) {
sink.occurrence(KotlinAnnotationsIndex.getInstance().getKey(), importStub.getImportedFqName().shortName().asString());
}