IJPL-233553 remove suppressions intellij.java.psi

IJ-MR-184958 IJ-MR-184993 IJ-MR-179029 IJ-MR-184126 IJ-MR-181153 IJ-MR-146078 IJ-MR-175479 IJ-MR-186058 IJ-MR-193195 IJ-MR-196957 IJ-MR-199124 IJ-MR-197441 IJ-MR-204135 IJ-MR-204674 IJ-MR-205883

GitOrigin-RevId: 8cbb175770c23329e4cdd26bb245ceab5a57afe2

java/compiler/impl/resources/intellij.java.compiler.impl.xml

@@ -13,6 +13,7 @@
     <module name="intellij.java.compiler"/>
     <module name="intellij.java.impl"/>
     <module name="intellij.java.indexing"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.jsp"/>
     <module name="intellij.platform.jps.build"/>

java/compiler/openapi/resources/intellij.java.compiler.xml

@@ -1,12 +1,13 @@
 <idea-plugin  visibility="public">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.platform.externalSystem"/>
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.java"/>
-    <!-- endregion -->
+    <module name="intellij.java.psi"/>
   </dependencies>
+  <!-- endregion -->
 
   <extensionPoints>
     <extensionPoint qualifiedName="com.intellij.packaging.elementType" interface="com.intellij.packaging.elements.PackagingElementType"

java/debugger/impl/resources/intellij.java.debugger.impl.xml

@@ -19,6 +19,7 @@
     <module name="intellij.java.impl"/>
     <module name="intellij.java.impl.refactorings"/>
     <module name="intellij.java.indexing"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.jsp"/>
     <module name="intellij.platform.buildScripts.downloader"/>

java/execution/impl/resources/intellij.java.execution.impl.xml

@@ -12,6 +12,7 @@
     <module name="intellij.java.execution"/>
     <module name="intellij.java.impl"/>
     <module name="intellij.java.indexing"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.platform.smRunner"/>
     <module name="intellij.platform.testRunner"/>

java/execution/openapi/resources/intellij.java.execution.xml

@@ -4,6 +4,7 @@
     <plugin id="com.intellij.modules.java-capable"/>
     <module name="intellij.java"/>
     <module name="intellij.java.indexing"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.platform.backend"/>
   </dependencies>

java/idea-ui/resources/intellij.java.ui.xml

@@ -6,13 +6,14 @@
     <module name="intellij.platform.externalSystem"/>
     <module name="intellij.platform.externalSystem.impl"/>
     <module name="intellij.platform.backend"/>
-    <module name="intellij.java.syntax"/>
     <module name="intellij.java"/>
     <module name="intellij.java.aetherDependencyResolver"/>
     <module name="intellij.java.compiler"/>
     <module name="intellij.java.compiler.impl"/>
     <module name="intellij.java.impl"/>
     <module name="intellij.java.impl.refactorings"/>
+    <module name="intellij.java.psi"/>
+    <module name="intellij.java.syntax"/>
     <module name="intellij.libraries.maven.resolver.provider"/>
     <module name="intellij.platform.vcs.impl"/>
   </dependencies>

java/java-analysis-impl/resources/intellij.java.analysis.impl.xml

@@ -14,6 +14,7 @@
     <module name="intellij.java.codeserver.highlighting"/>
     <module name="intellij.java.indexing"/>
     <module name="intellij.java.indexing.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
   </dependencies>
   <!-- endregion -->

java/java-features-trainer/resources/intellij.java.featuresTrainer.xml

@@ -1,18 +1,19 @@
 <idea-plugin visibility="internal">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.java.debugger.impl.shared"/>
     <module name="intellij.platform.backend"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <plugin id="training"/>
     <module name="intellij.java"/>
     <module name="intellij.java.debugger"/>
     <module name="intellij.java.debugger.impl"/>
     <module name="intellij.java.execution.impl"/>
     <module name="intellij.java.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.java.ui"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
   <extensions defaultExtensionNs="training">
     <ift.language.extension language="JAVA" defaultProductName="IDEA,Aqua" implementationClass="com.intellij.java.ift.JavaLangSupport"/>
     <ift.learning.course language="JAVA" implementationClass="com.intellij.java.ift.JavaLearningCourse"/>

