🐛 Fix issue with evaluation of expr at python3.6

Author: uriyyo

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 
 
 group = "com.uriyyo.evaluate_async_code"
-version = "1.6"
+version = "1.7"
 
 repositories {
     mavenCentral()

src/main/java/com/uriyyo/evaluate_async_code/AsyncPyDebugRunner.kt

@@ -1,45 +1,18 @@
 package com.uriyyo.evaluate_async_code
 
-import com.intellij.execution.ExecutionResult
-import com.intellij.xdebugger.XDebugSession
-import com.jetbrains.python.debugger.PyDebugProcess
+import com.intellij.execution.configurations.GeneralCommandLine
+import com.intellij.execution.configurations.ParamsGroup
+import com.intellij.openapi.project.Project
 import com.jetbrains.python.debugger.PyDebugRunner
-import com.jetbrains.python.debugger.PyDebugValue
 import com.jetbrains.python.run.PythonCommandLineState
-import java.net.ServerSocket
 
 class AsyncPyDebugRunner : PyDebugRunner() {
-    override fun createDebugProcess(
-            session: XDebugSession,
-            serverSocket: ServerSocket,
-            result: ExecutionResult,
-            pyState: PythonCommandLineState
-    ): PyDebugProcess {
-        if (!isSupportedVersion(pyState.sdk?.versionString))
-            return super.createDebugProcess(session, serverSocket, result, pyState)
-
-        return object : PyDebugProcess(
-                session, serverSocket, result.executionConsole, result.processHandler, pyState.isMultiprocessDebug
-        ) {
-            override fun evaluate(expression: String?, execute: Boolean, doTrunc: Boolean): PyDebugValue {
-                if (expression?.isAsyncCode == true) {
-                    // FIXME: why so terrible? this code must be refactored
-                    super.evaluate(PLUGIN, true, true)
-
-                    // TODO: Does Kotlin has smth like python repr?
-                    val fixedExpression = expression
-                            .replace("'''", "\\'\\'\\'")
-                            .let { "'''$it'''" }
-
-                    val code = "__async_result__ = __import__('sys').__async_eval__($fixedExpression, globals(), locals())"
-                    super.evaluate(code, true, doTrunc)
-
-                    return super.evaluate("__async_result__", false, doTrunc)
-                }
-
-                return super.evaluate(expression, execute, doTrunc)
-            }
+    override fun configureDebugParameters(project: Project, debugParams: ParamsGroup, pyState: PythonCommandLineState, cmd: GeneralCommandLine) {
+        if (isSupportedVersion(pyState.sdk?.versionString)) {
+            asyncPyDevScript().writeText(PYDEVD_ASYNC_MAIN_PLUGIN)
+            debugParams.addPyDevAsyncWork()
         }
-    }
 
+        super.configureDebugParameters(project, debugParams, pyState, cmd)
+    }
 }