From 407e1705859e3764924625f66bc1763422664812 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Mon, 29 Feb 2016 20:25:23 +0300 Subject: [PATCH] PY-16577 Project Structure settings don't work for IPython Notebook --- .../plugins/ipnb/editor/panels/IpnbFilePanel.java | 4 ++++ .../src/org/jetbrains/plugins/ipnb/psi/IpnbPyFragment.java | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/IpnbFilePanel.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/IpnbFilePanel.java index 47915f6d5f09..524e4f4aa438 100644 --- a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/IpnbFilePanel.java +++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/IpnbFilePanel.java @@ -604,4 +604,8 @@ public class IpnbFilePanel extends JPanel implements Scrollable, DataProvider, D public VirtualFile getVirtualFile() { return myVirtualFile; } + + public Document getDocument() { + return myDocument; + } } diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyFragment.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyFragment.java index a787ad9670be..289b9bd81dc1 100644 --- a/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyFragment.java +++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyFragment.java @@ -72,6 +72,13 @@ public class IpnbPyFragment extends PyFileImpl { return getManager().findDirectory(parentFile); } + @NotNull + @Override + public PsiFile getOriginalFile() { + final PsiFile psiFile = PsiDocumentManager.getInstance(getProject()).getPsiFile(myFilePanel.getDocument()); + return psiFile != null ? psiFile : super.getOriginalFile(); + } + @Override public PsiElement getNextSibling() { return null;