Skip to content

Commit a5dbf08

Browse files
authored
[CQ] plugin.xml: specify missing group and context ids (#8128)
Further embracing the yak shave, tidies up some more plugin.xml inspections. ✅ Adds missing (required) group `id` attributes ![image](https://github.com/user-attachments/assets/ae8492e3-0cf7-480e-b63a-fc62dc69a45d) ✅ Defines a `contextId` for our contributed ``liveTemplateContext` ![image](https://github.com/user-attachments/assets/739c7b2a-681b-43d3-b0f8-48f96822edaa) ✅ Suppresses `PluginXmlValidity` for build variables With this, we are left with 17 remaining problems. <img width="996" alt="image" src="http://github.com/%3Ca%20href="https://github.com/user-attachments/assets/c8e97b70-8fed-4202-a420-94da382d787e">https://github.com/user-attachments/assets/c8e97b70-8fed-4202-a420-94da382d787e" /> --- - [x] I’ve reviewed the contributor guide and applied the relevant portions to this PR. <details> <summary>Contribution guidelines:</summary><br> - See our [contributor guide]([https://github.com/dart-lang/sdk/blob/main/CONTRIBUTING.md](https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview) for general expectations for PRs. - Larger or significant changes should be discussed in an issue before creating a PR. - Dart contributions to our repos should follow the [Dart style guide](https://dart.dev/guides/language/effective-dart) and use `dart format`. - Java and Kotlin contributions should strive to follow Java and Kotlin best practices ([discussion](#8098)). </details>
1 parent b8d9493 commit a5dbf08

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

resources/META-INF/plugin.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
<category>Custom Languages</category>
2424
<version>SNAPSHOT</version>
25+
<!--suppress PluginXmlValidity -->
2526
<idea-version since-build="243" until-build="243.*"/>
2627

2728
<depends>com.intellij.modules.platform</depends>
@@ -222,7 +223,7 @@
222223
<group id="FlutterPackagesExplorerActionGroup" class="io.flutter.actions.FlutterPackagesExplorerActionGroup">
223224
<separator/>
224225
<!--suppress PluginXmlCapitalization -->
225-
<group text="Flutter" description="Flutter Tools" icon="FlutterIcons.Flutter" popup="true">
226+
<group id="FlutterToolsGroup" text="Flutter" description="Flutter Tools" icon="FlutterIcons.Flutter" popup="true">
226227
<separator/>
227228
<reference ref="flutter.pub.get"/>
228229
<reference ref="flutter.pub.upgrade"/>
@@ -250,7 +251,7 @@
250251
<!-- </group>-->
251252
<group id="FlutterBuildActionGroup" class="io.flutter.actions.FlutterBuildActionGroup">
252253
<separator/>
253-
<group text="Flutter" popup="true">
254+
<group id="FlutterBuildGroup" text="Flutter" popup="true">
254255
<action id="flutter.build.aar" text="Build AAR" description="Building a Flutter module for Android add-to-app"
255256
class="io.flutter.actions.FlutterBuildActionGroup$AAR"/>
256257
<action id="flutter.build.apk" text="Build APK" description="Building a Flutter app for general distribution"
@@ -268,7 +269,7 @@
268269
</group>
269270

270271
<!-- main toolbar run actions -->
271-
<group>
272+
<group id="MainToolBarRunActionsGroup">
272273
<action id="AttachDebuggerAction"
273274
class="io.flutter.actions.AttachDebuggerAction"
274275
text="Flutter Attach"
@@ -393,7 +394,7 @@
393394
<runLineMarkerContributor language="Dart" implementationClass="io.flutter.run.bazelTest.FlutterBazelTestLineMarkerContributor"/>
394395

395396
<defaultLiveTemplatesProvider implementation="io.flutter.template.FlutterLiveTemplatesProvider"/>
396-
<liveTemplateContext implementation="io.flutter.template.DartToplevelTemplateContextType"/>
397+
<liveTemplateContext contextId="DART_TOPLEVEL" implementation="io.flutter.template.DartToplevelTemplateContextType"/>
397398

398399
<!-- IDEA only -->
399400
<moduleBuilder builderClass="io.flutter.module.FlutterModuleBuilder"/>

resources/META-INF/plugin_template.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
<category>Custom Languages</category>
2222
@VERSION@
23+
<!--suppress PluginXmlValidity -->
2324
<idea-version since-build="@SINCE@" until-build="@UNTIL@"/>
2425

2526
<depends>com.intellij.modules.platform</depends>
@@ -130,7 +131,7 @@
130131
<group id="FlutterPackagesExplorerActionGroup" class="io.flutter.actions.FlutterPackagesExplorerActionGroup">
131132
<separator/>
132133
<!--suppress PluginXmlCapitalization -->
133-
<group text="Flutter" description="Flutter Tools" icon="FlutterIcons.Flutter" popup="true">
134+
<group id="FlutterToolsGroup" text="Flutter" description="Flutter Tools" icon="FlutterIcons.Flutter" popup="true">
134135
<separator/>
135136
<reference ref="flutter.pub.get"/>
136137
<reference ref="flutter.pub.upgrade"/>
@@ -158,7 +159,7 @@
158159
<!-- </group>-->
159160
<group id="FlutterBuildActionGroup" class="io.flutter.actions.FlutterBuildActionGroup">
160161
<separator/>
161-
<group text="Flutter" popup="true">
162+
<group id="FlutterBuildGroup" text="Flutter" popup="true">
162163
<action id="flutter.build.aar" text="Build AAR" description="Building a Flutter module for Android add-to-app"
163164
class="io.flutter.actions.FlutterBuildActionGroup$AAR"/>
164165
<action id="flutter.build.apk" text="Build APK" description="Building a Flutter app for general distribution"
@@ -176,7 +177,7 @@
176177
</group>
177178

178179
<!-- main toolbar run actions -->
179-
<group>
180+
<group id="MainToolBarRunActionsGroup">
180181
<action id="AttachDebuggerAction"
181182
class="io.flutter.actions.AttachDebuggerAction"
182183
text="Flutter Attach"
@@ -301,7 +302,7 @@
301302
<runLineMarkerContributor language="Dart" implementationClass="io.flutter.run.bazelTest.FlutterBazelTestLineMarkerContributor"/>
302303

303304
<defaultLiveTemplatesProvider implementation="io.flutter.template.FlutterLiveTemplatesProvider"/>
304-
<liveTemplateContext implementation="io.flutter.template.DartToplevelTemplateContextType"/>
305+
<liveTemplateContext contextId="DART_TOPLEVEL" implementation="io.flutter.template.DartToplevelTemplateContextType"/>
305306

306307
<!-- IDEA only -->
307308
<moduleBuilder builderClass="io.flutter.module.FlutterModuleBuilder"/>

0 commit comments

Comments
 (0)