From 00778f674846836211176ce4f76ff45dac6081d4 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Mon, 24 Jun 2013 15:07:10 +0200 Subject: [PATCH] StructureViewComponent should return own editor on NAVIGATE_IN_EDITOR data request --- .../newStructureView/StructureViewComponent.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java b/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java index ebfa9210c64c..0c92af192181 100644 --- a/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java +++ b/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java @@ -16,7 +16,10 @@ package com.intellij.ide.structureView.newStructureView; -import com.intellij.ide.*; +import com.intellij.ide.CommonActionsManager; +import com.intellij.ide.CopyPasteDelegator; +import com.intellij.ide.DataManager; +import com.intellij.ide.PsiCopyPasteManager; import com.intellij.ide.structureView.*; import com.intellij.ide.structureView.impl.StructureViewFactoryImpl; import com.intellij.ide.structureView.impl.StructureViewState; @@ -35,6 +38,8 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileEditor.FileEditor; import com.intellij.openapi.fileEditor.FileEditorManager; +import com.intellij.openapi.fileEditor.OpenFileDescriptor; +import com.intellij.openapi.fileEditor.TextEditor; import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.SimpleToolWindowPanel; @@ -760,6 +765,9 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre if (PlatformDataKeys.FILE_EDITOR.is(dataId)) { return myFileEditor; } + if (OpenFileDescriptor.NAVIGATE_IN_EDITOR.is(dataId) && myFileEditor instanceof TextEditor) { + return ((TextEditor)myFileEditor).getEditor(); + } if (PlatformDataKeys.CUT_PROVIDER.is(dataId)) { return myCopyPasteDelegator.getCutProvider(); }