From 7ec28c22dafffb48780dd990839aa4595f834b3e Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 28 Oct 2013 17:21:09 +0400 Subject: [PATCH] more granular "too many usages" warning --- platform/core-api/src/com/intellij/psi/PsiElement.java | 3 +-- .../src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java | 2 +- .../usageView/src/com/intellij/usages/impl/UsageViewImpl.java | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/core-api/src/com/intellij/psi/PsiElement.java b/platform/core-api/src/com/intellij/psi/PsiElement.java index 8c38065ced9d..7db1ad578110 100644 --- a/platform/core-api/src/com/intellij/psi/PsiElement.java +++ b/platform/core-api/src/com/intellij/psi/PsiElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2013 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. @@ -445,7 +445,6 @@ public interface PsiElement extends UserDataHolder, Iconable { * for processing to the specified scope processor. * * @param processor the processor receiving the declarations. - * @param state * @param lastParent the child of this element has been processed during the previous * step of the tree up walk (declarations under this element do not need * to be processed again) diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java index 70c5ae89878f..83543905223e 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java @@ -766,7 +766,6 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { return processPsiFileRootsAsync(files, totalSize, alreadyProcessedFiles, progress, new Processor() { @Override public boolean process(final PsiFile psiRoot) { - TooManyUsagesStatus.getFrom(progress).pauseProcessingIfTooManyUsages(); final VirtualFile vfile = ApplicationManager.getApplication().runReadAction(new Computable() { @Override public VirtualFile compute() { @@ -775,6 +774,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { }); for (final RequestWithProcessor singleRequest : candidateFiles.get(vfile)) { Processor localProcessor = localProcessors.get(singleRequest); + TooManyUsagesStatus.getFrom(progress).pauseProcessingIfTooManyUsages(); if (!localProcessor.process(psiRoot)) { return false; } diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java index 848128bb08e5..eba23c21acb0 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java @@ -796,6 +796,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra @Override public boolean process(final Usage usage) { if (searchHasBeenCancelled()) return false; + TooManyUsagesStatus.getFrom(indicator).pauseProcessingIfTooManyUsages(); boolean incrementCounter = !com.intellij.usages.UsageViewManager.isSelfUsage(usage, myTargets); @@ -808,6 +809,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra } } ApplicationManager.getApplication().runReadAction(new Runnable() { + @Override public void run() { appendUsage(usage); }