diff options
Diffstat (limited to 'platform/analysis-api/src/com/intellij/psi')
-rw-r--r-- | platform/analysis-api/src/com/intellij/psi/search/scope/NonProjectFilesScope.java | 4 | ||||
-rw-r--r-- | platform/analysis-api/src/com/intellij/psi/search/scope/ProjectProductionScope.java | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/platform/analysis-api/src/com/intellij/psi/search/scope/NonProjectFilesScope.java b/platform/analysis-api/src/com/intellij/psi/search/scope/NonProjectFilesScope.java index 63fe1c8d28e5..ca229a64bebc 100644 --- a/platform/analysis-api/src/com/intellij/psi/search/scope/NonProjectFilesScope.java +++ b/platform/analysis-api/src/com/intellij/psi/search/scope/NonProjectFilesScope.java @@ -17,6 +17,7 @@ package com.intellij.psi.search.scope; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vfs.NonPhysicalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.search.ProjectScope; import com.intellij.psi.search.scope.packageSet.AbstractPackageSet; @@ -43,7 +44,8 @@ public class NonProjectFilesScope extends NamedScope { @Override public boolean contains(VirtualFile file, @NotNull Project project, @Nullable NamedScopesHolder holder) { - if (file == null) return true; + // do not include fake-files e.g. fragment-editors, database consoles, etc. + if (file == null || file.getFileSystem() instanceof NonPhysicalFileSystem) return false; if (!file.isInLocalFileSystem()) return true; if (isInsideProjectContent(project, file)) return false; return !ProjectScope.getProjectScope(project).contains(file); diff --git a/platform/analysis-api/src/com/intellij/psi/search/scope/ProjectProductionScope.java b/platform/analysis-api/src/com/intellij/psi/search/scope/ProjectProductionScope.java index 7d44b0f91450..19788a0bd3d7 100644 --- a/platform/analysis-api/src/com/intellij/psi/search/scope/ProjectProductionScope.java +++ b/platform/analysis-api/src/com/intellij/psi/search/scope/ProjectProductionScope.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,8 +30,10 @@ import org.jetbrains.annotations.Nullable; * @author Konstantin Bulenkov */ public class ProjectProductionScope extends NamedScope { + public static final String NAME = IdeBundle.message("predefined.scope.production.name"); + public ProjectProductionScope() { - super(IdeBundle.message("predefined.scope.production.name"), new AbstractPackageSet("src:*..*") { + super(NAME, new AbstractPackageSet("src:*..*") { @Override public boolean contains(VirtualFile file, NamedScopesHolder holder) { return contains(file, holder.getProject(), holder); |