Merge pull request #665 from JetBrains/231-mb-eap5

Target Rider 2023.1 EAP5
JetBrains · Feb 22, 2023 · 2028fa3 · 2028fa3
2 parents 72828a2 + 40ed4cd
commit 2028fa3
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 27 deletions.
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.jvmargs='-Duser.language=en'
 sources=false
 
 intellij_version=IC-231.5920-EAP-CANDIDATE-SNAPSHOT
-rider_version=RD-2023.1-EAP4-SNAPSHOT
+rider_version=RD-2023.1-EAP5-SNAPSHOT
 #rider_version=RD-2022.3.1
 build_common_code_with=rider
 intellij_plugin_name=azure-toolkit-for-intellij

diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml
@@ -6,7 +6,7 @@
     <html>
         <h4>Added:</h4>
         <ul>
-          <li>Compatibility with Rider 2023.1 EAP4</li>
+          <li>Compatibility with Rider 2023.1 EAP5</li>
           <li>Azure Functions: Option to auto-start Azurite with run configurations (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/605">#605</a>)</li>
           <li>Azure Functions: show a warning when Azurite is not running (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/605">#650</a>)</li>
           <li>Azure Functions: Support Windows arm64 Azure Core Tools (<a href="https://youtrack.jetbrains.com/issue/RIDER-85548">#RIDER-85548</a>)</li>

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
@@ -25,7 +25,7 @@
       <html>
         <p>[3.50.0-2023.1]</p>
         <ul>
-          <li>Compatibility with Rider 2023.1 EAP4</li>
+          <li>Compatibility with Rider 2023.1 EAP5</li>
           <li>Azure Functions: Option to auto-start Azurite with run configurations (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/605">#605</a>)</li>
           <li>Azure Functions: show a warning when Azurite is not running (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/605">#650</a>)</li>
           <li>Azure Functions: Support Windows arm64 Azure Core Tools (<a href="https://youtrack.jetbrains.com/issue/RIDER-85548">#RIDER-85548</a>)</li>

diff --git a/...ij/rider/src/org/jetbrains/plugins/azure/cloudshell/actions/StartAzureCloudShellAction.kt b/...ij/rider/src/org/jetbrains/plugins/azure/cloudshell/actions/StartAzureCloudShellAction.kt
@@ -24,8 +24,6 @@ package org.jetbrains.plugins.azure.cloudshell.actions
 
 import com.intellij.ide.BrowserUtil
 import com.intellij.ide.ui.IdeUiService
-import com.intellij.notification.Notification
-import com.intellij.notification.NotificationListener
 import com.intellij.notification.NotificationType
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
@@ -57,9 +55,8 @@ import org.jetbrains.plugins.azure.cloudshell.rest.CloudConsoleProvisionTerminal
 import org.jetbrains.plugins.azure.cloudshell.rest.CloudConsoleService
 import org.jetbrains.plugins.azure.cloudshell.terminal.AzureCloudTerminalFactory
 import org.jetbrains.plugins.terminal.TerminalToolWindowFactory
-import org.jetbrains.plugins.terminal.TerminalView
+import org.jetbrains.plugins.terminal.TerminalToolWindowManager
 import java.net.URI
-import javax.swing.event.HyperlinkEvent
 
 @Suppress("UnstableApiUsage")
 class StartAzureCloudShellAction : AnAction() {
@@ -260,7 +257,7 @@ class StartAzureCloudShellAction : AnAction() {
                         // HACK: Because local terminal always opens, we want to make sure it is available before opening cloud terminal
                         ApplicationManager.getApplication().invokeLater {
                             Thread.sleep(500)
-                            TerminalView.getInstance(project).createNewSession(runner)
+                            TerminalToolWindowManager.getInstance(project).createNewSession(runner)
                         }
                     }
                 }

diff --git a/...lij/rider/src/org/jetbrains/plugins/azure/cloudshell/terminal/AzureCloudTerminalRunner.kt b/...lij/rider/src/org/jetbrains/plugins/azure/cloudshell/terminal/AzureCloudTerminalRunner.kt
@@ -1,18 +1,18 @@
 /**
- * Copyright (c) 2018-2020 JetBrains s.r.o.
- * <p/>
+ * Copyright (c) 2018-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,
@@ -25,8 +25,8 @@ import com.intellij.ide.BrowserUtil
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
+import com.jediterm.core.util.TermSize
 import com.jediterm.terminal.TtyConnector
-import com.jetbrains.rider.util.idea.getComponent
 import okhttp3.MediaType
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
@@ -81,11 +81,11 @@ class AzureCloudTerminalRunner(project: Project,
         // Build TTY
         val connector = object : AzureCloudProcessTtyConnector(process) {
 
-            override fun resize(termWinSize: Dimension) {
+            override fun resize(termSize: TermSize) {
                 if (!this.isConnected) return
 
                 val resizeResult = cloudConsoleService.resizeTerminal(
-                        resizeTerminalUrl, termWinSize.width, termWinSize.height).execute()
+                        resizeTerminalUrl, termSize.columns, termSize.rows).execute()
 
                 if (!resizeResult.isSuccessful) {
                     logger.error("Could not resize cloud terminal. Response received from API: ${resizeResult.code()} ${resizeResult.message()} - ${resizeResult.errorBody()?.string()}")

diff --git a/...org/jetbrains/plugins/azure/functions/run/AzureFunctionsDotNetCoreIsolatedDebugProfile.kt b/...org/jetbrains/plugins/azure/functions/run/AzureFunctionsDotNetCoreIsolatedDebugProfile.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021-2022 JetBrains s.r.o.
+ * Copyright (c) 2021-2023 JetBrains s.r.o.
  *
  * All rights reserved.
  *
@@ -264,7 +264,7 @@ class AzureFunctionsDotNetCoreIsolatedDebugProfile(
 
     override val attached: Boolean = false
 
-    override fun checkBeforeExecution() {
+    override suspend fun checkBeforeExecution() {
         dotNetExecutable.validate()
     }
 

diff --git a/...ij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsDotNetCoreRuntime.kt b/...ij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsDotNetCoreRuntime.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2019-2022 JetBrains s.r.o.
+ * Copyright (c) 2019-2023 JetBrains s.r.o.
  *
  * All rights reserved.
  *
@@ -26,18 +26,15 @@ import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.execution.configurations.RunProfileState
 import com.intellij.execution.impl.ConsoleViewImpl
 import com.intellij.execution.runners.ExecutionEnvironment
-import com.intellij.openapi.util.SystemInfo
 import com.jetbrains.rider.run.DotNetProcessRunProfileState
 import com.jetbrains.rider.run.IDotNetDebugProfileState
 import com.jetbrains.rider.run.dotNetCore.DotNetCoreDebugProfile
-import com.jetbrains.rider.run.msNet.MsNetDebugProfileState
 import com.jetbrains.rider.runtime.DotNetExecutable
 import com.jetbrains.rider.runtime.DotNetRuntime
 import com.jetbrains.rider.runtime.RunningAssemblyInfo
 import com.jetbrains.rider.runtime.SuspendedAttachableDotNetRuntime
 import com.jetbrains.rider.runtime.dotNetCore.DotNetCoreRuntime
 import com.jetbrains.rider.runtime.dotNetCore.DotNetCoreRuntimeType
-import com.jetbrains.rider.runtime.msNet.MsNetRuntime
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.jetbrains.plugins.azure.functions.coreTools.FunctionsCoreToolsInfo
 import org.jetbrains.plugins.azure.functions.run.localsettings.FunctionsWorkerRuntime

diff --git a/...src/org/jetbrains/plugins/azure/identity/ad/actions/RegisterApplicationInAzureAdAction.kt b/...src/org/jetbrains/plugins/azure/identity/ad/actions/RegisterApplicationInAzureAdAction.kt
@@ -25,8 +25,6 @@
 package org.jetbrains.plugins.azure.identity.ad.actions
 
 import com.intellij.ide.BrowserUtil
-import com.intellij.notification.Notification
-import com.intellij.notification.NotificationListener
 import com.intellij.notification.NotificationType
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
@@ -41,7 +39,7 @@ import com.intellij.openapi.ui.popup.PopupStep
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.workspaceModel.ide.WorkspaceModel
-import com.intellij.workspaceModel.ide.impl.toVirtualFile
+import com.intellij.workspaceModel.ide.virtualFile
 import com.jetbrains.rider.projectView.workspace.ProjectModelEntity
 import com.jetbrains.rider.projectView.workspace.containingProjectEntity
 import com.jetbrains.rider.projectView.workspace.getProjectModelEntities
@@ -314,7 +312,7 @@ class RegisterApplicationInAzureAdAction
     }
 
     private fun tryGetAppSettingsJsonVirtualFile(entity: ProjectModelEntity): VirtualFile? {
-        val itemVirtualFile = entity.url?.toVirtualFile()
+        val itemVirtualFile = entity.url?.virtualFile
 
         if (isAppSettingsJsonFileName(itemVirtualFile?.name)) return itemVirtualFile