From ab41fa29f1287ebc78f792d2efe65ef80f5e8a7c Mon Sep 17 00:00:00 2001 From: "Andrei.Kuznetsov" Date: Wed, 1 Jan 2025 23:40:14 +0100 Subject: [PATCH] IJPL-3020: rename SingleProviderIterator>ScanningUtil GitOrigin-RevId: 94ac25fa153d778f895bebe37ce73fb987cdfe00 --- .../{SingleProviderIterator.java => ScanningUtil.java} | 8 ++++---- .../intellij/util/indexing/UnindexedFilesScanner.kt | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) rename platform/lang-impl/src/com/intellij/util/indexing/{SingleProviderIterator.java => ScanningUtil.java} (93%) diff --git a/platform/lang-impl/src/com/intellij/util/indexing/SingleProviderIterator.java b/platform/lang-impl/src/com/intellij/util/indexing/ScanningUtil.java similarity index 93% rename from platform/lang-impl/src/com/intellij/util/indexing/SingleProviderIterator.java rename to platform/lang-impl/src/com/intellij/util/indexing/ScanningUtil.java index e2199ecf052b..0ea4e7c4e5a6 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/SingleProviderIterator.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/ScanningUtil.java @@ -23,7 +23,7 @@ import java.util.List; import static com.intellij.openapi.roots.impl.PushedFilePropertiesUpdaterImpl.getImmediateValuesEx; import static com.intellij.openapi.roots.impl.PushedFilePropertiesUpdaterImpl.getModuleImmediateValues; -final class SingleProviderIterator implements ContentIterator { +final class ScanningUtil implements ContentIterator { private final Project project; private final PerProjectIndexingQueue.PerProviderSink perProviderSink; private final CheckPauseOnlyProgressIndicator indicator; @@ -35,9 +35,9 @@ final class SingleProviderIterator implements ContentIterator { private final PushedFilePropertiesUpdater pushedFilePropertiesUpdater; private final boolean mayBeUsed; - SingleProviderIterator(Project project, @NotNull CheckPauseOnlyProgressIndicator indicator, IndexableFilesIterator provider, - UnindexedFilesFinder unindexedFileFinder, ScanningStatistics scanningStatistics, - PerProjectIndexingQueue.PerProviderSink perProviderSink) { + ScanningUtil(Project project, @NotNull CheckPauseOnlyProgressIndicator indicator, IndexableFilesIterator provider, + UnindexedFilesFinder unindexedFileFinder, ScanningStatistics scanningStatistics, + PerProjectIndexingQueue.PerProviderSink perProviderSink) { this.project = project; this.indicator = indicator; this.unindexedFileFinder = unindexedFileFinder; diff --git a/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesScanner.kt b/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesScanner.kt index 3ce0f9ddc583..df6060da58e7 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesScanner.kt +++ b/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesScanner.kt @@ -429,7 +429,7 @@ class UnindexedFilesScanner ( ) { runBlockingCancellable { withContext(SCANNING_DISPATCHER) { - providers.forEachConcurrent(SCANNING_PARALLELISM) { provider -> + providers.forEachConcurrent(SCANNING_PARALLELISM) { provider -> try { scanSingleProvider(provider, sessions, indexableFilesDeduplicateFilter, sharedExplanationLogger) } @@ -504,9 +504,9 @@ class UnindexedFilesScanner ( readAction { val finder = UnindexedFilesFinder(project, sharedExplanationLogger, forceReindexingTrigger, scanningRequest, filterHandler) - val rootIterator = SingleProviderIterator(project, indicator, provider, finder, - scanningStatistics, perProviderSink) - if (!rootIterator.mayBeUsed()) { + val scanningUtil = ScanningUtil(project, indicator, provider, finder, + scanningStatistics, perProviderSink) + if (!scanningUtil.mayBeUsed()) { LOG.warn("Iterator based on $provider can't be used.") return@readAction } @@ -514,7 +514,7 @@ class UnindexedFilesScanner ( val file = files.removeFirst() try { if (file.isValid) - rootIterator.processFile(file) + scanningUtil.processFile(file) } catch (e: ProcessCanceledException) { files.addFirst(file)