[fus devkit] move intellij.platform.statistics.devkit module from the platform to intellij.dev plugin

The module provides internal actions only, and 'intellij.dev' plugin was created specifically for that. It's an invisible plugin bundled with all IDEs by default, so these actions will still be available, but now lightweight products which don't need them (JetBrains Client and Gateway) may exclude this module without hacks.

Registrations of 2 actions from that module were moved from Java plugin to the module's xml file.

GitOrigin-RevId: 454e9c55849cb65bc2c9d9448e1719c6775661fb
This commit is contained in:
Nikolay Chashnikov
2023-04-14 09:45:14 +02:00
committed by intellij-monorepo-bot
parent 3dbb0cb5d7
commit 6211f1a3ca
8 changed files with 12 additions and 18 deletions

View File

@@ -186,7 +186,7 @@ object CommunityRepositoryModules {
spec.withModule("intellij.testng.rt", "testng-rt.jar")
spec.withProjectLibrary("TestNG")
},
plugin(listOf("intellij.dev", "intellij.dev.psiViewer")),
plugin(listOf("intellij.dev", "intellij.dev.psiViewer", "intellij.platform.statistics.devkit")),
plugin("intellij.devkit") { spec ->
spec.withModule("intellij.devkit.core")
spec.withModule("intellij.devkit.git")

View File

@@ -83,7 +83,6 @@
<orderEntry type="module" module-name="intellij.platform.serviceContainer" />
<orderEntry type="library" name="jcef" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
<orderEntry type="module" module-name="intellij.platform.statistics.devkit" scope="RUNTIME" />
<orderEntry type="module-library">
<library name="byte-buddy-agent" type="repository">
<properties include-transitive-deps="false" maven-id="net.bytebuddy:byte-buddy-agent:1.14.0" />

View File

@@ -31,10 +31,6 @@
<xi:include href="/idea/LangActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/idea/UsageViewActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/META-INF/statistics-devkit.xml" xpointer="xpointer(/idea-plugin/*)">
<xi:fallback/>
</xi:include>
<actions>
<group id="WelcomeScreen.QuickStart.Platform">
<add-to-group group-id="WelcomeScreen.QuickStart" anchor="first"/>

View File

@@ -1,4 +1,5 @@
<idea-plugin>
<idea-plugin package="com.intellij.internal.statistic.devkit">
<resource-bundle>messages.ActionsBundle</resource-bundle>
<actions>
<group id="FeatureUsage.Internal" popup="true" internal="true" compact="true">
<action internal="true" id="OpenStatisticsEventLogAction"
@@ -7,8 +8,11 @@
class="com.intellij.internal.statistic.devkit.actions.RecordStateStatisticsEventLogAction"/>
<action internal="true" id="AddGroupToTestSchemeAction"
class="com.intellij.internal.statistic.devkit.actions.scheme.AddGroupToTestSchemeAction"/>
<action internal="true" id="CollectFUStatisticsAction"
class="com.intellij.internal.statistic.devkit.actions.CollectFUStatisticsAction"/>
<add-to-group group-id="Internal" anchor="last"/>
</group>
<action internal="true" id="EditTestSchemeAction" class="com.intellij.internal.statistic.devkit.actions.scheme.EditEventsTestSchemeAction"/>
<action internal="true" id="CleanupEventsTestSchemeAction" class="com.intellij.internal.statistic.devkit.actions.CleanupEventsTestSchemeAction"/>
<action internal="true" id="SendEventLogStatistics" class="com.intellij.internal.statistic.devkit.actions.SendEventLogAction"/>
@@ -20,6 +24,8 @@
<group internal="true" id="CleanupEventLog" class="com.intellij.internal.statistic.devkit.groups.CleanupEventLogByIdActionGroup"/>
<group internal="true" id="UpdateEventsSchemeAction" class="com.intellij.internal.statistic.devkit.groups.UpdateEventsSchemeActionGroup"/>
<action internal="true" id="GenerateEventsScheme" class="com.intellij.internal.statistic.devkit.actions.GenerateEventsScheme"/>
<action internal="true" id="TestParseEventsSchemeAction"
class="com.intellij.internal.statistic.devkit.actions.TestParseEventsSchemeAction"/>
</actions>
<extensions defaultExtensionNs="com.intellij">
<toolWindow id="Statistics Event Log" factoryClass="com.intellij.internal.statistic.devkit.toolwindow.StatisticsEventLogToolWindowFactory"
@@ -29,7 +35,7 @@
implementationClass="com.intellij.internal.statistic.devkit.actions.scheme.ValidationRulesCompletionContributor"/>
</extensions>
<extensionPoints>
<extensionPoint name="statisticsLogGroupActionsProvider"
<extensionPoint qualifiedName="com.intellij.internal.statistic.devkit.toolwindow.logGroupActionsProvider"
interface="com.intellij.internal.statistic.devkit.toolwindow.StatisticsLogGroupActionsProvider" dynamic="true"/>
</extensionPoints>
<extensions defaultExtensionNs="JavaScript.JsonSchema">

View File

@@ -10,6 +10,6 @@ interface StatisticsLogGroupActionsProvider {
fun getActions(groupId: String, eventId: String, eventData: String): List<AnAction>
companion object {
val EP_NAME = ExtensionPointName<StatisticsLogGroupActionsProvider>("com.intellij.statisticsLogGroupActionsProvider")
val EP_NAME = ExtensionPointName<StatisticsLogGroupActionsProvider>("com.intellij.internal.statistic.devkit.toolwindow.logGroupActionsProvider")
}
}

View File

@@ -8,5 +8,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.dev.psiViewer" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.platform.statistics.devkit" scope="RUNTIME" />
</component>
</module>

View File

@@ -4,5 +4,6 @@
<description>This plugin provides actions which make sense in debug IDE instance, such as "View PSI Structure".</description>
<content>
<module name="intellij.dev.psiViewer"/>
<module name="intellij.platform.statistics.devkit"/>
</content>
</idea-plugin>

View File

@@ -127,15 +127,6 @@
<add-to-group group-id="Internal" anchor="last"/>
</group>
<action internal="true" id="TestParseEventsSchemeAction"
class="com.intellij.internal.statistic.devkit.actions.TestParseEventsSchemeAction">
</action>
<action internal="true" id="CollectFUStatisticsAction"
class="com.intellij.internal.statistic.devkit.actions.CollectFUStatisticsAction">
<add-to-group group-id="FeatureUsage.Internal" anchor="last"/>
</action>
<!-- Toolbar -->
<group id="ToolbarMakeGroup">