From ff5e7c58bd36cb791469ed98bdec60a38b1d4014 Mon Sep 17 00:00:00 2001
From: Dmitry Pogrebnoy <dmitry.pogrebnoy@jetbrains.com>
Date: Tue, 13 Jul 2021 19:15:34 +0000
Subject: [PATCH] RUBY-27578 Fix filtering elements in rbs navbar

IJ-CR-9556

GitOrigin-RevId: ad88407adffd5220e24876ac91a1c44f006db22b
---
 .../com/intellij/execution/services/ServiceViewNavBarPanel.java | 2 +-
 .../src/com/intellij/ide/navigationToolbar/NavBarModel.java     | 2 +-
 .../ide/navigationToolbar/StructureAwareNavBarModelExtension.kt | 2 +-
 .../ide/structureView/symbol/SymbolBasedStructureViewModel.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/services/ServiceViewNavBarPanel.java b/platform/lang-impl/src/com/intellij/execution/services/ServiceViewNavBarPanel.java
index 5be8912a9715..cefb4fe0c36b 100644
--- a/platform/lang-impl/src/com/intellij/execution/services/ServiceViewNavBarPanel.java
+++ b/platform/lang-impl/src/com/intellij/execution/services/ServiceViewNavBarPanel.java
@@ -122,7 +122,7 @@ final class ServiceViewNavBarPanel extends NavBarPanel {
     }
 
     @Override
-    protected List<Object> getChildren(Object object) {
+    public List<Object> getChildren(Object object) {
       if (object == myRoot) {
         return new ArrayList<>(myViewModel.getVisibleRoots());
       }
diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java
index f5e5d7bbfc80..a18a2b754cde 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java
@@ -323,7 +323,7 @@ public class NavBarModel {
     return child;
   }
 
-  protected List<Object> getChildren(final Object object) {
+  public List<Object> getChildren(final Object object) {
     final List<Object> result = new ArrayList<>();
     PairProcessor<Object, NavBarModelExtension> processor = (o, ext) -> {
       ContainerUtil.addIfNotNull(result, o instanceof PsiElement && ext.normalizeChildren() ? normalize((PsiElement)o) : o);
diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/StructureAwareNavBarModelExtension.kt b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/StructureAwareNavBarModelExtension.kt
index b448712ab92e..46c9c1647626 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/StructureAwareNavBarModelExtension.kt
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/StructureAwareNavBarModelExtension.kt
@@ -93,7 +93,7 @@ abstract class StructureAwareNavBarModelExtension : AbstractNavBarModelExtension
     return null
   }
 
-  private fun buildStructureViewModel(file: PsiFile, editor: Editor? = null): StructureViewModel? {
+  protected fun buildStructureViewModel(file: PsiFile, editor: Editor? = null): StructureViewModel? {
     if (currentFile?.get() == file && currentFileModCount == file.modificationStamp) {
       if (editor == null) {
         currentFileStructure?.get()?.let { return it }
diff --git a/platform/lang-impl/src/com/intellij/ide/structureView/symbol/SymbolBasedStructureViewModel.java b/platform/lang-impl/src/com/intellij/ide/structureView/symbol/SymbolBasedStructureViewModel.java
index 5b772380aed1..4dd08ad1b50d 100644
--- a/platform/lang-impl/src/com/intellij/ide/structureView/symbol/SymbolBasedStructureViewModel.java
+++ b/platform/lang-impl/src/com/intellij/ide/structureView/symbol/SymbolBasedStructureViewModel.java
@@ -32,7 +32,7 @@ public abstract class SymbolBasedStructureViewModel extends TextEditorBasedStruc
   }
 
   @NotNull
-  ArrayList<StructureViewTreeElement> collectClosestChildrenSymbols(@NotNull PsiElement rootElement) {
+  public ArrayList<StructureViewTreeElement> collectClosestChildrenSymbols(@NotNull PsiElement rootElement) {
     var result = new ArrayList<StructureViewTreeElement>();
     PsiElementVisitor visitor = new PsiElementVisitor() {
       @Override