Merge pull request #703 from JetBrains/232.ra/publish-release

Target Rider 2023.2
JetBrains · Aug 8, 2023 · 30b099d · 30b099d
2 parents b16f4c4 + 0cfeb84
commit 30b099d
Show file tree

Hide file tree

Showing 11 changed files with 110 additions and 71 deletions.
diff --git a/BuildPlugin b/BuildPlugin
@@ -38,7 +38,7 @@ tc_open "Initializing build script"
     IJ_VERSION_MINOR=
     IJ_VERSION_LATEST=$IJ_VERSION_MAJOR.$IJ_VERSION_MINOR \
                       && [[ -z $IJ_VERSION_MINOR ]] && IJ_VERSION_LATEST=$IJ_VERSION_MAJOR
-    IJ_SCALA_VERSION_LATEST=2023.2.2
+    IJ_SCALA_VERSION_LATEST=2023.2.17
 
     while getopts ":hqvBC:e:" option; do
         case $option in

diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties
@@ -4,15 +4,15 @@ javaVersion=17
 org.gradle.jvmargs='-Duser.language=en'
 sources=false
 
-intellij_version=IC-232.6095-EAP-CANDIDATE-SNAPSHOT
-rider_version=RD-2023.2-EAP10-SNAPSHOT
-#rider_version=RD-2023.1
+intellij_version=IC-232.8660-EAP-CANDIDATE-SNAPSHOT
+#rider_version=RD-2023.2-EAP10-SNAPSHOT
+rider_version=RD-2023.2
 build_common_code_with=rider
 intellij_plugin_name=azure-toolkit-for-intellij
 rider_plugin_name=azure-toolkit-for-rider
 rider_backend_build_configuration=Debug
 
-dep_plugins=org.intellij.scala:2023.2.2
+dep_plugins=org.intellij.scala:2023.2.17
 applicationinsights.key=57cc111a-36a8-44b3-b044-25d293b8b77c
 
 updateVersionRange=false

diff --git a/...-intellij/idea/src/com/microsoft/azure/hdinsight/spark/console/SparkLivySessionProcess.kt b/...-intellij/idea/src/com/microsoft/azure/hdinsight/spark/console/SparkLivySessionProcess.kt
@@ -20,6 +20,8 @@
  * SOFTWARE.
  */
 
+@file:Suppress("MissingRecentApi")
+
 package com.microsoft.azure.hdinsight.spark.console
 
 import com.google.common.net.HostAndPort
