From b004ea25b9e947ac47f127a405bbf0da4316103c Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 26 Sep 2018 15:56:53 +0300
Subject: [PATCH] cleanup

---
 .../unusedReturnValue/UnusedReturnValue.java  |  7 +++----
 .../UnusedReturnValueLocalInspection.java     |  2 +-
 .../util/indexing/FileBasedIndexImpl.java     | 19 +++++++++----------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java b/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java
index fb801b865749..55e043aad84e 100644
--- a/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java
+++ b/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java
@@ -21,7 +21,6 @@ import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.codeInspection.*;
 import com.intellij.codeInspection.reference.*;
 import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
-import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
 import com.intellij.codeInspection.unusedSymbol.VisibilityModifierChooser;
 import com.intellij.openapi.ui.LabeledComponent;
 import com.intellij.openapi.util.WriteExternalException;
@@ -73,7 +72,7 @@ public class UnusedReturnValue extends GlobalJavaBatchInspectionTool{
         if (refMethod.isExternalOverride() && !isNative) return null;
         if (RefUtil.isImplicitRead(psiMethod)) return null;
         if (canIgnoreReturnValue(psiMethod)) return null;
-        return new ProblemDescriptor[]{createProblemDescriptor(psiMethod, manager, processor, isNative)};
+        return new ProblemDescriptor[]{createProblemDescriptor(psiMethod, manager, processor, isNative, false)};
       }
     }
 
@@ -164,11 +163,11 @@ public class UnusedReturnValue extends GlobalJavaBatchInspectionTool{
   static ProblemDescriptor createProblemDescriptor(@NotNull PsiMethod psiMethod,
                                                    @NotNull InspectionManager manager,
                                                    @Nullable ProblemDescriptionsProcessor processor,
-                                                   boolean isNative) {
+                                                   boolean isNative, boolean isOnTheFly) {
     return manager.createProblemDescriptor(psiMethod.getNameIdentifier(),
                                            InspectionsBundle.message("inspection.unused.return.value.problem.descriptor"),
                                            isNative ? null : new MakeVoidQuickFix(processor),
                                            ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
-                                           false);
+                                           isOnTheFly);
   }
 }
diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValueLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValueLocalInspection.java
index 3960180cd09a..49c30dd703bd 100644
--- a/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValueLocalInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValueLocalInspection.java
@@ -71,7 +71,7 @@ public class UnusedReturnValueLocalInspection extends AbstractBaseJavaLocalInspe
              PsiType.VOID.equals(LambdaUtil.getFunctionalInterfaceReturnType((PsiFunctionalExpression)element));
     })) {
       if (atLeastOneUsageExists[0]) {
-        return new ProblemDescriptor[]{UnusedReturnValue.createProblemDescriptor(method, manager, null, false)};
+        return new ProblemDescriptor[]{UnusedReturnValue.createProblemDescriptor(method, manager, null, false, isOnTheFly)};
       }
     }
     return null;
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
index d16a186ef4c3..1c90e734c2b0 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
@@ -136,7 +136,7 @@ public class FileBasedIndexImpl extends FileBasedIndex implements BaseComponent,
   private final Set<Project> myProjectsBeingUpdated = ContainerUtil.newConcurrentSet();
   private final IndexAccessValidator myAccessValidator = new IndexAccessValidator();
 
-  @SuppressWarnings({"FieldCanBeLocal", "UnusedDeclaration"}) private volatile boolean myInitialized;
+  private volatile boolean myInitialized;
 
   private Future<IndexConfiguration> myStateFuture;
   private volatile IndexConfiguration myState;
@@ -274,15 +274,14 @@ public class FileBasedIndexImpl extends FileBasedIndex implements BaseComponent,
     }
   }
 
-  boolean processChangedFiles(@NotNull Project project, Processor<VirtualFile> processor) {
-    Set<VirtualFile> changed = new THashSet<>();
-
-    Stream<VirtualFile> stream = Stream.concat(
-      myChangedFilesCollector.myVfsEventsMerger.getChangedFiles(), // avoid missing files when events are processed concurrently
-      myChangedFilesCollector.myFilesToUpdate.values().stream()
-    ).filter(filesToBeIndexedForProjectCondition(project)).filter(changed::add);
-
-    return ContainerUtil.process(stream::iterator, processor);
+  boolean processChangedFiles(@NotNull Project project, @NotNull Processor<? super VirtualFile> processor) {
+    // avoid missing files when events are processed concurrently
+    return Stream.concat(myChangedFilesCollector.myVfsEventsMerger.getChangedFiles(),
+                         myChangedFilesCollector.myFilesToUpdate.values().stream())
+      .filter(filesToBeIndexedForProjectCondition(project))
+      .distinct()
+      .mapToInt(f -> processor.process(f) ? 1 : 0)
+      .allMatch(success -> success == 1);
   }
 
   public static boolean isProjectOrWorkspaceFile(@NotNull VirtualFile file, @Nullable FileType fileType) {