java/java-frontback-impl/resource/intellij.java.frontback.impl.xml

@@ -1,6 +1,7 @@
 <idea-plugin visibility="public">
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
   </dependencies>
   <!-- endregion -->

java/java-impl-inspections/resources/intellij.java.impl.inspections.xml

@@ -3,7 +3,6 @@
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <plugin id="com.intellij.modules.java-capable"/>
-    <module name="intellij.java.syntax"/>
     <module name="intellij.platform.backend"/>
     <module name="intellij.java"/>
     <module name="intellij.java.analysis.impl"/>
@@ -13,6 +12,8 @@
     <module name="intellij.java.impl"/>
     <module name="intellij.java.impl.refactorings"/>
     <module name="intellij.java.indexing"/>
+    <module name="intellij.java.psi"/>
+    <module name="intellij.java.syntax"/>
   </dependencies>
   <!-- endregion -->
 

java/java-psi-impl/resources/intellij.java.psi.impl.xml

@@ -16,6 +16,7 @@
 <idea-plugin visibility="public">
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
   </dependencies>
   <!-- endregion -->

java/java-structure-view/resources/intellij.java.structureView.xml

@@ -5,6 +5,7 @@
     <module name="intellij.java.psi.impl"/>
     <module name="intellij.platform.backend"/>
     <module name="intellij.java.analysis.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.platform.structureView"/>
   </dependencies>
   <!-- endregion -->

java/jsp-spi/resources/intellij.jsp.spi.xml

@@ -4,6 +4,7 @@
     <plugin id="com.intellij.modules.xml"/>
     <plugin id="com.intellij.modules.java-capable"/>
     <module name="intellij.java"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.jsp"/>
     <module name="intellij.platform.backend"/>
   </dependencies>

java/langInjection/resources/intellij.java.langInjection.xml

@@ -1,18 +1,19 @@
 <idea-plugin visibility="internal">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.platform.langInjection.backend"/>
     <module name="intellij.regexp"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.java"/>
     <module name="intellij.java.compiler.impl"/>
     <module name="intellij.java.impl"/>
     <module name="intellij.java.indexing"/>
     <module name="intellij.java.langInjection.jps"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.platform.backend"/>
     <module name="intellij.platform.langInjection"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
   <extensions defaultExtensionNs="com.intellij">
     <localInspection language="JAVA" shortName="UnknownLanguage" groupKey="inspections.language.injection.group.name" enabledByDefault="true"
                      level="ERROR" implementationClass="org.intellij.plugins.intelliLang.inject.java.validation.UnknownLanguageID"

java/structuralsearch-java/resources/intellij.java.structuralSearch.xml

@@ -1,14 +1,15 @@
 <idea-plugin visibility="internal">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <plugin id="com.intellij.modules.structuralsearch"/>
     <module name="intellij.platform.backend"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.java"/>
     <module name="intellij.java.impl"/>
     <module name="intellij.java.indexing"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
 
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceInterface="com.intellij.structuralsearch.plugin.ui.StructuralSearchTemplateBuilder"

java/testFramework/resources/intellij.java.testFramework.xml

@@ -4,6 +4,7 @@
     <module name="intellij.libraries.junit4"/>
     <module name="intellij.java.debugger.impl"/>
     <module name="intellij.java.execution.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.java.testFramework.backend"/>
     <module name="intellij.java.testFramework.shared"/>

java/testFramework/shared/resources/intellij.java.testFramework.shared.xml

@@ -2,6 +2,7 @@
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.java.backend"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.java.ui"/>
     <module name="intellij.libraries.groovy"/>

java/typeMigration/resources/intellij.java.typeMigration.xml

@@ -8,6 +8,7 @@
     <module name="intellij.java.codeserver.highlighting"/>
     <module name="intellij.java.impl"/>
     <module name="intellij.java.impl.refactorings"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.platform.structuralSearch"/>
   </dependencies>

java/vcs/resources/intellij.java.vcs.xml

@@ -1,9 +1,11 @@
 <idea-plugin>
   <dependencies>
-    <module name="intellij.platform.vcs.impl"/>
-    <module name="intellij.java.execution"/>
-
     <module name="intellij.platform.backend"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java.execution"/>
