From ec5deaf1dce7f94ba07b85b7871d09381712b336 Mon Sep 17 00:00:00 2001
From: Mai Hussien <70515749+mai93@users.noreply.github.com>
Date: Wed, 13 Dec 2023 14:10:09 -0800
Subject: [PATCH] Fix go examples (#5839)

---
 .../run_configurations/test_macro_expansion.xml    | 14 --------------
 .../go/with_go_source/with_go_source.bazelproject  |  6 ------
 .../run_configurations/test_macro_expansion.xml    | 14 ++++++++++++++
 examples/go/with_proto/with_proto.bazelproject     |  6 ++++++
 4 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 examples/go/with_go_source/run_configurations/test_macro_expansion.xml
 create mode 100644 examples/go/with_proto/run_configurations/test_macro_expansion.xml

diff --git a/examples/go/with_go_source/run_configurations/test_macro_expansion.xml b/examples/go/with_go_source/run_configurations/test_macro_expansion.xml
deleted file mode 100644
index dec8b2d7264..00000000000
--- a/examples/go/with_go_source/run_configurations/test_macro_expansion.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<configuration name="Bazel test go:go_test" type="BlazeCommandRunConfigurationType"
-  factoryName="Bazel Command" nameIsGenerated="true">
-  <blaze-settings handler-id="BlazeGoRunConfigurationHandlerProvider" blaze-command="test"
-    kind="go_test">
-    <blaze-target>//go:go_test</blaze-target>
-    <blaze-user-flag>--test_filter=^TestFlagMacros$</blaze-user-flag>
-    <blaze-user-flag>--test_env=GO_TEST_WRAP_TESTV=1</blaze-user-flag>
-    <blaze-user-flag>--test_env=WORKSPACE_ROOT=$WorkspaceRoot$</blaze-user-flag>
-    <blaze-user-flag>--test_env=PROJECT_NAME=$ProjectName$</blaze-user-flag>
-  </blaze-settings>
-  <method v="2">
-    <option name="Blaze.BeforeRunTask" enabled="true"/>
-  </method>
-</configuration>
\ No newline at end of file
diff --git a/examples/go/with_go_source/with_go_source.bazelproject b/examples/go/with_go_source/with_go_source.bazelproject
index 3f0d2cbdc49..132e0ceccd7 100644
--- a/examples/go/with_go_source/with_go_source.bazelproject
+++ b/examples/go/with_go_source/with_go_source.bazelproject
@@ -7,9 +7,3 @@ additional_languages:
   go
 
 gazelle_target: //:gazelle
-
-import_run_configurations:
-  # Test that validates that macro expansion works, as per issue:
-  #    https://github.com/bazelbuild/intellij/issues/4112#event-7958662669
-  # This configuration should be executed on both 'run' (the green arrow) and 'debug' (the bug) modes.
-  run_configurations/test_macro_expansion.xml
diff --git a/examples/go/with_proto/run_configurations/test_macro_expansion.xml b/examples/go/with_proto/run_configurations/test_macro_expansion.xml
new file mode 100644
index 00000000000..769fe0d0b8d
--- /dev/null
+++ b/examples/go/with_proto/run_configurations/test_macro_expansion.xml
@@ -0,0 +1,14 @@
+<configuration name="Bazel test go:go_test" type="BlazeCommandRunConfigurationType"
+               factoryName="Bazel Command" nameIsGenerated="true">
+    <blaze-settings handler-id="BlazeGoRunConfigurationHandlerProvider" blaze-command="test"
+                    kind="go_test">
+        <blaze-target>//go:go_test</blaze-target>
+        <blaze-user-flag>--test_filter=^TestFlagMacros$</blaze-user-flag>
+        <blaze-user-flag>--test_env=GO_TEST_WRAP_TESTV=1</blaze-user-flag>
+        <blaze-user-flag>--test_env=WORKSPACE_ROOT=$WorkspaceRoot$</blaze-user-flag>
+        <blaze-user-flag>--test_env=PROJECT_NAME=$ProjectName$</blaze-user-flag>
+    </blaze-settings>
+    <method v="2">
+        <option name="Blaze.BeforeRunTask" enabled="true"/>
+    </method>
+</configuration>
\ No newline at end of file
diff --git a/examples/go/with_proto/with_proto.bazelproject b/examples/go/with_proto/with_proto.bazelproject
index 132e0ceccd7..3f0d2cbdc49 100644
--- a/examples/go/with_proto/with_proto.bazelproject
+++ b/examples/go/with_proto/with_proto.bazelproject
@@ -7,3 +7,9 @@ additional_languages:
   go
 
 gazelle_target: //:gazelle
+
+import_run_configurations:
+  # Test that validates that macro expansion works, as per issue:
+  #    https://github.com/bazelbuild/intellij/issues/4112#event-7958662669
+  # This configuration should be executed on both 'run' (the green arrow) and 'debug' (the bug) modes.
+  run_configurations/test_macro_expansion.xml