more checkCanceled while walking all our plugin xmls

This commit is contained in:
peter
2019-04-16 18:06:56 +02:00
parent ec8e192808
commit 6487e62bb2
2 changed files with 4 additions and 0 deletions
@@ -2,6 +2,7 @@
package org.jetbrains.idea.devkit.dom.impl;
import com.intellij.ide.plugins.PluginManagerCore;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.text.StringUtil;
@@ -94,6 +95,7 @@ public class ExtensionDomExtender extends DomExtender<Extensions> {
}
private static void collectDependencies(final IdeaPlugin ideaPlugin, Set<IdeaPlugin> result, final MultiMap<String, IdeaPlugin> byId) {
ProgressManager.checkCanceled();
if (!result.add(ideaPlugin)) {
return;
}
@@ -16,6 +16,7 @@
package com.intellij.util.xml.impl;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiInvalidElementAccessException;
@@ -148,6 +149,7 @@ public class DomImplUtil {
}
return ContainerUtil.findAll(tags, childTag -> {
ProgressManager.checkCanceled();
try {
return isNameSuitable(name, childTag.getLocalName(), childTag.getName(), childTag.getNamespace(), file);
}