MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

instead of complicated DumbAware checking, just don't run inspections in dumb mode (EA-70824 - assert: DumbServiceImpl.waitForSmartMode)

Browse Source
This commit is contained in:
peter
2015-07-17 13:34:56 +02:00
parent 07585a7210
commit e71bc7d89c
3 changed files with 18 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/analysis-impl/src/com/intellij/codeInspection/InspectionEngine.java
+7 -19
View File
@@ -30,8 +30,6 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.EmptyProgressIndicator;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.Conditions;
import com.intellij.openapi.util.ProperTextRange;
@@ -117,7 +115,7 @@ public class InspectionEngine {
Divider.divideInsideAndOutside(file, range.getStartOffset(), range.getEndOffset(), range, elements, new ArrayList<ProperTextRange>(),
Collections.<PsiElement>emptyList(), Collections.<ProperTextRange>emptyList(), true, Conditions.<PsiFile>alwaysTrue());
MultiMap<LocalInspectionToolWrapper, String> toolToLanguages = getToolsForElements(toolWrappers, DumbService.isDumb(file.getProject()), elements, Collections.<PsiElement>emptyList());
MultiMap<LocalInspectionToolWrapper, String> toolToLanguages = getToolsForElements(toolWrappers, elements, Collections.<PsiElement>emptyList());
List<Map.Entry<LocalInspectionToolWrapper, Collection<String>>> entries = new ArrayList<Map.Entry<LocalInspectionToolWrapper, Collection<String>>>(toolToLanguages.entrySet());
Processor<Map.Entry<LocalInspectionToolWrapper, Collection<String>>> processor = new Processor<Map.Entry<LocalInspectionToolWrapper, Collection<String>>>() {
@Override
@@ -236,7 +234,6 @@ public class InspectionEngine {
@NotNull
public static <T extends InspectionToolWrapper> MultiMap<T, String> getToolsForElements(@NotNull List<T> toolWrappers,
boolean checkDumbAwareness,
@NotNull List<PsiElement> inside,
@NotNull List<PsiElement> outside) {
Set<Language> languages = new SmartHashSet<Language>();
@@ -261,29 +258,20 @@ public class InspectionEngine {
ProgressManager.checkCanceled();
String language = wrapper.getLanguage();
if (language == null) {
InspectionProfileEntry tool = wrapper.getTool();
if (!checkDumbAwareness || tool instanceof DumbAware) {
toolToLanguages.put(wrapper, null);
}
toolToLanguages.put(wrapper, null);
continue;
}
Language lang = langIds.get(language);
if (lang != null) {
InspectionProfileEntry tool = wrapper.getTool();
if (!checkDumbAwareness || tool instanceof DumbAware) {
toolToLanguages.putValue(wrapper, language);
if (wrapper.applyToDialects()) {
for (Language dialect : lang.getDialects()) {
toolToLanguages.putValue(wrapper, dialect.getID());
}
toolToLanguages.putValue(wrapper, language);
if (wrapper.applyToDialects()) {
for (Language dialect : lang.getDialects()) {
toolToLanguages.putValue(wrapper, dialect.getID());
}
}
}
else if (wrapper.applyToDialects() && dialects.contains(language)) {
InspectionProfileEntry tool = wrapper.getTool();
if (!checkDumbAwareness || tool instanceof DumbAware) {
toolToLanguages.putValue(wrapper, language);
}
toolToLanguages.putValue(wrapper, language);
}
}
return toolToLanguages;
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java
+11 -17
View File
@@ -44,8 +44,6 @@ import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.util.*;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.profile.codeInspection.InspectionProjectProfileManager;
@@ -73,7 +71,7 @@ import java.util.concurrent.ConcurrentMap;
/**
* @author max
*/
public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass implements DumbAware {
public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.LocalInspectionsPass");
public static final TextRange EMPTY_PRIORITY_RANGE = TextRange.EMPTY_RANGE;
private static final Condition<PsiFile> FILE_FILTER = new Condition<PsiFile>() {
@@ -141,7 +139,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
if (!HighlightingLevelManager.getInstance(myProject).shouldInspect(getFile())) return;
final InspectionManager iManager = InspectionManager.getInstance(myProject);
final InspectionProfileWrapper profile = myProfileWrapper;
inspect(getInspectionTools(profile), iManager, true, true, DumbService.isDumb(myProject), progress);
inspect(getInspectionTools(profile), iManager, true, true, progress);
}
finally {
disposeDescriptors();
@@ -156,7 +154,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
@NotNull final InspectionManager iManager,
@NotNull final List<LocalInspectionToolWrapper> toolWrappers) {
final ProgressIndicator progress = ProgressManager.getInstance().getProgressIndicator();
inspect(new ArrayList<LocalInspectionToolWrapper>(toolWrappers), iManager, false, false, false, progress);
inspect(new ArrayList<LocalInspectionToolWrapper>(toolWrappers), iManager, false, false, progress);
addDescriptorsFromInjectedResults(iManager, context);
List<InspectionResult> resultList = result.get(getFile());
if (resultList == null) return;
@@ -218,7 +216,6 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
@NotNull final InspectionManager iManager,
final boolean isOnTheFly,
boolean failFastOnAcquireReadAction,
boolean checkDumbAwareness,
@NotNull final ProgressIndicator progress) {
myFailFastOnAcquireReadAction = failFastOnAcquireReadAction;
if (toolWrappers.isEmpty()) return;
@@ -228,15 +225,15 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
Divider.divideInsideAndOutside(getFile(), myRestrictRange.getStartOffset(), myRestrictRange.getEndOffset(), myPriorityRange, inside, new ArrayList<ProperTextRange>(), outside, new ArrayList<ProperTextRange>(),
true, FILE_FILTER);
MultiMap<LocalInspectionToolWrapper, String> toolToLanguages = InspectionEngine.getToolsForElements(toolWrappers, checkDumbAwareness, inside, outside);
MultiMap<LocalInspectionToolWrapper, String> toolToLanguages = InspectionEngine.getToolsForElements(toolWrappers, inside, outside);
setProgressLimit(toolToLanguages.size() * 2L);
final LocalInspectionToolSession session = new LocalInspectionToolSession(getFile(), myRestrictRange.getStartOffset(), myRestrictRange.getEndOffset());
List<InspectionContext> init =
visitPriorityElementsAndInit(toolToLanguages, iManager, isOnTheFly, progress, inside, session, toolWrappers, checkDumbAwareness);
visitPriorityElementsAndInit(toolToLanguages, iManager, isOnTheFly, progress, inside, session, toolWrappers);
visitRestElementsAndCleanup(progress, outside, session, init);
inspectInjectedPsi(outside, isOnTheFly, progress, iManager, false, checkDumbAwareness, toolWrappers);
inspectInjectedPsi(outside, isOnTheFly, progress, iManager, false, toolWrappers);
progress.checkCanceled();
@@ -251,8 +248,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
@NotNull final ProgressIndicator indicator,
@NotNull final List<PsiElement> elements,
@NotNull final LocalInspectionToolSession session,
@NotNull List<LocalInspectionToolWrapper> wrappers,
boolean checkDumbAwareness) {
@NotNull List<LocalInspectionToolWrapper> wrappers) {
final List<InspectionContext> init = new ArrayList<InspectionContext>();
List<Map.Entry<LocalInspectionToolWrapper, Collection<String>>> entries = new ArrayList<Map.Entry<LocalInspectionToolWrapper, Collection<String>>>(toolToLanguages.entrySet());
Processor<Map.Entry<LocalInspectionToolWrapper, Collection<String>>> processor =
@@ -264,7 +260,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
};
boolean result = JobLauncher.getInstance().invokeConcurrentlyUnderProgress(entries, indicator, myFailFastOnAcquireReadAction, processor);
if (!result) throw new ProcessCanceledException();
inspectInjectedPsi(elements, isOnTheFly, indicator, iManager, true, checkDumbAwareness, wrappers);
inspectInjectedPsi(elements, isOnTheFly, indicator, iManager, true, wrappers);
return init;
}
@@ -337,7 +333,6 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
@NotNull final ProgressIndicator indicator,
@NotNull final InspectionManager iManager,
final boolean inVisibleRange,
final boolean checkDumbAwareness,
@NotNull final List<LocalInspectionToolWrapper> wrappers) {
final Set<PsiFile> injected = new THashSet<PsiFile>();
for (PsiElement element : elements) {
@@ -352,7 +347,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
Processor<PsiFile> processor = new Processor<PsiFile>() {
@Override
public boolean process(final PsiFile injectedPsi) {
doInspectInjectedPsi(injectedPsi, onTheFly, indicator, iManager, inVisibleRange, wrappers, checkDumbAwareness);
doInspectInjectedPsi(injectedPsi, onTheFly, indicator, iManager, inVisibleRange, wrappers);
return true;
}
};
@@ -676,8 +671,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
@NotNull final ProgressIndicator indicator,
@NotNull InspectionManager iManager,
final boolean inVisibleRange,
@NotNull List<LocalInspectionToolWrapper> wrappers,
boolean checkDumbAwareness) {
@NotNull List<LocalInspectionToolWrapper> wrappers) {
final PsiElement host = InjectedLanguageManager.getInstance(injectedPsi.getProject()).getInjectionHost(injectedPsi);
final List<PsiElement> elements = getElementsFrom(injectedPsi);
@@ -685,7 +679,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
return;
}
MultiMap<LocalInspectionToolWrapper, String> toolToLanguages =
InspectionEngine.getToolsForElements(wrappers, checkDumbAwareness, elements, Collections.<PsiElement>emptyList());
InspectionEngine.getToolsForElements(wrappers, elements, Collections.<PsiElement>emptyList());
for (final Map.Entry<LocalInspectionToolWrapper, Collection<String>> pair : toolToLanguages.entrySet()) {
indicator.checkCanceled();
final LocalInspectionToolWrapper wrapper = pair.getKey();
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/WholeFileLocalInspectionsPassFactory.java
-1
View File
@@ -124,7 +124,6 @@ public class WholeFileLocalInspectionsPassFactory extends AbstractProjectCompone
@NotNull ProgressIndicator indicator,
@NotNull InspectionManager iManager,
boolean inVisibleRange,
boolean checkDumbAwareness,
@NotNull List<LocalInspectionToolWrapper> wrappers) {
// already inspected in LIP
}