From 2f8a6be4bacd511a1f683cca70b44fba782a8762 Mon Sep 17 00:00:00 2001
From: Yuriy Artamonov <yuriy.artamonov@jetbrains.com>
Date: Sat, 1 Mar 2025 23:38:05 +0100
Subject: [PATCH] [devkit] Explicit non-dynamic extension point is not a
 warning anymore

GitOrigin-RevId: 6a344299d783d62e5a03419205b9416c654857c2
---
 .../devkit-core/resources/messages/DevKitBundle.properties  | 1 -
 .../src/inspections/PluginXmlDynamicPluginInspection.java   | 6 ------
 .../pluginXmlDynamicPluginInspection-highlighting.xml       | 6 +-----
 ...luginXmlDynamicPluginInspection-usingExtensionPoints.xml | 5 +----
 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/plugins/devkit/devkit-core/resources/messages/DevKitBundle.properties b/plugins/devkit/devkit-core/resources/messages/DevKitBundle.properties
index 80d7dca164b6..e3a20ad57f3e 100644
--- a/plugins/devkit/devkit-core/resources/messages/DevKitBundle.properties
+++ b/plugins/devkit/devkit-core/resources/messages/DevKitBundle.properties
@@ -294,7 +294,6 @@ inspections.plugin.xml.dynamic.plugin.component.usage=Non-dynamic plugin due to
 inspections.plugin.xml.dynamic.plugin.component.usage.docs.link.title=Migration Guide
 inspections.plugin.xml.dynamic.plugin.option.highlight.usages.ep=Highlight usage of non-dynamic extension points
 inspections.plugin.xml.dynamic.plugin.extension.point=Non-dynamic extension point ''{0}''
-inspections.plugin.xml.dynamic.plugin.explicit.non.dynamic.extension.point=Explicit non-dynamic extension point ''{0}''
 inspections.plugin.xml.dynamic.plugin.id.required.for.group='id' must be specified for <group>
 inspections.plugin.xml.dynamic.plugin.usage.of.non.dynamic.extension.point=Usage of non-dynamic extension point ''{0}''
 
diff --git a/plugins/devkit/devkit-core/src/inspections/PluginXmlDynamicPluginInspection.java b/plugins/devkit/devkit-core/src/inspections/PluginXmlDynamicPluginInspection.java
index 6f35e96d231a..e4bc5e033fdc 100644
--- a/plugins/devkit/devkit-core/src/inspections/PluginXmlDynamicPluginInspection.java
+++ b/plugins/devkit/devkit-core/src/inspections/PluginXmlDynamicPluginInspection.java
@@ -73,14 +73,8 @@ public final class PluginXmlDynamicPluginInspection extends DevKitPluginXmlInspe
                            DevKitBundle.message("inspections.plugin.xml.dynamic.plugin.extension.point",
                                                 extensionPoint.getEffectiveQualifiedName()));
     }
-    else if (Boolean.FALSE == extensionPoint.getDynamic().getValue()) {
-      holder.createProblem(extensionPoint,
-                           DevKitBundle.message("inspections.plugin.xml.dynamic.plugin.explicit.non.dynamic.extension.point",
-                                                extensionPoint.getEffectiveQualifiedName()));
-    }
   }
 
-
   private static void highlightGroup(DomElementAnnotationHolder holder, Group group) {
     if (!DomUtil.hasXml(group.getId())) {
       holder.createProblem(group, DevKitBundle.message("inspections.plugin.xml.dynamic.plugin.id.required.for.group"),
diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginXmlDynamicPluginInspection/pluginXmlDynamicPluginInspection-highlighting.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginXmlDynamicPluginInspection/pluginXmlDynamicPluginInspection-highlighting.xml
index 3c6ae2ed36f6..c11b48df14f2 100644
--- a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginXmlDynamicPluginInspection/pluginXmlDynamicPluginInspection-highlighting.xml
+++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginXmlDynamicPluginInspection/pluginXmlDynamicPluginInspection-highlighting.xml
@@ -1,20 +1,17 @@
 <idea-plugin>
-
   <id>myPlugin</id>
   <extensionPoints>
     <extensionPoint name="dynamicEP" dynamic="true"/>
     <<warning descr="Non-dynamic extension point 'myPlugin.nonDynamicEP'">extensionPoint</warning> name="nonDynamicEP"/>
-    <<warning descr="Explicit non-dynamic extension point 'myPlugin.explicitNonDynamicEP'">extensionPoint</warning> name="explicitNonDynamicEP" dynamic="false"/>
+    <extensionPoint name="explicitNonDynamicEP" dynamic="false"/>
   </extensionPoints>
 
-
   <extensions defaultExtensionNs="myPlugin">
     <dynamicEP/>
     <nonDynamicEP/>
     <explicitNonDynamicEP/>
   </extensions>
 
-
   <actions>
     <group id="requiredIdIsPresent"/>
     <<warning descr="'id' must be specified for <group>">group</warning>>
@@ -23,7 +20,6 @@
     </group>
   </actions>
 
-
   <<warning descr="Non-dynamic plugin due to using components. Migration Guide">application-components</warning>>
   </application-components>
 
diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginXmlDynamicPluginInspection/pluginXmlDynamicPluginInspection-usingExtensionPoints.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginXmlDynamicPluginInspection/pluginXmlDynamicPluginInspection-usingExtensionPoints.xml
index 1416b4a60c94..4d5de945fa00 100644
--- a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginXmlDynamicPluginInspection/pluginXmlDynamicPluginInspection-usingExtensionPoints.xml
+++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginXmlDynamicPluginInspection/pluginXmlDynamicPluginInspection-usingExtensionPoints.xml
@@ -1,17 +1,14 @@
 <idea-plugin>
-
   <id>myPlugin</id>
   <extensionPoints>
     <extensionPoint name="dynamicEP" dynamic="true"/>
     <<warning descr="Non-dynamic extension point 'myPlugin.nonDynamicEP'">extensionPoint</warning> name="nonDynamicEP"/>
-    <<warning descr="Explicit non-dynamic extension point 'myPlugin.explicitNonDynamicEP'">extensionPoint</warning> name="explicitNonDynamicEP" dynamic="false"/>
+    <extensionPoint name="explicitNonDynamicEP" dynamic="false"/>
   </extensionPoints>
 
-
   <extensions defaultExtensionNs="myPlugin">
     <dynamicEP/>
     <<warning descr="Usage of non-dynamic extension point 'myPlugin.nonDynamicEP'">nonDynamicEP</warning>/>
     <<warning descr="Usage of non-dynamic extension point 'myPlugin.explicitNonDynamicEP'">explicitNonDynamicEP</warning>/>
   </extensions>
-
 </idea-plugin>
\ No newline at end of file