@@ -38,6 +40,11 @@ class SparkLivySessionProcess(
     override fun isDisconnected(): Boolean = session.isStop
 
     override fun getLocalTunnel(remotePort: Int): HostAndPort? = null
+
+    override fun setWindowSize(p0: Int, p1: Int) {
+        // NOTE: Added override to make compilation in Rider toolkit work.
+        // This needs fixing in case we want to revive the IDEA plugin here.
+    }
 
     override fun killProcessTree(): Boolean = true
 

diff --git a/...-intellij/idea/src/com/microsoft/azure/hdinsight/spark/run/SparkBatchJobProcessAdapter.kt b/...-intellij/idea/src/com/microsoft/azure/hdinsight/spark/run/SparkBatchJobProcessAdapter.kt
@@ -20,6 +20,8 @@
  * SOFTWARE.
  */
 
+@file:Suppress("MissingRecentApi")
+
 package com.microsoft.azure.hdinsight.spark.run
 
 import com.google.common.net.HostAndPort
@@ -49,6 +51,11 @@ class SparkBatchJobProcessAdapter(val sparkJobProcess: SparkBatchJobRemoteProces
         return sparkJobProcess.getLocalTunnel(i)
     }
 
+    override fun setWindowSize(p0: Int, p1: Int) {
+        // NOTE: Added override to make compilation in Rider toolkit work.
+        // This needs fixing in case we want to revive the IDEA plugin here.
+    }
+
     override fun getOutputStream(): OutputStream {
         return sparkJobProcess.outputStream
     }

diff --git a/...soft/azure/toolkit/intellij/webapp/runner/webappconfig/slimui/WebAppSlimSettingPanel.java b/...soft/azure/toolkit/intellij/webapp/runner/webappconfig/slimui/WebAppSlimSettingPanel.java
@@ -95,9 +95,12 @@ public WebAppSlimSettingPanel(@NotNull Project project, @NotNull WebAppConfigura
             @Override
             public void focusGained(FocusEvent focusEvent) {
                 btnSlotHover.setBorderPainted(true);
-                final MouseEvent phantom = new MouseEvent(btnSlotHover, MouseEvent.MOUSE_ENTERED,
-                                                          System.currentTimeMillis(), 0, 10, 10, 0, false);
-                DefaultLoader.getIdeHelper().invokeLater(() -> IdeTooltipManager.getInstance().eventDispatched(phantom));
+
+                // NOTE: Commented out to make compilation in Rider toolkit work.
+                // This needs fixing in case we want to revive the IDEA plugin here.
+                //final MouseEvent phantom = new MouseEvent(btnSlotHover, MouseEvent.MOUSE_ENTERED,
+                //                                          System.currentTimeMillis(), 0, 10, 10, 0, false);
+                //DefaultLoader.getIdeHelper().invokeLater(() -> IdeTooltipManager.getInstance().eventDispatched(phantom));
             }
 
             @Override

diff --git a/...Intellisense/FunctionApp/LiveTemplates/Scope/AzureCSharpProjectScopeCategoryUIProvider.cs b/...Intellisense/FunctionApp/LiveTemplates/Scope/AzureCSharpProjectScopeCategoryUIProvider.cs
@@ -28,7 +28,7 @@ namespace JetBrains.ReSharper.Azure.Intellisense.FunctionApp.LiveTemplates.Scope
     [ScopeCategoryUIProvider(Priority = -40, ScopeFilter = ScopeFilter.Project)]
     public class AzureCSharpProjectScopeCategoryUIProvider : ScopeCategoryUIProvider
     {
-        public AzureCSharpProjectScopeCategoryUIProvider(): base(CommonThemedIcons.DotNet.Id)
+        public AzureCSharpProjectScopeCategoryUIProvider() : base(CommonThemedIcons.DotNet.Id)
         {
             MainPoint = new InAzureFunctionsCSharpProject();
         }

diff --git a/...src/Azure.Intellisense/FunctionApp/LiveTemplates/Scope/AzureFSharpProjectScopeProvider.cs b/...src/Azure.Intellisense/FunctionApp/LiveTemplates/Scope/AzureFSharpProjectScopeProvider.cs
@@ -26,6 +26,7 @@
 
 namespace JetBrains.ReSharper.Azure.Intellisense.FunctionApp.LiveTemplates.Scope
 {
+    // ReSharper disable once InconsistentNaming
     public class InAzureFunctionsFSharpProject : InAzureFunctionsProject
     {
         private static readonly Guid ourDefaultGuid = new Guid("6EAE234E-60AA-410E-B021-D219A2478F98");

diff --git a/...t-for-intellij/rider/ReSharper.Azure/src/Azure.Intellisense/Templates/README.md b/...t-for-intellij/rider/ReSharper.Azure/src/Azure.Intellisense/Templates/README.md
@@ -4,59 +4,59 @@
 
 ### File Templates
 
-Description |
-------------|
-[Blob Trigger](File/CSharp/DefaultWorker/CS_Blob_Trigger.md) |
-[Blob Trigger](File/CSharp/IsolatedWorker/CS_Blob_Trigger.md) |
-[Blob Trigger](File/FSharp/DefaultWorker/FS_Blob_Trigger.md) |
-[Blob Trigger](File/FSharp/IsolatedWorker/FS_Blob_Trigger.md) |
-[CosmosDB Trigger](File/CSharp/DefaultWorker/CS_CosmosDB_Trigger.md) |
-[CosmosDB Trigger](File/CSharp/IsolatedWorker/CS_CosmosDB_Trigger.md) |
-[CosmosDB Trigger](File/FSharp/DefaultWorker/FS_CosmosDB_Trigger.md) |
-[CosmosDB Trigger](File/FSharp/IsolatedWorker/FS_CosmosDB_Trigger.md) |
-[Durable Functions Orchestration](File/CSharp/DefaultWorker/CS_Durable_Functions_Orchestration.md) |
-[Event Grid Trigger](File/CSharp/DefaultWorker/CS_Event_Grid_Trigger.md) |
-[Event Grid Trigger](File/CSharp/IsolatedWorker/CS_Event_Grid_Trigger.md) |
-[Event Grid Trigger](File/FSharp/DefaultWorker/FS_Event_Grid_Trigger.md) |
-[Event Grid Trigger](File/FSharp/IsolatedWorker/FS_Event_Grid_Trigger.md) |
-[Event Hub Trigger](File/CSharp/DefaultWorker/CS_Event_Hub_Trigger.md) |
-[Event Hub Trigger](File/CSharp/IsolatedWorker/CS_Event_Hub_Trigger.md) |
-[Event Hub Trigger](File/FSharp/DefaultWorker/FS_Event_Hub_Trigger.md) |
-[Event Hub Trigger](File/FSharp/IsolatedWorker/FS_Event_Hub_Trigger.md) |
-[HTTP Trigger](File/CSharp/DefaultWorker/CS_HTTP_Trigger.md) |
-[HTTP Trigger](File/CSharp/IsolatedWorker/CS_HTTP_Trigger.md) |
-[HTTP Trigger](File/FSharp/DefaultWorker/FS_HTTP_Trigger.md) |
-[HTTP Trigger](File/FSharp/IsolatedWorker/FS_HTTP_Trigger.md) |
-[IoT Hub Trigger](File/CSharp/DefaultWorker/CS_IoT_Hub_Trigger.md) |
-[Queue Trigger](File/CSharp/DefaultWorker/CS_Queue_Trigger.md) |
-[Queue Trigger](File/CSharp/IsolatedWorker/CS_Queue_Trigger.md) |
-[Queue Trigger](File/FSharp/DefaultWorker/FS_Queue_Trigger.md) |
-[Queue Trigger](File/FSharp/IsolatedWorker/FS_Queue_Trigger.md) |
-[Service Bus Queue Trigger](File/CSharp/DefaultWorker/CS_Service_Bus_Queue_Trigger.md) |
-[Service Bus Queue Trigger](File/CSharp/IsolatedWorker/CS_Service_Bus_Queue_Trigger.md) |
-[Service Bus Topic Trigger](File/CSharp/DefaultWorker/CS_Service_Bus_Topic_Trigger.md) |
-[Service Bus Topic Trigger](File/CSharp/IsolatedWorker/CS_Service_Bus_Topic_Trigger.md) |
-[Timer Trigger](File/CSharp/DefaultWorker/CS_Timer_Trigger.md) |
-[Timer Trigger](File/CSharp/IsolatedWorker/CS_Timer_Trigger.md) |
-[Timer Trigger](File/FSharp/DefaultWorker/FS_Timer_Trigger.md) |
-[Timer Trigger](File/FSharp/IsolatedWorker/FS_Timer_Trigger.md) |
+| Description                                                                                        |
+|----------------------------------------------------------------------------------------------------|
+| [Blob Trigger](File/CSharp/DefaultWorker/CS_Blob_Trigger.md)                                       |
+| [Blob Trigger](File/CSharp/IsolatedWorker/CS_Blob_Trigger.md)                                      |
+| [Blob Trigger](File/FSharp/DefaultWorker/FS_Blob_Trigger.md)                                       |
+| [Blob Trigger](File/FSharp/IsolatedWorker/FS_Blob_Trigger.md)                                      |
+| [CosmosDB Trigger](File/CSharp/DefaultWorker/CS_CosmosDB_Trigger.md)                               |
+| [CosmosDB Trigger](File/CSharp/IsolatedWorker/CS_CosmosDB_Trigger.md)                              |
+| [CosmosDB Trigger](File/FSharp/DefaultWorker/FS_CosmosDB_Trigger.md)                               |
+| [CosmosDB Trigger](File/FSharp/IsolatedWorker/FS_CosmosDB_Trigger.md)                              |
+| [Durable Functions Orchestration](File/CSharp/DefaultWorker/CS_Durable_Functions_Orchestration.md) |
+| [Event Grid Trigger](File/CSharp/DefaultWorker/CS_Event_Grid_Trigger.md)                           |
+| [Event Grid Trigger](File/CSharp/IsolatedWorker/CS_Event_Grid_Trigger.md)                          |
+| [Event Grid Trigger](File/FSharp/DefaultWorker/FS_Event_Grid_Trigger.md)                           |
+| [Event Grid Trigger](File/FSharp/IsolatedWorker/FS_Event_Grid_Trigger.md)                          |
+| [Event Hub Trigger](File/CSharp/DefaultWorker/CS_Event_Hub_Trigger.md)                             |
+| [Event Hub Trigger](File/CSharp/IsolatedWorker/CS_Event_Hub_Trigger.md)                            |
+| [Event Hub Trigger](File/FSharp/DefaultWorker/FS_Event_Hub_Trigger.md)                             |
+| [Event Hub Trigger](File/FSharp/IsolatedWorker/FS_Event_Hub_Trigger.md)                            |
+| [HTTP Trigger](File/CSharp/DefaultWorker/CS_HTTP_Trigger.md)                                       |
+| [HTTP Trigger](File/CSharp/IsolatedWorker/CS_HTTP_Trigger.md)                                      |
+| [HTTP Trigger](File/FSharp/DefaultWorker/FS_HTTP_Trigger.md)                                       |
+| [HTTP Trigger](File/FSharp/IsolatedWorker/FS_HTTP_Trigger.md)                                      |
+| [IoT Hub Trigger](File/CSharp/DefaultWorker/CS_IoT_Hub_Trigger.md)                                 |
+| [Queue Trigger](File/CSharp/DefaultWorker/CS_Queue_Trigger.md)                                     |
+| [Queue Trigger](File/CSharp/IsolatedWorker/CS_Queue_Trigger.md)                                    |
+| [Queue Trigger](File/FSharp/DefaultWorker/FS_Queue_Trigger.md)                                     |
+| [Queue Trigger](File/FSharp/IsolatedWorker/FS_Queue_Trigger.md)                                    |
+| [Service Bus Queue Trigger](File/CSharp/DefaultWorker/CS_Service_Bus_Queue_Trigger.md)             |
+| [Service Bus Queue Trigger](File/CSharp/IsolatedWorker/CS_Service_Bus_Queue_Trigger.md)            |
+| [Service Bus Topic Trigger](File/CSharp/DefaultWorker/CS_Service_Bus_Topic_Trigger.md)             |
+| [Service Bus Topic Trigger](File/CSharp/IsolatedWorker/CS_Service_Bus_Topic_Trigger.md)            |
+| [Timer Trigger](File/CSharp/DefaultWorker/CS_Timer_Trigger.md)                                     |
+| [Timer Trigger](File/CSharp/IsolatedWorker/CS_Timer_Trigger.md)                                    |
+| [Timer Trigger](File/FSharp/DefaultWorker/FS_Timer_Trigger.md)                                     |
+| [Timer Trigger](File/FSharp/IsolatedWorker/FS_Timer_Trigger.md)                                    |
 
 
 ### Live Templates
 
-Shortcut | Description
----------|------------
-[funcac](Live/DefaultWorker/funcac.md) | Creates an activity function method
-[funcblob](Live/DefaultWorker/funcblob.md) | Creates an Azure Function method with a blob trigger.
-[funccl](Live/DefaultWorker/funccl.md) | Creates an orchestration client function method
-[funccosmosdb](Live/DefaultWorker/funccosmosdb.md) | Creates an Azure Function method with a CosmosDB trigger.
-[funceventgrid](Live/DefaultWorker/funceventgrid.md) | Creates an Azure Function method with an Event Grid trigger.
-[funceventhub](Live/DefaultWorker/funceventhub.md) | Creates an Azure Function method with an Event Hub trigger.
-[funchttp](Live/DefaultWorker/funchttp.md) | Creates an Azure Function method with an HTTP trigger.
-[funciothub](Live/DefaultWorker/funciothub.md) | Creates an Azure Function method with an IoT Hub trigger.
-[funcor](Live/DefaultWorker/funcor.md) | Creates an orchestrator function method
-[funcqueue](Live/DefaultWorker/funcqueue.md) | Creates an Azure Function method with a queue trigger.
-[funcsbqueue](Live/DefaultWorker/funcsbqueue.md) | Creates an Azure Function method with a Service Bus queue trigger.
-[funcsbtopic](Live/DefaultWorker/funcsbtopic.md) | Creates an Azure Function method with a Service Bus topic trigger.
-[functimer](Live/DefaultWorker/functimer.md) | Creates an Azure Function method with a timer trigger.
+| Shortcut                                             | Description                                                        |
+|------------------------------------------------------|--------------------------------------------------------------------|
+| [funcac](Live/DefaultWorker/funcac.md)               | Creates an activity function method                                |
+| [funcblob](Live/DefaultWorker/funcblob.md)           | Creates an Azure Function method with a blob trigger.              |
+| [funccl](Live/DefaultWorker/funccl.md)               | Creates an orchestration client function method                    |
+| [funccosmosdb](Live/DefaultWorker/funccosmosdb.md)   | Creates an Azure Function method with a CosmosDB trigger.          |
+| [funceventgrid](Live/DefaultWorker/funceventgrid.md) | Creates an Azure Function method with an Event Grid trigger.       |
+| [funceventhub](Live/DefaultWorker/funceventhub.md)   | Creates an Azure Function method with an Event Hub trigger.        |
+| [funchttp](Live/DefaultWorker/funchttp.md)           | Creates an Azure Function method with an HTTP trigger.             |
+| [funciothub](Live/DefaultWorker/funciothub.md)       | Creates an Azure Function method with an IoT Hub trigger.          |
+| [funcor](Live/DefaultWorker/funcor.md)               | Creates an orchestrator function method                            |
+| [funcqueue](Live/DefaultWorker/funcqueue.md)         | Creates an Azure Function method with a queue trigger.             |
+| [funcsbqueue](Live/DefaultWorker/funcsbqueue.md)     | Creates an Azure Function method with a Service Bus queue trigger. |
+| [funcsbtopic](Live/DefaultWorker/funcsbtopic.md)     | Creates an Azure Function method with a Service Bus topic trigger. |
+| [functimer](Live/DefaultWorker/functimer.md)         | Creates an Azure Function method with a timer trigger.             |
 
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
@@ -296,14 +296,17 @@
 
     <projectConfigurable groupId="tools"
                          id="com.microsoft.intellij.configuration.AzureRiderConfigurable"
+                         displayName="Azure"
                          instance="com.microsoft.intellij.configuration.AzureRiderConfigurable"
                          dynamic="true"/>
 
     <projectConfigurable parentId="FileTemplatesSettingsId"
+                         displayName="Azure (C#)"
                          instance="org.jetbrains.plugins.azure.functions.settings.templates.RiderAzureCSharpFileTemplatesOptionPage"
                          groupWeight="-150" />
 
     <projectConfigurable parentId="FileTemplatesSettingsId"
+                         displayName="Azure (F#)"
                          instance="org.jetbrains.plugins.azure.functions.settings.templates.RiderAzureFSharpFileTemplatesOptionPage"
                          groupWeight="-150" />
 

diff --git a/...lij/rider/src/com/microsoft/intellij/configuration/ui/AzureFunctionsConfigurationPanel.kt b/...lij/rider/src/com/microsoft/intellij/configuration/ui/AzureFunctionsConfigurationPanel.kt
@@ -20,6 +20,8 @@
  * SOFTWARE.
  */
 
+@file:Suppress("MissingRecentApi")
+
 package com.microsoft.intellij.configuration.ui
 
 import com.intellij.ide.util.PropertiesComponent
@@ -63,6 +65,7 @@ class AzureFunctionsConfigurationPanel(parentDisposable: Disposable)
 
     private val isCoreToolsFeedEnabled = Registry.`is`("azure.function_app.core_tools.feed.enabled")
 
+    private var coreToolsEditorChanged = false
     private val coreToolsEditorColumns = arrayOf<ColumnInfo<*, *>>(
             object : ColumnInfo<AzureRiderSettings.AzureCoreToolsPathEntry, String>(message("settings.app_services.function_app.core_tools.configuration.column.functionsVersion")) {
                 override fun valueOf(item: AzureRiderSettings.AzureCoreToolsPathEntry) = item.functionsVersion
@@ -154,6 +157,10 @@ class AzureFunctionsConfigurationPanel(parentDisposable: Disposable)
                                 return editor
                             }
                         }
+
+                        comboBox.addItemListener {
+                            coreToolsEditorChanged = true
+                        }
                     }
 
                     override fun getCellEditorValue(): String {
@@ -188,7 +195,11 @@ class AzureFunctionsConfigurationPanel(parentDisposable: Disposable)
                     coreToolsEditorColumns,
                     coreToolsConfiguration,
                     0
-            )
+            ).apply {
+                onIsModified {
+                    coreToolsEditorChanged
+                }
+            }
 
             coreToolsEditor = TableView(coreToolsEditorModel).apply {
                 setShowGrid(false)
@@ -197,7 +208,7 @@ class AzureFunctionsConfigurationPanel(parentDisposable: Disposable)
 
                 emptyText.text = message("settings.app_services.function_app.core_tools.configuration.empty_list")
 
-                TableSpeedSearch(this)
+                TableSpeedSearch.installOn(this)
 
                 selectionModel.selectionMode = ListSelectionModel.SINGLE_SELECTION
 
@@ -211,7 +222,8 @@ class AzureFunctionsConfigurationPanel(parentDisposable: Disposable)
 
             row {
                 scrollCell(coreToolsEditor).onApply {
-                        AzureRiderSettings.setAzureCoreToolsPathEntries(properties, coreToolsEditorModel.items)
+                    AzureRiderSettings.setAzureCoreToolsPathEntries(properties, coreToolsEditorModel.items)
+                    coreToolsEditorChanged = false
                 }.align(AlignX.FILL)
             }
 
@@ -253,6 +265,13 @@ class AzureFunctionsConfigurationPanel(parentDisposable: Disposable)
         reset()
     }
 
+    override fun reset() {
+        val coreToolsConfiguration = AzureRiderSettings.getAzureCoreToolsPathEntries(properties)
+        coreToolsEditorModel.items = coreToolsConfiguration
+        coreToolsEditorChanged = false
+        super.reset()
+    }
+
     override fun isProjectLevel() = false
 
     private data class CoreToolsComboBoxItem(val label: String, val value: String, val isPredefinedEntry: Boolean) {

diff --git a/...ij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsHostConfiguration.kt b/...ij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsHostConfiguration.kt
@@ -1,18 +1,18 @@
 /**
- * Copyright (c) 2019-2020 JetBrains s.r.o.
- * <p/>
+ * Copyright (c) 2019-2023 JetBrains s.r.o.
+ *
  * All rights reserved.
- * <p/>
+ *
  * MIT License
- * <p/>
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
  * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
  * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- * <p/>
+ *
  * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
  * the Software.
- * <p/>
+ *
  * THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
  * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
@@ -24,7 +24,6 @@ package org.jetbrains.plugins.azure.functions.run
 
 import com.intellij.execution.configurations.ConfigurationFactory
 import com.intellij.openapi.project.Project
-import com.jetbrains.rd.platform.util.getComponent
 import com.jetbrains.rider.debugger.IRiderDebuggable
 import com.jetbrains.rider.run.configurations.RiderRunConfiguration
 import com.jetbrains.rider.runtime.RiderDotNetActiveRuntimeHost
@@ -43,7 +42,7 @@ class AzureFunctionsHostConfiguration(
         AzureFunctionsHostExecutorFactory(parameters)
 ), IRiderDebuggable {
 
-    private val riderDotNetActiveRuntimeHost = project.getComponent<RiderDotNetActiveRuntimeHost>()
+    private val riderDotNetActiveRuntimeHost = RiderDotNetActiveRuntimeHost.getInstance(project)
 
     override fun checkConfiguration() {
         super.checkConfiguration()