From c599f2a4be25825bb6bd90eef0acb1a2168beff6 Mon Sep 17 00:00:00 2001
From: Googler <intellij-github@google.com>
Date: Mon, 13 Jan 2025 23:30:03 +0100
Subject: [PATCH] plugin.xml: replace <reference> `id` with `ref` (IJPL-171993)

(cherry picked from commit 07c85a3e226c35c6f488760572bf9fe7308d8526)
(with fixups to cover new code)

GitOrigin-RevId: af77ae2b1a15450c2e9d8defd2f8aa310ebe25d5
Change-Id: Ia68206973a31e1b7750a6a9a400ba72b87e3a63e

AOSP: 6c2b2d9c8fb1a83009b49a28432b0a6400f6a71b
---
 base/src/META-INF/blaze-base.xml    | 44 ++++++++++++++---------------
 java/src/META-INF/java-contents.xml |  8 +++---
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/base/src/META-INF/blaze-base.xml b/base/src/META-INF/blaze-base.xml
index 55f26730761..55531dc470c 100644
--- a/base/src/META-INF/blaze-base.xml
+++ b/base/src/META-INF/blaze-base.xml
@@ -162,37 +162,37 @@
     <group id="Blaze.MainMenuActionGroup" class="com.google.idea.blaze.base.actions.BlazeMenuGroup" popup="true">
       <add-to-group group-id="MainMenu" anchor="before" relative-to-action="HelpMenu"/>
       <group id ="Blaze.SyncMenuGroup" text="_Sync" popup="true">
-        <reference id="Blaze.IncrementalSyncProject"/>
-        <reference id="Blaze.FullSyncProject"/>
-        <reference id="Blaze.SyncWorkingSet"/>
-        <reference id="Blaze.PartialSync"/>
-        <reference id="Blaze.UpdateDirectories"/>
-        <reference id="Blaze.CleanProjectTargets"/>
-        <reference id="Blaze.ExpandSyncToWorkingSet"/>
-        <reference id="Blaze.ShowPerformanceWarnings"/>
+        <reference ref="Blaze.IncrementalSyncProject"/>
+        <reference ref="Blaze.FullSyncProject"/>
+        <reference ref="Blaze.SyncWorkingSet"/>
+        <reference ref="Blaze.PartialSync"/>
+        <reference ref="Blaze.UpdateDirectories"/>
+        <reference ref="Blaze.CleanProjectTargets"/>
+        <reference ref="Blaze.ExpandSyncToWorkingSet"/>
+        <reference ref="Blaze.ShowPerformanceWarnings"/>
       </group>
       <group id="Blaze.EnableAnalysisGroup" text="Enable _Analysis" popup="true">
-        <reference id="Blaze.BuildDependencies" />
-        <reference id="Blaze.BuildReverseDependencies" />
-        <reference id="Blaze.BuildOpenFileDependencies" />
-        <reference id="Blaze.BuildDependenciesForWorkingSet"/>
-        <reference id="Blaze.BuildDependenciesForProject" />
+        <reference ref="Blaze.BuildDependencies" />
+        <reference ref="Blaze.BuildReverseDependencies" />
+        <reference ref="Blaze.BuildOpenFileDependencies" />
+        <reference ref="Blaze.BuildDependenciesForWorkingSet"/>
+        <reference ref="Blaze.BuildDependenciesForProject" />
       </group>
       <group id="Blaze.BuildMenuGroup" text="_Build" popup="true">
-        <reference id="MakeBlazeProject"/>
-        <reference id="MakeBlazeModule"/>
+        <reference ref="MakeBlazeProject"/>
+        <reference ref="MakeBlazeModule"/>
       </group>
       <group id="Blaze.Project" text="_Project" popup="true">
-        <reference id="Blaze.EditProjectView"/>
-        <reference id="Blaze.AddDirectoryToProjectView"/>
-        <reference id="Blaze.AddSourceToProject"/>
+        <reference ref="Blaze.EditProjectView"/>
+        <reference ref="Blaze.AddDirectoryToProjectView"/>
+        <reference ref="Blaze.AddSourceToProject"/>
       </group>
       <!--Add popup groups anchored after this bookmark-->
       <group id="Blaze.MenuGroupsBookmark"/>
       <separator/>
-      <reference id="Blaze.ExportRunConfigurations"/>
-      <reference id="Blaze.ResetQuerySync" />
-      <reference id="Blaze.FileGitHubIssueAction"/>
+      <reference ref="Blaze.ExportRunConfigurations"/>
+      <reference ref="Blaze.ResetQuerySync" />
+      <reference ref="Blaze.FileGitHubIssueAction"/>
       <!--Add single menu items anchored after this bookmark-->
       <group id="Blaze.MenuFooter"/>
     </group>
@@ -200,7 +200,7 @@
     <group id="Blaze.MainToolBarActionGroup">
       <add-to-group group-id="MainToolbarRight" anchor="before" relative-to-action="HelpTopics" />
       <add-to-group group-id="NavBarToolBarOthers" anchor="last"/>
-      <reference id="Blaze.IncrementalSyncProject"/>
+      <reference ref="Blaze.IncrementalSyncProject"/>
     </group>
 
     <group id="Blaze.PerFileContextMenu">
diff --git a/java/src/META-INF/java-contents.xml b/java/src/META-INF/java-contents.xml
index c4ca8689bb5..7b39c615b92 100644
--- a/java/src/META-INF/java-contents.xml
+++ b/java/src/META-INF/java-contents.xml
@@ -41,10 +41,10 @@
 
     <group id="Blaze.Java.ProjectViewPopupMenu">
       <add-to-group group-id="Blaze.PerFileContextMenu"/>
-      <reference id="Blaze.ExcludeLibraryAction"/>
-      <reference id="Blaze.AttachSourceJarAction"/>
-      <reference id="Blaze.AddLibraryTargetDirectoryToProjectView"/>
-      <reference id="Blaze.DescribeLibraryAction"/>
+      <reference ref="Blaze.ExcludeLibraryAction"/>
+      <reference ref="Blaze.AttachSourceJarAction"/>
+      <reference ref="Blaze.AddLibraryTargetDirectoryToProjectView"/>
+      <reference ref="Blaze.DescribeLibraryAction"/>
     </group>
   </actions>