consulo · VISTALL · Apr 19, 2026 · Apr 19, 2026
diff --git a/...y/src/com/intellij/spring/security/references/SpringSecurityRolePsiReferenceProvider.java b/...y/src/com/intellij/spring/security/references/SpringSecurityRolePsiReferenceProvider.java
@@ -1,7 +1,7 @@
 package com.intellij.spring.security.references;
 
 import com.intellij.openapi.module.Module;
-import consulo.ide.impl.idea.openapi.module.ModuleUtil;
+import consulo.language.util.ModuleUtilCore;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiLiteralExpression;
@@ -49,7 +49,7 @@ public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNu
   }
 
   public static PsiReference[] getSecurityRolesReferences(@NotNull PsiElement element, @Nullable String value) {
-    Module module = ModuleUtil.findModuleForPsiElement(element);
+    Module module = ModuleUtilCore.findModuleForPsiElement(element);
     if (module != null && !StringUtil.isEmptyOrSpaces(value)) {
         List<PsiReference> references = new ArrayList<PsiReference>();
         for (String token : StringUtil.tokenize(value, ",")) {

diff --git a/spring-tests/tests/com/intellij/spring/model/xml/custom/CustomNamespaceHandlerTest.java b/spring-tests/tests/com/intellij/spring/model/xml/custom/CustomNamespaceHandlerTest.java
@@ -16,7 +16,7 @@
 package com.intellij.spring.model.xml.custom;
 
 import consulo.ide.impl.idea.openapi.application.PathManager;
-import consulo.ide.impl.idea.openapi.module.ModuleUtil;
+import consulo.language.util.ModuleUtilCore;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.CommonClassNames;
 import com.intellij.psi.XmlElementFactory;
@@ -292,7 +292,7 @@ private CustomBeanWrapper getWrapper(final XmlTag tag) {
 
   private XmlTag createTag(final String text) throws IncorrectOperationException {
     final XmlTag tag = XmlElementFactory.getInstance(myProject).createTagFromText(text);
-    tag.getContainingFile().putUserData(ModuleUtil.KEY_MODULE, myModule);
+    tag.getContainingFile().putUserData(ModuleUtilCore.KEY_MODULE, myModule);
     return tag;
   }
 }
diff --git a/spring-tests/tests/com/intellij/spring/model/xml/custom/CustomNamespaceMetadataTest.java b/spring-tests/tests/com/intellij/spring/model/xml/custom/CustomNamespaceMetadataTest.java
@@ -6,7 +6,7 @@
 
 import com.intellij.javaee.ExternalResourceManager;
 import consulo.ide.impl.idea.openapi.application.PathManager;
-import consulo.ide.impl.idea.openapi.module.ModuleUtil;
+import consulo.language.util.ModuleUtilCore;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.CommonClassNames;
 import com.intellij.psi.PsiClass;
@@ -160,7 +160,7 @@ private CustomBeanWrapper parse(final XmlTag tag) {
 
   private XmlTag createTag(final String text) throws IncorrectOperationException {
     final XmlTag tag = XmlElementFactory.getInstance(myProject).createTagFromText(text);
-    tag.getContainingFile().putUserData(ModuleUtil.KEY_MODULE, myModule);
+    tag.getContainingFile().putUserData(ModuleUtilCore.KEY_MODULE, myModule);
     return tag;
   }
 }
diff --git a/...tellij/spring/model/actions/patterns/dataAccess/JpaEntityManagerBeanGenerateProvider.java b/...tellij/spring/model/actions/patterns/dataAccess/JpaEntityManagerBeanGenerateProvider.java
@@ -13,7 +13,6 @@
 import com.intellij.jpa.facet.JpaFacet;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.module.Module;
-import consulo.ide.impl.idea.openapi.module.ModuleUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiDocumentManager;
@@ -77,7 +76,7 @@ public LookupElement[] calculateLookupItems(ExpressionContext context) {
         final Project project = context.getProject();
         final PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(context.getEditor().getDocument());
         if(psiFile == null) return LookupElement.EMPTY_ARRAY;
-        final Module module = ModuleUtil.findModuleForPsiElement(psiFile);
+        final Module module = psiFile.getModule();
 
         if(module == null) return LookupElement.EMPTY_ARRAY;
 

diff --git a/web/src/com/intellij/spring/web/mvc/SpringMVCModel.java b/web/src/com/intellij/spring/web/mvc/SpringMVCModel.java
@@ -8,7 +8,6 @@
 import com.intellij.javaee.web.facet.WebFacet;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.module.Module;
-import consulo.ide.impl.idea.openapi.module.ModuleUtil;
 import consulo.util.dataholder.Key;
 import consulo.ide.impl.idea.openapi.util.NotNullLazyValue;
 import com.intellij.openapi.util.Pair;
@@ -59,7 +58,7 @@ public Result<SpringMVCModel> compute() {
 
   @Nullable
   public static SpringMVCModel getModel(final PsiElement element) {
-    final Module module = ModuleUtil.findModuleForPsiElement(element);
+    final Module module = element.getModule();
     if (module == null) {
       return null;
     }

diff --git a/web/src/com/intellij/spring/web/mvc/SpringMVCVariablesProvider.java b/web/src/com/intellij/spring/web/mvc/SpringMVCVariablesProvider.java
@@ -1,7 +1,6 @@
 package com.intellij.spring.web.mvc;
 
 import com.intellij.openapi.module.Module;
-import consulo.ide.impl.idea.openapi.module.ModuleUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiType;
 import com.intellij.psi.impl.source.jsp.JspImplicitVariableImpl;
@@ -20,7 +19,7 @@
 public class SpringMVCVariablesProvider extends ElVariablesProvider {
 
   public boolean processImplicitVariables(@NotNull final PsiElement element, @NotNull final ELExpressionHolder containingFile, @NotNull final ELElementProcessor processor) {
-    final Module module = ModuleUtil.findModuleForPsiElement(containingFile);
+    final Module module = containingFile.getModule();
     if (module != null) {
       final Collection<SpringMVCModelAttribute> attributes = SpringMVCJamModel.getModel(module).getModelAttributes();
       for (SpringMVCModelAttribute attribute : attributes) {

diff --git a/webflow/src/com/intellij/spring/webflow/model/converters/WebflowScopeVariableReference.java b/webflow/src/com/intellij/spring/webflow/model/converters/WebflowScopeVariableReference.java
@@ -1,7 +1,6 @@
 package com.intellij.spring.webflow.model.converters;
 
 import com.intellij.openapi.module.Module;
-import consulo.ide.impl.idea.openapi.module.ModuleUtil;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReferenceBase;
@@ -27,7 +26,7 @@ public WebflowScopeVariableReference(final PsiElement element, final TextRange r
   public PsiElement resolve() {
     final String value = getValue();
 
-    final Module module = ModuleUtil.findModuleForPsiElement(myElement);
+    final Module module = myElement.getModule();
     assert module != null;
 
     final WebflowScopeProviderManager service = WebflowScopeProviderManager.getService(module);

diff --git a/webflow/src/com/intellij/spring/webflow/model/xml/WebflowModelFactory.java b/webflow/src/com/intellij/spring/webflow/model/xml/WebflowModelFactory.java
@@ -1,7 +1,6 @@
 package com.intellij.spring.webflow.model.xml;
 
 import com.intellij.openapi.module.Module;
-import consulo.ide.impl.idea.openapi.module.ModuleUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
@@ -63,7 +62,7 @@ public WebflowModel getModelByConfigFile(@Nullable XmlFile psiFile) {
     if (psiFile == null) {
       return null;
     }
-    return computeModel(psiFile, ModuleUtil.findModuleForPsiElement(psiFile));
+    return computeModel(psiFile, psiFile.getModule());
   }
 
   protected WebflowModel computeModel(@NotNull XmlFile psiFile, @Nullable Module module) {