notnull, toString

platform/core-api/src/com/intellij/psi/search/DelegatingGlobalSearchScope.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 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.
@@ -35,7 +35,7 @@ public class DelegatingGlobalSearchScope extends GlobalSearchScope {
     myEquality = ArrayUtil.EMPTY_OBJECT_ARRAY;
   }
 
-  public DelegatingGlobalSearchScope(GlobalSearchScope baseScope, Object... equality) {
+  public DelegatingGlobalSearchScope(@NotNull GlobalSearchScope baseScope, @NotNull Object... equality) {
     super(baseScope.getProject());
     myBaseScope = baseScope;
     myEquality = Arrays.asList(equality);

platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java

@@ -187,6 +187,11 @@ public abstract class GlobalSearchScope extends SearchScope implements ProjectAw
       public boolean isSearchOutsideRootModel() {
         return true;
       }
+
+      @Override
+      public String toString() {
+        return "NOT: "+myBaseScope;
+      }
     };
   }
 
@@ -568,6 +573,11 @@ public abstract class GlobalSearchScope extends SearchScope implements ProjectAw
     public GlobalSearchScope uniteWith(@NotNull final GlobalSearchScope scope) {
       return scope;
     }
+
+    @Override
+    public String toString() {
+      return "EMPTY";
+    }
   }
 
   public static final GlobalSearchScope EMPTY_SCOPE = new EmptyScope();
@@ -576,11 +586,10 @@ public abstract class GlobalSearchScope extends SearchScope implements ProjectAw
     private final VirtualFile myVirtualFile;
     private final Module myModule;
 
-    private FileScope(@NotNull Project project, final VirtualFile virtualFile) {
+    private FileScope(@NotNull Project project, VirtualFile virtualFile) {
       super(project);
       myVirtualFile = virtualFile;
-      myModule = virtualFile != null && !project.isDefault() ?
-                 FileIndexFacade.getInstance(project).getModuleForFile(virtualFile) : null;
+      myModule = virtualFile == null || project.isDefault() ? null : FileIndexFacade.getInstance(project).getModuleForFile(virtualFile);
     }
 
     @Override
@@ -602,12 +611,17 @@ public abstract class GlobalSearchScope extends SearchScope implements ProjectAw
     public boolean isSearchInLibraries() {
       return myModule == null;
     }
+
+    @Override
+    public String toString() {
+      return "File :"+myVirtualFile;
+    }
   }
 
   public static class FilesScope extends GlobalSearchScope {
     private final Collection<VirtualFile> myFiles;
 
-    public FilesScope(final Project project, final Collection<VirtualFile> files) {
+    public FilesScope(final Project project, @NotNull Collection<VirtualFile> files) {
       super(project);
       myFiles = files;
     }
@@ -642,5 +656,11 @@ public abstract class GlobalSearchScope extends SearchScope implements ProjectAw
     public int hashCode() {
       return myFiles.hashCode();
     }
+
+    @Override
+    public String toString() {
+      List<VirtualFile> files = myFiles.size() <= 20 ? new ArrayList<VirtualFile>(myFiles) : new ArrayList<VirtualFile>(myFiles).subList(0,20);
+      return "Files: ("+ files +")";
+    }
   }
 }

platform/core-impl/src/com/intellij/util/indexing/SubstitutedFileType.java

@@ -41,7 +41,7 @@ public class SubstitutedFileType extends LanguageFileType{
   }
 
   @NotNull
-  public static FileType substituteFileType(VirtualFile file, @NotNull FileType fileType, Project project) {
+  public static FileType substituteFileType(@NotNull VirtualFile file, @NotNull FileType fileType, Project project) {
     if (project == null) {
       return fileType;
     }
@@ -98,4 +98,9 @@ public class SubstitutedFileType extends LanguageFileType{
   public boolean isSameFileType() {
     return myFileType.equals(myOriginalFileType);
   }
+
+  @Override
+  public String toString() {
+    return "SubstitutedFileType: original="+myOriginalFileType+"; substituted="+myFileType;
+  }
 }