+    <module name="intellij.java.psi"/>
+    <module name="intellij.platform.vcs.impl"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">

jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml

@@ -7,6 +7,7 @@
     <module name="intellij.java.impl"/>
     <module name="intellij.java.impl.refactorings"/>
     <module name="intellij.java.indexing"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.jvm.analysis"/>
     <module name="intellij.jvm.analysis.quickFix"/>

jvm/jvm-analysis-refactoring/resources/intellij.jvm.analysis.refactoring.xml

@@ -3,6 +3,7 @@
   <dependencies>
     <plugin id="com.intellij.modules.java-capable"/>
     <module name="intellij.platform.backend"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.jvm.analysis"/>
     <module name="intellij.platform.uast"/>
   </dependencies>

plugins/ant/resources/META-INF/plugin.xml

@@ -14,6 +14,7 @@ To use the <b>Ant</b> tool window, select <b>View > Tool Windows > Ant</b>.
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.java.execution.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.ui"/>
     <module name="intellij.platform.testRunner"/>
     <module name="intellij.xml.dom"/>

plugins/commander/resources/META-INF/plugin.xml

@@ -5,6 +5,7 @@
   <vendor>JetBrains</vendor>
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
+    <module name="intellij.java.psi"/>
     <module name="intellij.platform.structureView"/>
   </dependencies>
   <!-- endregion -->

plugins/dev/intellij.java.dev/resources/intellij.java.dev.xml

@@ -1,15 +1,16 @@
 <idea-plugin visibility="internal" package="com.intellij.java.dev">
   <resource-bundle>messages.JavaDevBundle</resource-bundle>
 
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.java.backend"/>
     <module name="intellij.platform.debugger.impl"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.dev.codeInsight"/>
     <module name="intellij.dev.psiViewer"/>
     <module name="intellij.java.debugger.impl"/>
-    <!-- endregion -->
+    <module name="intellij.java.psi"/>
   </dependencies>
+  <!-- endregion -->
 
   <extensions defaultExtensionNs="com.intellij.dev">
     <psiViewer.extension implementation="com.intellij.java.dev.psiViewer.PsiViewerExpressionExtension"/>

plugins/dev/intellij.kotlin.dev/resources/intellij.kotlin.dev.xml

@@ -1,9 +1,12 @@
 <idea-plugin package="org.jetbrains.idea.dev.kotlin">
 
   <dependencies>
-    <module name="intellij.dev.psiViewer"/>
-    <module name="intellij.dev.codeInsight"/>
     <plugin id="org.jetbrains.kotlin"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.dev.codeInsight"/>
+    <module name="intellij.dev.psiViewer"/>
+    <module name="intellij.java.psi"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij.dev">

plugins/devkit/api-dump-lang/resources/intellij.devkit.apiDump.lang.xml

@@ -1,7 +1,10 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.java.backend"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.devkit.apiDump"/>
+    <module name="intellij.java.psi"/>
+    <!-- endregion -->
   </dependencies>
 
   <resource-bundle>messages.ApiDumpLangBundle</resource-bundle>

plugins/devkit/devkit-core/resources/intellij.devkit.core.xml

@@ -6,6 +6,7 @@
     <module name="intellij.java.aetherDependencyResolver"/>
     <module name="intellij.java.debugger.impl"/>
     <module name="intellij.java.execution.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.java.ui"/>
     <module name="intellij.java.xml.dom.impl"/>

plugins/devkit/intellij.devkit.compose/resources/intellij.devkit.compose.xml

@@ -8,6 +8,7 @@
     <module name="intellij.gradle"/>
     <module name="intellij.java.debugger.impl"/>
     <module name="intellij.java.execution.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.libraries.skiko"/>
     <module name="intellij.platform.compose"/>
     <module name="intellij.platform.compose.markdown"/>

plugins/devkit/intellij.devkit.gradle/resources/intellij.devkit.gradle.xml

@@ -3,6 +3,7 @@
   <dependencies>
     <module name="intellij.devkit.core"/>
     <module name="intellij.gradle.java"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.ui"/>
     <module name="intellij.platform.smRunner"/>
   </dependencies>

