Commit aae4c6c1 authored by Daniil Ovchinnikov's avatar Daniil Ovchinnikov Committed by intellij-monorepo-bot
Browse files

IDEA-299807 support select in navigation bar target

GitOrigin-RevId: 2c31982a34a6e167604e760cdd24f035ad6a048e
parent d28668fb
Showing with 13 additions and 3 deletions
+13 -3
......@@ -64,6 +64,10 @@ internal class NavBarService(private val project: Project) : Disposable {
}
}
fun selectTail() {
staticNavBarVm.vm.value?.selectTail()
}
private fun showFloatingNavbar(dataContext: DataContext) {
cs.launch(ModalityState.current().asContextElement()) {
val model = contextModel(dataContext, project).ifEmpty {
......
......@@ -6,6 +6,7 @@ import com.intellij.ide.IdeBundle;
import com.intellij.ide.StandardTargetWeights;
import com.intellij.ide.impl.SelectInTargetPsiWrapper;
import com.intellij.ide.navbar.ide.NavBarIdeUtil;
import com.intellij.ide.navbar.ide.NavBarService;
import com.intellij.ide.ui.UISettings;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.project.DumbAware;
......@@ -39,19 +40,24 @@ final class SelectInNavBarTarget extends SelectInTargetPsiWrapper implements Dum
@Override
protected boolean canSelect(final PsiFileSystemItem file) {
if (NavBarIdeUtil.isNavbarV2Enabled()) {
return false;
}
return UISettings.getInstance().getShowNavigationBar();
}
@Override
protected void select(final Object selector, final VirtualFile virtualFile, final boolean requestFocus) {
if (NavBarIdeUtil.isNavbarV2Enabled()) {
NavBarService.getInstance(myProject).selectTail();
return;
}
selectInNavBar(false);
}
@Override
protected void select(final PsiElement element, boolean requestFocus) {
if (NavBarIdeUtil.isNavbarV2Enabled()) {
NavBarService.getInstance(myProject).selectTail();
return;
}
selectInNavBar(false);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment