name made less comprehensivier but shorter for IDEA-CR-35373 phpstorm/183.1125
authorAlexey Kudravtsev <cdr@intellij.com>
Thu, 26 Jul 2018 15:50:41 +0000 (18:50 +0300)
committerAlexey Kudravtsev <cdr@intellij.com>
Thu, 26 Jul 2018 15:53:05 +0000 (18:53 +0300)
platform/core-api/src/com/intellij/openapi/roots/FileIndexFacade.java
platform/core-impl/src/com/intellij/psi/search/ProjectScopeImpl.java
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectFileIndexFacade.java

index 62c1cef193731e122fdb1f672fcdb623979227fa..8573184b809344a4fc3f35ff145358ed9a6f49f3 100644 (file)
@@ -80,7 +80,7 @@ public abstract class FileIndexFacade {
   /**
    * @return true if the {@code file} is {@link #isInContent} except when it's in {@link #isInLibraryClasses} and not in {@link #isInLibrarySource}
    */
-  public boolean isInContentExceptLibraryClassesWithoutSources(@NotNull VirtualFile file) {
+  public boolean isInProjectScope(@NotNull VirtualFile file) {
     if (file instanceof VirtualFileWindow) return true;
 
     if (isInLibraryClasses(file) && !isInSourceContent(file)) return false;
index bfcf5794b1b96d3bc3131b5bf11aac80a93c1d26..df0f2b0300fd2b0ce07dd547810fe63e77895c80 100644 (file)
@@ -35,7 +35,7 @@ public class ProjectScopeImpl extends GlobalSearchScope {
 
   @Override
   public boolean contains(@NotNull VirtualFile file) {
-    return myFileIndex.isInContentExceptLibraryClassesWithoutSources(file);
+    return myFileIndex.isInProjectScope(file);
   }
 
   @Override
index fa6bf75721116557e9db304c4842c98738fdc513..dcd1e8da15dcec65d3f64812a1ea3e9fa7901a19 100644 (file)
@@ -111,7 +111,7 @@ public class ProjectFileIndexFacade extends FileIndexFacade {
   }
 
   @Override
-  public boolean isInContentExceptLibraryClassesWithoutSources(@NotNull VirtualFile file) {
+  public boolean isInProjectScope(@NotNull VirtualFile file) {
     // optimization: equivalent to the super method but has fewer getInfoForFile() calls
     if (file instanceof VirtualFileWindow) return true;
     DirectoryInfo info = myDirectoryIndex.getInfoForFile(file);