plugins/devkit/intellij.devkit.i18n/resources/intellij.devkit.i18n.xml

@@ -3,6 +3,7 @@
   <dependencies>
     <plugin id="com.intellij.java-i18n"/>
     <module name="intellij.devkit.core"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.xml.dom"/>
     <module name="intellij.xml.parser"/>

plugins/devkit/intellij.devkit.mcp/resources/intellij.devkit.mcp.xml

@@ -1,9 +1,12 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.java.backend"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <plugin id="com.intellij.mcpServer"/>
     <module name="intellij.devkit.core"/>
     <module name="intellij.devkit.scaffolding"/>
+    <module name="intellij.java.psi"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij.mcpServer">

plugins/devkit/intellij.devkit.themes/resources/intellij.devkit.themes.xml

@@ -2,6 +2,7 @@
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.devkit.core"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.json.backend"/>
     <module name="intellij.xml.dom"/>
     <module name="intellij.xml.psi"/>

plugins/devkit/intellij.devkit.threading/resources/intellij.devkit.threading.xml

@@ -1,7 +1,10 @@
 <idea-plugin>
   <dependencies>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.devkit.core"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.platform.compose"/>
+    <!-- endregion -->
   </dependencies>
 
   <resource-bundle>messages.DevkitThreadingBundle</resource-bundle>

plugins/devkit/intellij.devkit.uiDesigner/resources/intellij.devkit.uiDesigner.xml

@@ -1,7 +1,10 @@
 <idea-plugin>
   <dependencies>
-    <module name="intellij.devkit.core"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <plugin id="com.intellij.uiDesigner"/>
+    <module name="intellij.devkit.core"/>
+    <module name="intellij.java.psi"/>
+    <!-- endregion -->
   </dependencies>
   <!-- todo IDEA-282478
   <actions>

plugins/devkit/intellij.devkit.workspaceModel/k2/resources/intellij.devkit.workspaceModel.k2.xml

@@ -1,7 +1,10 @@
 <idea-plugin>
   <dependencies>
     <plugin id="com.intellij.modules.kotlin.k2"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.devkit.workspaceModel"/>
+    <module name="intellij.java.psi"/>
+    <!-- endregion -->
   </dependencies>
 
   <resource-bundle>messages.DevKitWorkspaceModelBundle</resource-bundle>

plugins/devkit/intellij.devkit.workspaceModel/resources/intellij.devkit.workspaceModel.xml

@@ -3,10 +3,11 @@
   <dependencies>
     <plugin id="org.jetbrains.kotlin"/>
     <plugin id="org.editorconfig.editorconfigjetbrains"/>
-    <plugin id="com.intellij.copyright"/>
     <module name="intellij.java.backend"/>
+    <plugin id="com.intellij.copyright"/>
     <module name="intellij.devkit.core"/>
     <module name="intellij.java.aetherDependencyResolver"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.ui"/>
   </dependencies>
   <!-- endregion -->

plugins/devkit/intellij.kotlin.devkit/k2/resources/intellij.kotlin.devkit.k2.xml

@@ -1,9 +1,12 @@
 <idea-plugin>
   <dependencies>
     <plugin id="com.intellij.modules.kotlin.k2"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java.psi"/>
+    <module name="intellij.kotlin.codeInsight.intentions"/>
     <module name="intellij.kotlin.devkit"/>
     <module name="intellij.kotlin.refactorings"/>
-    <module name="intellij.kotlin.codeInsight.intentions"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">

plugins/devkit/intellij.kotlin.devkit/resources/intellij.kotlin.devkit.xml

@@ -3,8 +3,9 @@
   <dependencies>
     <plugin id="org.jetbrains.kotlin"/>
     <module name="intellij.devkit.core"/>
-    <module name="intellij.kotlin.codeInsight.shared"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.kotlin.codeInsight.fixes"/>
+    <module name="intellij.kotlin.codeInsight.shared"/>
     <module name="intellij.xml.dom"/>
     <module name="intellij.xml.psi"/>
   </dependencies>

plugins/env-files-support/java/resources/intellij.dotenv.java.xml

