diff --git a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerHierarchySearchType.java b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerHierarchySearchType.java index eec3b5c94f22..775757bff5ed 100644 --- a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerHierarchySearchType.java +++ b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerHierarchySearchType.java @@ -39,7 +39,7 @@ enum CompilerHierarchySearchType { } @Override - Object[] convertIdToSearchableArray(Collection lightRef, ByteArrayEnumerator byteArrayEnumerator) { + Object[] convertToIds(Collection lightRef, ByteArrayEnumerator byteArrayEnumerator) { return lightRef.stream().map(r -> byteArrayEnumerator.getName(((LightRef.LightClassHierarchyElementDef)r).getName())).toArray(String[]::new); } }, @@ -58,7 +58,7 @@ enum CompilerHierarchySearchType { } @Override - Object[] convertIdToSearchableArray(Collection lightRef, ByteArrayEnumerator byteArrayEnumerator) { + Object[] convertToIds(Collection lightRef, ByteArrayEnumerator byteArrayEnumerator) { return lightRef.stream().map(r -> ((LightRef.LightFunExprDef) r).getId()).toArray(Integer[]::new); } }; @@ -70,5 +70,5 @@ enum CompilerHierarchySearchType { abstract Class getRequiredClass(LanguageLightRefAdapter adapter); - abstract Object[] convertIdToSearchableArray(Collection lightRef, ByteArrayEnumerator byteArrayEnumerator); + abstract Object[] convertToIds(Collection lightRef, ByteArrayEnumerator byteArrayEnumerator); } diff --git a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceReader.java b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceReader.java index f61d16e43872..aa3925243475 100644 --- a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceReader.java +++ b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceReader.java @@ -105,7 +105,7 @@ class CompilerReferenceReader { } }) .filter(Objects::nonNull) - .collect(groupingBy(x -> x.containingFile, mapping(x -> x.def, collectingAndThen(toList(), l -> searchType.convertIdToSearchableArray(l, myIndex.getByteSeqEum()))))); + .collect(groupingBy(x -> x.containingFile, mapping(x -> x.def, collectingAndThen(toList(), l -> searchType.convertToIds(l, myIndex.getByteSeqEum()))))); } return candidatesPerFile.isEmpty() ? Collections.emptyMap() : candidatesPerFile;