MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

RUBY-27578 Fix filtering elements in rbs navbar

Browse Source 
IJ-CR-9556

GitOrigin-RevId: ad88407adffd5220e24876ac91a1c44f006db22b
This commit is contained in:
Dmitry Pogrebnoy
2021-07-13 19:15:34 +00:00
committed by intellij-monorepo-bot
parent a9a539ce2d
commit ff5e7c58bd
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/services/ServiceViewNavBarPanel.java
+1 -1
View File
@@ -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());
}
platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java
+1 -1
View File
@@ -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);
platform/lang-impl/src/com/intellij/ide/navigationToolbar/StructureAwareNavBarModelExtension.kt
+1 -1
View File
@@ -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 }
platform/lang-impl/src/com/intellij/ide/structureView/symbol/SymbolBasedStructureViewModel.java
+1 -1
View File
@@ -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