@@ -1,6 +1,9 @@
 <idea-plugin package="ru.adelf.idea.dotenv.java">
   <dependencies>
     <module name="intellij.java.backend"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java.psi"/>
+    <!-- endregion -->
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <completion.contributor language="JAVA" implementationClass="ru.adelf.idea.dotenv.java.JavaEnvCompletionContributor"/>

plugins/env-files-support/kotlin/resources/intellij.dotenv.kotlin.xml

@@ -1,7 +1,10 @@
 <idea-plugin package="ru.adelf.idea.dotenv.kotlin">
   <dependencies>
     <plugin id="org.jetbrains.kotlin"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.dotenv.java"/>
+    <module name="intellij.java.psi"/>
+    <!-- endregion -->
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <completion.contributor language="kotlin" implementationClass="ru.adelf.idea.dotenv.kotlin.KotlinEnvCompletionContributor"/>

plugins/evaluation-plugin/languages/java/resources/intellij.evaluationPlugin.languages.java.xml

@@ -3,6 +3,7 @@
   <dependencies>
     <module name="intellij.java.backend"/>
     <module name="intellij.gradle"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.maven"/>
     <module name="intellij.platform.smRunner"/>
     <module name="intellij.platform.testRunner"/>

plugins/evaluation-plugin/languages/kotlin/resources/intellij.evaluationPlugin.languages.kotlin.xml

@@ -1,6 +1,9 @@
 <idea-plugin>
   <dependencies>
     <plugin id="org.jetbrains.kotlin"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java.psi"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij.cce">

plugins/grazie/java/src/main/resources/intellij.grazie.java.xml

@@ -1,10 +1,11 @@
 <idea-plugin>
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.java.backend"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.grazie.core"/>
-    <!-- endregion -->
+    <module name="intellij.java.psi"/>
   </dependencies>
+  <!-- endregion -->
 
   <extensions defaultExtensionNs="com.intellij.grazie">
     <textExtractor language="JAVA" implementationClass="com.intellij.grazie.ide.language.java.JavaTextExtractor"/>

plugins/jshell/console/resources/intellij.java.jshell.console.xml

@@ -3,6 +3,7 @@
   <dependencies>
     <module name="intellij.java.backend"/>
     <module name="intellij.java.execution.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
   </dependencies>
   <!-- endregion -->

plugins/kotlin/base/code-insight/minimal/resource/intellij.kotlin.base.codeInsight.minimal.xml

@@ -1,3 +1,8 @@
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" visibility="internal">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+  <dependencies>
+    <module name="intellij.java.psi"/>
+  </dependencies>
+  <!-- endregion -->
   <xi:include href="base-codeInsight-minimal.xml" xpointer="xpointer(/idea-plugin/*)"/>
 </idea-plugin>

plugins/rareJavaRefactorings/resources/META-INF/plugin.xml

@@ -10,6 +10,7 @@
   <vendor>JetBrains</vendor>
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
   </dependencies>
   <!-- endregion -->

plugins/search-everywhere-ml/ranking/java/resources/intellij.searchEverywhereMl.ranking.java.xml

@@ -1,7 +1,10 @@
 <idea-plugin>
   <dependencies>
-    <module name="intellij.searchEverywhereMl.ranking.core"/>
     <module name="intellij.java.backend"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java.psi"/>
+    <module name="intellij.searchEverywhereMl.ranking.core"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij.searcheverywhere.ml">

plugins/ui-designer/resources/META-INF/plugin.xml

@@ -7,6 +7,7 @@
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.java.execution.impl"/>
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.java.ui"/>
     <module name="intellij.xml.impl"/>

python/pluginJava/resources/intellij.python.community.plugin.java.xml

@@ -1,14 +1,15 @@
 <idea-plugin visibility="internal">
   <!--For IU or IC-->
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <!-- Supports Java -->
     <module name="intellij.java.backend"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.java.psi"/>
     <module name="intellij.java.ui"/>
     <module name="intellij.python.community.core.impl"/>
     <module name="intellij.python.community.plugin.impl"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
 
   <extensions defaultExtensionNs="com.intellij">
     <newProjectWizard.languageGenerator implementation="com.intellij.python.community.plugin.java.PythonNewProjectWizard"/>