From 10f6d65e037eccf19d9e89d778676437bf2e1b87 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 22 Feb 2018 15:10:25 +0100 Subject: [PATCH] IdeStubIndexService: do not index annotations without name Fixes NPE after changes introduced in 8f8cbfcfa5b701f29d4859c07ff4b97b65d09c6c --- .../kotlin/idea/stubindex/IdeStubIndexService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java index 9f8d8431ed0..f400f1e3ebd 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java @@ -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 aliasImportStubs = fileStub.findImportsByAlias(stub.getShortName()); + List aliasImportStubs = fileStub.findImportsByAlias(name); for (KotlinImportDirectiveStub importStub : aliasImportStubs) { sink.occurrence(KotlinAnnotationsIndex.getInstance().getKey(), importStub.getImportedFqName().shortName().asString()); }