From 35df55859549cb50674114aaacf1353c44010aec Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Mon, 27 Feb 2012 21:23:51 +0400 Subject: [PATCH] OC-2974: More correct definition of what's outside the project (takes certain extension points into an account) --- .../com/intellij/psi/search/scope/NonProjectFilesScope.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/NonProjectFilesScope.java b/platform/lang-api/src/com/intellij/psi/search/scope/NonProjectFilesScope.java index e7a9c5557845..ca2e3c6eb61f 100644 --- a/platform/lang-api/src/com/intellij/psi/search/scope/NonProjectFilesScope.java +++ b/platform/lang-api/src/com/intellij/psi/search/scope/NonProjectFilesScope.java @@ -18,6 +18,7 @@ package com.intellij.psi.search.scope; import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.psi.search.ProjectScope; import com.intellij.psi.search.scope.packageSet.AbstractPackageSet; import com.intellij.psi.search.scope.packageSet.NamedScope; import com.intellij.psi.search.scope.packageSet.NamedScopesHolder; @@ -37,8 +38,7 @@ public class NonProjectFilesScope extends NamedScope { super(NAME, new AbstractPackageSet("NonProject") { public boolean contains(VirtualFile file, NamedScopesHolder holder) { if (file == null) return true; - final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(holder.getProject()).getFileIndex(); - return !(holder.getProject().isInitialized() && !fileIndex.isIgnored(file) && fileIndex.getContentRootForFile(file) != null); + return !ProjectScope.getProjectScope(holder.getProject()).contains(file); } }); }