Skip to content

Commit b8d9493

Browse files
pqpq
authored
[CQ] plugin.xml cleanup: redundant declarations; i18n (#8126)
✅ Fixes/ignores capitalization inspections. ![image](https://github.com/user-attachments/assets/d71a9390-4090-4bcd-ab16-e267faf13e97) ✅ Removes redundant `serviceInterfaces` ![image](https://github.com/user-attachments/assets/c8cf914a-c6c9-4eb9-82d0-369d07ed1203) (Not needed if the implementation class defines the interface: https://intellij-sdk-docs-cn.github.io/intellij/sdk/docs/basics/plugin_structure/plugin_services.html.) ✅ Disables i18N inspections (just noise unless we decide to externalize/internationalize) --- - [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 55f8b23 commit b8d9493

File tree

2 files changed

+50
-62
lines changed

2 files changed

+50
-62
lines changed

‎resources/META-INF/plugin.xml

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!-- Do not edit; instead, modify plugin_template.xml, and run './bin/plugin generate'. -->
22

3+
<!--suppress PluginXmlI18n -->
34
<idea-plugin>
45
<id>io.flutter</id>
56
<name>Flutter</name>
@@ -146,6 +147,7 @@
146147

147148
<actions>
148149
<group id="Flutter.MainToolbarActions">
150+
<!--suppress PluginXmlCapitalization -->
149151
<action id="Flutter.DeviceSelector" class="io.flutter.actions.DeviceSelectorAction"
150152
description="Flutter Device Selection"
151153
icon="FlutterIcons.Phone"/>
@@ -157,6 +159,7 @@
157159

158160
<!-- This is to keep device selector in old UI -->
159161
<group id="Flutter.MainToolbarActionsLegacy">
162+
<!--suppress PluginXmlCapitalization -->
160163
<action id="Flutter.DeviceSelectorLegacy" class="io.flutter.actions.DeviceSelectorAction"
161164
description="Flutter Device Selection"
162165
icon="FlutterIcons.Phone"/>
@@ -166,6 +169,7 @@
166169
<add-to-group anchor="before" group-id="ToolbarRunGroup" relative-to-action="RunConfiguration"/>
167170
</group>
168171

172+
<!--suppress PluginXmlCapitalization -->
169173
<group id="FlutterToolsActionGroup" class="io.flutter.actions.FlutterToolsActionGroup" popup="true"
170174
text="Flutter" description="Flutter Tools" icon="FlutterIcons.Flutter">
171175
<add-to-group group-id="ToolsMenu" anchor="last"/>
@@ -194,6 +198,7 @@
194198
text="Flutter Clean"
195199
description="Run 'flutter clean'"/>
196200
<separator/>
201+
<!--suppress PluginXmlCapitalization -->
197202
<action id="flutter.devtools.open" class="io.flutter.run.OpenDevToolsAction"
198203
text="Open Flutter DevTools in Browser"
199204
description="Open Flutter DevTools in Browser"/>
@@ -202,10 +207,10 @@
202207
<!-- text="Open Android module in Android Studio"-->
203208
<!-- description="Launch Android Studio to edit the Android module as a top-level project"/>-->
204209
<action id="flutter.xcode.open" class="io.flutter.actions.OpenInXcodeAction"
205-
text="Open iOS/macOS module in Xcode"
210+
text="Open iOS/macOS Module in Xcode"
206211
description="Launch Xcode to edit the iOS module as a top-level project"/>
207212
<action id="flutter.appcode.open" class="io.flutter.actions.OpenInAppCodeAction"
208-
text="Open iOS module in AppCode"
213+
text="Open iOS Module in AppCode"
209214
description="Launch AppCode to edit the iOS module as a top-level project"/>
210215
<separator/>
211216
<action id="flutter.submitFeedback" class="io.flutter.actions.FlutterSubmitFeedback"
@@ -216,6 +221,7 @@
216221
<!-- project explorer actions -->
217222
<group id="FlutterPackagesExplorerActionGroup" class="io.flutter.actions.FlutterPackagesExplorerActionGroup">
218223
<separator/>
224+
<!--suppress PluginXmlCapitalization -->
219225
<group text="Flutter" description="Flutter Tools" icon="FlutterIcons.Flutter" popup="true">
220226
<separator/>
221227
<reference ref="flutter.pub.get"/>
@@ -288,21 +294,25 @@
288294
icon="FlutterIcons.HotRestart">
289295
<keyboard-shortcut keymap="$default" first-keystroke="ctrl shift BACK_SLASH"/>
290296
</action>
297+
<!--suppress PluginXmlCapitalization -->
291298
<action id="Flutter.Toolbar.ReloadAllAction" class="io.flutter.actions.ReloadAllFlutterAppsRetarget"
292299
description="Reload All Devices"
293300
icon="FlutterIcons.HotReload">
294301
<keyboard-shortcut keymap="$default" first-keystroke="ctrl alt BACK_SLASH"/>
295302
</action>
303+
<!--suppress PluginXmlCapitalization -->
296304
<action id="Flutter.Toolbar.RestartAllAction" class="io.flutter.actions.RestartAllFlutterAppsRetarget"
297305
description="Restart All Devices"
298306
icon="FlutterIcons.HotRestart">
299307
<keyboard-shortcut keymap="$default" first-keystroke="ctrl alt shift BACK_SLASH"/>
300308
</action>
301309
<separator/>
310+
<!--suppress PluginXmlCapitalization -->
302311
<action id="Flutter.Menu.RunProfileAction" class="io.flutter.actions.RunProfileFlutterApp"
303312
description="Flutter Run Profile Mode"
304313
icon="AllIcons.Actions.Execute">
305314
</action>
315+
<!--suppress PluginXmlCapitalization -->
306316
<action id="Flutter.Menu.RunReleaseAction" class="io.flutter.actions.RunReleaseFlutterApp"
307317
description="Flutter Run Release Mode"
308318
icon="AllIcons.Actions.Execute">
@@ -323,10 +333,12 @@
323333
<add-to-group group-id="HelpMenu" anchor="after" relative-to-action="HelpTopics"/>
324334
</action>
325335

336+
<!--suppress PluginXmlCapitalization -->
326337
<action id="io.flutter.RestartDaemon" class="io.flutter.actions.RestartFlutterDaemonAction"
327338
text="Restart Flutter Daemon" description="Restart Flutter Daemon" icon="FlutterIcons.Flutter">
328339
</action>
329340

341+
<!--suppress PluginXmlCapitalization -->
330342
<action id="io.flutter.OpenDevToolsAction" class="io.flutter.run.OpenDevToolsAction"
331343
text="Open Flutter DevTools in Browser" description="Open Flutter DevTools in Browser" icon="FlutterIcons.Dart_16">
332344
</action>
@@ -351,14 +363,10 @@
351363
<iconMapper mappingFile="FlutterIconMappings.json"/>
352364
<postStartupActivity implementation="io.flutter.ProjectOpenActivity"/>
353365
<postStartupActivity implementation="io.flutter.FlutterInitializer"/>
354-
<projectService serviceInterface="io.flutter.run.daemon.DeviceService"
355-
serviceImplementation="io.flutter.run.daemon.DeviceService"/>
356-
<projectService serviceInterface="io.flutter.run.daemon.DevToolsService"
357-
serviceImplementation="io.flutter.run.daemon.DevToolsService"/>
358-
<projectService serviceInterface="io.flutter.dart.FlutterDartAnalysisServer"
359-
serviceImplementation="io.flutter.dart.FlutterDartAnalysisServer"/>
360-
<projectService serviceInterface="io.flutter.bazel.WorkspaceCache"
361-
serviceImplementation="io.flutter.bazel.WorkspaceCache"/>
366+
<projectService serviceImplementation="io.flutter.run.daemon.DeviceService"/>
367+
<projectService serviceImplementation="io.flutter.run.daemon.DevToolsService"/>
368+
<projectService serviceImplementation="io.flutter.dart.FlutterDartAnalysisServer"/>
369+
<projectService serviceImplementation="io.flutter.bazel.WorkspaceCache"/>
362370
<projectService serviceImplementation="io.flutter.pub.PubRootCache"/>
363371

364372
<backgroundPostStartupActivity implementation="io.flutter.sdk.FlutterProjectActivity"/>
@@ -393,9 +401,7 @@
393401
<projectService serviceImplementation="io.flutter.sdk.FlutterSdkManager"/>
394402
<projectService serviceImplementation="io.flutter.sdk.AndroidEmulatorManager"/>
395403

396-
<applicationService serviceInterface="io.flutter.settings.FlutterSettings"
397-
serviceImplementation="io.flutter.settings.FlutterSettings"
398-
overrides="false"/>
404+
<applicationService serviceImplementation="io.flutter.settings.FlutterSettings" overrides="false"/>
399405

400406
<applicationService serviceImplementation="io.flutter.jxbrowser.EmbeddedBrowserEngine" overrides="false" />
401407
<applicationService serviceImplementation="io.flutter.font.FontPreviewProcessor"/>
@@ -431,19 +437,11 @@
431437
<editorNotificationProvider implementation="io.flutter.editor.NativeEditorNotificationProvider"/>
432438
<editorNotificationProvider implementation="io.flutter.samples.FlutterSampleNotificationProvider"/>
433439

434-
<projectService serviceInterface="io.flutter.run.FlutterReloadManager"
435-
serviceImplementation="io.flutter.run.FlutterReloadManager"
436-
overrides="false"/>
437-
<projectService serviceInterface="io.flutter.editor.FlutterSaveActionsManager"
438-
serviceImplementation="io.flutter.editor.FlutterSaveActionsManager"
439-
overrides="false"/>
440-
<projectService serviceInterface="io.flutter.run.FlutterAppManager"
441-
serviceImplementation="io.flutter.run.FlutterAppManager"
442-
overrides="false"/>
440+
<projectService serviceImplementation="io.flutter.run.FlutterReloadManager" overrides="false"/>
441+
<projectService serviceImplementation="io.flutter.editor.FlutterSaveActionsManager" overrides="false"/>
442+
<projectService serviceImplementation="io.flutter.run.FlutterAppManager" overrides="false"/>
443443

444-
<projectService serviceInterface="io.flutter.editor.ActiveEditorsOutlineService"
445-
serviceImplementation="io.flutter.editor.ActiveEditorsOutlineService"
446-
overrides="false"/>
444+
<projectService serviceImplementation="io.flutter.editor.ActiveEditorsOutlineService" overrides="false"/>
447445

448446
<iconProvider implementation="io.flutter.project.FlutterIconProvider" order="first"/>
449447

@@ -455,12 +453,8 @@
455453
<search.optionContributor implementation="io.flutter.sdk.FlutterSearchableOptionContributor"/>
456454
<readerModeMatcher implementation="io.flutter.editor.FlutterReaderModeMatcher"/>
457455

458-
<projectService serviceInterface="io.flutter.jxbrowser.EmbeddedJxBrowser"
459-
serviceImplementation="io.flutter.jxbrowser.EmbeddedJxBrowser"
460-
overrides="false"/>
461-
<projectService serviceInterface="io.flutter.view.EmbeddedJcefBrowser"
462-
serviceImplementation="io.flutter.view.EmbeddedJcefBrowser"
463-
overrides="false"/>
456+
<projectService serviceImplementation="io.flutter.jxbrowser.EmbeddedJxBrowser" overrides="false"/>
457+
<projectService serviceImplementation="io.flutter.view.EmbeddedJcefBrowser" overrides="false"/>
464458
<notificationGroup displayType="STICKY_BALLOON" id="deeplink"/>
465459
<notificationGroup displayType="TOOL_WINDOW" id="flutter-run" toolWindowId="Run" />
466460
<notificationGroup displayType="TOOL_WINDOW" id="flutter-debug" toolWindowId="Debug" />

‎resources/META-INF/plugin_template.xml

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!--suppress PluginXmlI18n -->
12
<idea-plugin>
23
<id>@PLUGINID@</id>
34
<name>Flutter</name>
@@ -54,6 +55,7 @@
5455

5556
<actions>
5657
<group id="Flutter.MainToolbarActions">
58+
<!--suppress PluginXmlCapitalization -->
5759
<action id="Flutter.DeviceSelector" class="io.flutter.actions.DeviceSelectorAction"
5860
description="Flutter Device Selection"
5961
icon="FlutterIcons.Phone"/>
@@ -65,6 +67,7 @@
6567

6668
<!-- This is to keep device selector in old UI -->
6769
<group id="Flutter.MainToolbarActionsLegacy">
70+
<!--suppress PluginXmlCapitalization -->
6871
<action id="Flutter.DeviceSelectorLegacy" class="io.flutter.actions.DeviceSelectorAction"
6972
description="Flutter Device Selection"
7073
icon="FlutterIcons.Phone"/>
@@ -74,6 +77,7 @@
7477
<add-to-group anchor="before" group-id="ToolbarRunGroup" relative-to-action="RunConfiguration"/>
7578
</group>
7679

80+
<!--suppress PluginXmlCapitalization -->
7781
<group id="FlutterToolsActionGroup" class="io.flutter.actions.FlutterToolsActionGroup" popup="true"
7882
text="Flutter" description="Flutter Tools" icon="FlutterIcons.Flutter">
7983
<add-to-group group-id="ToolsMenu" anchor="last"/>
@@ -102,6 +106,7 @@
102106
text="Flutter Clean"
103107
description="Run 'flutter clean'"/>
104108
<separator/>
109+
<!--suppress PluginXmlCapitalization -->
105110
<action id="flutter.devtools.open" class="io.flutter.run.OpenDevToolsAction"
106111
text="Open Flutter DevTools in Browser"
107112
description="Open Flutter DevTools in Browser"/>
@@ -110,10 +115,10 @@
110115
<!-- text="Open Android module in Android Studio"-->
111116
<!-- description="Launch Android Studio to edit the Android module as a top-level project"/>-->
112117
<action id="flutter.xcode.open" class="io.flutter.actions.OpenInXcodeAction"
113-
text="Open iOS/macOS module in Xcode"
118+
text="Open iOS/macOS Module in Xcode"
114119
description="Launch Xcode to edit the iOS module as a top-level project"/>
115120
<action id="flutter.appcode.open" class="io.flutter.actions.OpenInAppCodeAction"
116-
text="Open iOS module in AppCode"
121+
text="Open iOS Module in AppCode"
117122
description="Launch AppCode to edit the iOS module as a top-level project"/>
118123
<separator/>
119124
<action id="flutter.submitFeedback" class="io.flutter.actions.FlutterSubmitFeedback"
@@ -124,6 +129,7 @@
124129
<!-- project explorer actions -->
125130
<group id="FlutterPackagesExplorerActionGroup" class="io.flutter.actions.FlutterPackagesExplorerActionGroup">
126131
<separator/>
132+
<!--suppress PluginXmlCapitalization -->
127133
<group text="Flutter" description="Flutter Tools" icon="FlutterIcons.Flutter" popup="true">
128134
<separator/>
129135
<reference ref="flutter.pub.get"/>
@@ -196,21 +202,25 @@
196202
icon="FlutterIcons.HotRestart">
197203
<keyboard-shortcut keymap="$default" first-keystroke="ctrl shift BACK_SLASH"/>
198204
</action>
205+
<!--suppress PluginXmlCapitalization -->
199206
<action id="Flutter.Toolbar.ReloadAllAction" class="io.flutter.actions.ReloadAllFlutterAppsRetarget"
200207
description="Reload All Devices"
201208
icon="FlutterIcons.HotReload">
202209
<keyboard-shortcut keymap="$default" first-keystroke="ctrl alt BACK_SLASH"/>
203210
</action>
211+
<!--suppress PluginXmlCapitalization -->
204212
<action id="Flutter.Toolbar.RestartAllAction" class="io.flutter.actions.RestartAllFlutterAppsRetarget"
205213
description="Restart All Devices"
206214
icon="FlutterIcons.HotRestart">
207215
<keyboard-shortcut keymap="$default" first-keystroke="ctrl alt shift BACK_SLASH"/>
208216
</action>
209217
<separator/>
218+
<!--suppress PluginXmlCapitalization -->
210219
<action id="Flutter.Menu.RunProfileAction" class="io.flutter.actions.RunProfileFlutterApp"
211220
description="Flutter Run Profile Mode"
212221
icon="AllIcons.Actions.Execute">
213222
</action>
223+
<!--suppress PluginXmlCapitalization -->
214224
<action id="Flutter.Menu.RunReleaseAction" class="io.flutter.actions.RunReleaseFlutterApp"
215225
description="Flutter Run Release Mode"
216226
icon="AllIcons.Actions.Execute">
@@ -231,10 +241,12 @@
231241
<add-to-group group-id="HelpMenu" anchor="after" relative-to-action="HelpTopics"/>
232242
</action>
233243

244+
<!--suppress PluginXmlCapitalization -->
234245
<action id="io.flutter.RestartDaemon" class="io.flutter.actions.RestartFlutterDaemonAction"
235246
text="Restart Flutter Daemon" description="Restart Flutter Daemon" icon="FlutterIcons.Flutter">
236247
</action>
237248

249+
<!--suppress PluginXmlCapitalization -->
238250
<action id="io.flutter.OpenDevToolsAction" class="io.flutter.run.OpenDevToolsAction"
239251
text="Open Flutter DevTools in Browser" description="Open Flutter DevTools in Browser" icon="FlutterIcons.Dart_16">
240252
</action>
@@ -259,14 +271,10 @@
259271
<iconMapper mappingFile="FlutterIconMappings.json"/>
260272
<postStartupActivity implementation="io.flutter.ProjectOpenActivity"/>
261273
<postStartupActivity implementation="io.flutter.FlutterInitializer"/>
262-
<projectService serviceInterface="io.flutter.run.daemon.DeviceService"
263-
serviceImplementation="io.flutter.run.daemon.DeviceService"/>
264-
<projectService serviceInterface="io.flutter.run.daemon.DevToolsService"
265-
serviceImplementation="io.flutter.run.daemon.DevToolsService"/>
266-
<projectService serviceInterface="io.flutter.dart.FlutterDartAnalysisServer"
267-
serviceImplementation="io.flutter.dart.FlutterDartAnalysisServer"/>
268-
<projectService serviceInterface="io.flutter.bazel.WorkspaceCache"
269-
serviceImplementation="io.flutter.bazel.WorkspaceCache"/>
274+
<projectService serviceImplementation="io.flutter.run.daemon.DeviceService"/>
275+
<projectService serviceImplementation="io.flutter.run.daemon.DevToolsService"/>
276+
<projectService serviceImplementation="io.flutter.dart.FlutterDartAnalysisServer"/>
277+
<projectService serviceImplementation="io.flutter.bazel.WorkspaceCache"/>
270278
<projectService serviceImplementation="io.flutter.pub.PubRootCache"/>
271279

272280
<backgroundPostStartupActivity implementation="io.flutter.sdk.FlutterProjectActivity"/>
@@ -301,9 +309,7 @@
301309
<projectService serviceImplementation="io.flutter.sdk.FlutterSdkManager"/>
302310
<projectService serviceImplementation="io.flutter.sdk.AndroidEmulatorManager"/>
303311

304-
<applicationService serviceInterface="io.flutter.settings.FlutterSettings"
305-
serviceImplementation="io.flutter.settings.FlutterSettings"
306-
overrides="false"/>
312+
<applicationService serviceImplementation="io.flutter.settings.FlutterSettings" overrides="false"/>
307313

308314
<applicationService serviceImplementation="io.flutter.jxbrowser.EmbeddedBrowserEngine" overrides="false" />
309315
<applicationService serviceImplementation="io.flutter.font.FontPreviewProcessor"/>
@@ -339,19 +345,11 @@
339345
<editorNotificationProvider implementation="io.flutter.editor.NativeEditorNotificationProvider"/>
340346
<editorNotificationProvider implementation="io.flutter.samples.FlutterSampleNotificationProvider"/>
341347

342-
<projectService serviceInterface="io.flutter.run.FlutterReloadManager"
343-
serviceImplementation="io.flutter.run.FlutterReloadManager"
344-
overrides="false"/>
345-
<projectService serviceInterface="io.flutter.editor.FlutterSaveActionsManager"
346-
serviceImplementation="io.flutter.editor.FlutterSaveActionsManager"
347-
overrides="false"/>
348-
<projectService serviceInterface="io.flutter.run.FlutterAppManager"
349-
serviceImplementation="io.flutter.run.FlutterAppManager"
350-
overrides="false"/>
348+
<projectService serviceImplementation="io.flutter.run.FlutterReloadManager" overrides="false"/>
349+
<projectService serviceImplementation="io.flutter.editor.FlutterSaveActionsManager" overrides="false"/>
350+
<projectService serviceImplementation="io.flutter.run.FlutterAppManager" overrides="false"/>
351351

352-
<projectService serviceInterface="io.flutter.editor.ActiveEditorsOutlineService"
353-
serviceImplementation="io.flutter.editor.ActiveEditorsOutlineService"
354-
overrides="false"/>
352+
<projectService serviceImplementation="io.flutter.editor.ActiveEditorsOutlineService" overrides="false"/>
355353

356354
<iconProvider implementation="io.flutter.project.FlutterIconProvider" order="first"/>
357355

@@ -363,12 +361,8 @@
363361
<search.optionContributor implementation="io.flutter.sdk.FlutterSearchableOptionContributor"/>
364362
<readerModeMatcher implementation="io.flutter.editor.FlutterReaderModeMatcher"/>
365363

366-
<projectService serviceInterface="io.flutter.jxbrowser.EmbeddedJxBrowser"
367-
serviceImplementation="io.flutter.jxbrowser.EmbeddedJxBrowser"
368-
overrides="false"/>
369-
<projectService serviceInterface="io.flutter.view.EmbeddedJcefBrowser"
370-
serviceImplementation="io.flutter.view.EmbeddedJcefBrowser"
371-
overrides="false"/>
364+
<projectService serviceImplementation="io.flutter.jxbrowser.EmbeddedJxBrowser" overrides="false"/>
365+
<projectService serviceImplementation="io.flutter.view.EmbeddedJcefBrowser" overrides="false"/>
372366
<notificationGroup displayType="STICKY_BALLOON" id="deeplink"/>
373367
<notificationGroup displayType="TOOL_WINDOW" id="flutter-run" toolWindowId="Run" />
374368
<notificationGroup displayType="TOOL_WINDOW" id="flutter-debug" toolWindowId="Debug" />

0 commit comments

Comments
 (0)