diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-07-25 20:12:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-24 20:55:36 +0000 |
| commit | 6044be7330c93bc8dacb0f63e62da8029f39a16f (patch) | |
| tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /java/java-impl/src/com/intellij/psi/impl/JavaCodeBlockModificationListener.java | |
| parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
| parent | e5266e2343c8d275d79fa0be725180d0fe3a993c (diff) | |
| download | idea-6044be7330c93bc8dacb0f63e62da8029f39a16f.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'java/java-impl/src/com/intellij/psi/impl/JavaCodeBlockModificationListener.java')
| -rw-r--r-- | java/java-impl/src/com/intellij/psi/impl/JavaCodeBlockModificationListener.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaCodeBlockModificationListener.java b/java/java-impl/src/com/intellij/psi/impl/JavaCodeBlockModificationListener.java index 18be9cd12246..314f55c2f7fe 100644 --- a/java/java-impl/src/com/intellij/psi/impl/JavaCodeBlockModificationListener.java +++ b/java/java-impl/src/com/intellij/psi/impl/JavaCodeBlockModificationListener.java @@ -16,6 +16,7 @@ package com.intellij.psi.impl; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.psi.*; import com.intellij.psi.impl.source.jsp.jspXml.JspDirective; import com.intellij.psi.util.PsiModificationTracker; @@ -90,7 +91,8 @@ public class JavaCodeBlockModificationListener implements PsiTreeChangePreproces } private static boolean isSourceDir(PsiElement element) { - return element instanceof PsiDirectory && JavaDirectoryService.getInstance().getPackage((PsiDirectory)element) != null; + return element instanceof PsiDirectory && + ProjectFileIndex.SERVICE.getInstance(element.getProject()).isInSource(((PsiDirectory)element).getVirtualFile()); } private static boolean isClassOwner(final PsiElement element) { |