Merge pull request #747 from JetBrains/233-mb-shouldReplace

Azure Functions: Default run configuration is no longer Azure Functions run configuration
JetBrains · Dec 19, 2023 · 1a4a2b9 · 1a4a2b9
2 parents 8bc1ef3 + 502ce93
commit 1a4a2b9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml
@@ -12,6 +12,7 @@
         </ul>
         <h4>Fixed bugs:</h4>
         <ul>
+          <li>Azure Functions: Default run configuration is no longer Azure Functions run configuration (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/746">#746</a>)</li>
           <li>Azure Functions: Fix casing for the `AzureFunctionsVersion` project property (<a href="https://youtrack.jetbrains.com/issue/RIDER-98036">RIDER-98036</a>)</li>
           <li>Azure Functions: Fix Azure Functions tool paths configuration (<a href="https://youtrack.jetbrains.com/issue/RIDER-98014">RIDER-98014</a>)</li>
         </ul>

diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml
@@ -31,6 +31,7 @@
         </ul>
         <h4>Fixed bugs:</h4>
         <ul>
+          <li>Azure Functions: Default run configuration is no longer Azure Functions run configuration (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/746">#746</a>)</li>
           <li>Azure Functions: Fix casing for the `AzureFunctionsVersion` project property (<a href="https://youtrack.jetbrains.com/issue/RIDER-98036">RIDER-98036</a>)</li>
           <li>Azure Functions: Fix Azure Functions tool paths configuration (<a href="https://youtrack.jetbrains.com/issue/RIDER-98014">RIDER-98014</a>)</li>
         </ul>

diff --git a/...c/org/jetbrains/plugins/azure/functions/run/AzureFunctionsHostRunConfigurationProducer.kt b/...c/org/jetbrains/plugins/azure/functions/run/AzureFunctionsHostRunConfigurationProducer.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020-2022 JetBrains s.r.o.
+ * Copyright (c) 2020-2023 JetBrains s.r.o.
  *
  * All rights reserved.
  *
@@ -23,6 +23,7 @@
 package org.jetbrains.plugins.azure.functions.run
 
 import com.intellij.execution.actions.ConfigurationContext
+import com.intellij.execution.actions.ConfigurationFromContext
 import com.intellij.execution.actions.LazyRunConfigurationProducer
 import com.intellij.execution.configurations.ConfigurationTypeUtil
 import com.intellij.openapi.util.Ref
@@ -82,4 +83,8 @@ class AzureFunctionsHostRunConfigurationProducer
 
         return true
     }
+
+    override fun shouldReplace(self: ConfigurationFromContext, other: ConfigurationFromContext): Boolean {
+        return !other.isProducedBy(AzureFunctionsHostRunConfigurationProducer::class.java)
+    }
 }