diff --git a/plugins/devkit/devkit-core/src/dom/impl/ExtensionDomExtender.java b/plugins/devkit/devkit-core/src/dom/impl/ExtensionDomExtender.java index 7fde1c40f2eb..3cf0305e2f4c 100644 --- a/plugins/devkit/devkit-core/src/dom/impl/ExtensionDomExtender.java +++ b/plugins/devkit/devkit-core/src/dom/impl/ExtensionDomExtender.java @@ -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 { } private static void collectDependencies(final IdeaPlugin ideaPlugin, Set result, final MultiMap byId) { + ProgressManager.checkCanceled(); if (!result.add(ideaPlugin)) { return; } diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java index 55e8f3df6815..8866063b8226 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java @@ -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); }