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

IDEA-185359 Focus jumps to parent folder after item rename

Browse Source
This commit is contained in:
Sergey Malenkov
2018-01-22 22:15:37 +03:00
parent 42c7b46fa2
commit ee2feb681e
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ui/tree/RestoreSelectionListener.java
+19 -17
View File
@@ -1,6 +1,4 @@
/*
* Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.ui.tree;
import org.jetbrains.annotations.NotNull;
@@ -11,6 +9,7 @@ import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.TreePath;
import static com.intellij.util.ui.tree.TreeUtil.visitVisibleRows;
import static java.awt.EventQueue.invokeLater;
/**
* Temporary solution to restore selection in a tree.
@@ -26,21 +25,24 @@ public final class RestoreSelectionListener implements TreeSelectionListener {
if (source instanceof JTree) {
JTree tree = (JTree)source;
if (tree.getSelectionModel().isSelectionEmpty()) {
// restore a path selection only if nothing is selected now
Reference<TreePath> reference = new Reference<>();
TreeVisitor visitor = new TreeVisitor.ByTreePath<Object>(path, o -> o) {
@NotNull
@Override
protected Action visit(@NotNull TreePath path, Object component) {
Action action = super.visit(path, component);
if (action == Action.CONTINUE) reference.set(path);
return action;
invokeLater(() -> {
// restore selection later, because nodes are removed before they are inserted
if (tree.getSelectionModel().isSelectionEmpty()) {
// restore a path selection only if nothing is selected now
Reference<TreePath> reference = new Reference<>();
TreeVisitor visitor = new TreeVisitor.ByTreePath<Object>(path, o -> o) {
@NotNull
@Override
protected Action visit(@NotNull TreePath path, Object component) {
Action action = super.visit(path, component);
if (action == Action.CONTINUE || action == Action.INTERRUPT) reference.set(path);
return action;
}
};
visitVisibleRows(tree, visitor);
tree.setSelectionPath(reference.get());
}
};
if (visitVisibleRows(tree, visitor) == null) {
// select last visible parent only if the given path is not visible anymore
tree.setSelectionPath(reference.get());
}
});
}
}
}