🔧 Update async-eval version, remove usage of experimental API

Author: uriyyo

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
-    kotlin("jvm") version "1.6.0"
-    id("org.jetbrains.intellij") version "1.8.0"
+    kotlin("jvm") version "1.7.22"
+    id("org.jetbrains.intellij") version "1.11.0"
 }
 
 

gradle.properties

@@ -1,4 +1,4 @@
-version=2022.2
-ideaVersion=PY-2022.2
-pythonPlugin=PythonCore:222.3345.131
+version=2022.3
+ideaVersion=PY-2022.3
+pythonPlugin=PythonCore:223.7571.203
 downloadIdeaSources=true

helpers/poetry.lock

@@ -2,36 +2,27 @@ package com.uriyyo.evaluate_async_code
 
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
+import com.jetbrains.python.console.PyConsoleOptions
 import com.jetbrains.python.console.PydevConsoleRunnerFactory
 
 class AsyncPyDebugConsoleRunnerFactory : PydevConsoleRunnerFactory() {
     private val frameworkAwareFactory: PydevConsoleRunnerFactory? =
         loadClass("com.jetbrains.FrameworkAwarePythonConsoleRunnerFactory")
 
     override fun createConsoleParameters(project: Project, contextModule: Module?): ConsoleParameters {
-        val params = frameworkAwareFactory
-            ?.getMethodByName<ConsoleParameters>("createConsoleParameters")
-            ?.invoke(project, contextModule)
-            ?: super.createConsoleParameters(project, contextModule)
+        val settingsProvider = PyConsoleOptions.getInstance(project).pythonConsoleSettings
+        val oldCustomStartScript = settingsProvider.customStartScript
 
-        return when (params) {
-            is ConstantConsoleParameters -> ConstantConsoleParameters(
-                params.project,
-                params.sdk,
-                params.workingDir,
-                params.envs,
-                params.consoleType,
-                params.settingsProvider,
-                arrayOf(setupAsyncPyDevScript(), *params.setupFragment),
-            )
-            is TargetedConsoleParameters -> TargetedConsoleParameters(
-                params.project,
-                params.sdk,
-                params.workingDir,
-                params.envs,
-                params.consoleType,
-                params.settingsProvider,
-            ) { arrayOf(setupAsyncPyDevScript(), params.setupScript.apply(it)).joinToString("\n") }
+        try {
+            settingsProvider.customStartScript =
+                arrayOf(setupAsyncPyDevScript(), oldCustomStartScript).filter { it.isNotEmpty() }.joinToString("\n")
+
+            return frameworkAwareFactory
+                ?.getMethodByName<ConsoleParameters>("createConsoleParameters")
+                ?.invoke(project, contextModule)
+                ?: super.createConsoleParameters(project, contextModule)
+        } finally {
+            settingsProvider.customStartScript = oldCustomStartScript
         }
     }
 }