From 34aa08eb28971a4ff3308132d02fef97b0cc608e Mon Sep 17 00:00:00 2001
From: Maarten Balliauw <maarten@maartenballiauw.be>
Date: Fri, 5 Aug 2022 12:15:04 +0200
Subject: [PATCH] Azure Functions: Isolated worker process ID not recognized
 when control characters are present in process output #623 (#624)

---
 .../resources/META-INF/platformPlugin.xml     |  1 +
 .../rider/resources/META-INF/plugin.xml       |  1 +
 .../messages/RiderAzureMessages.properties    |  1 +
 ...FunctionsDotNetCoreIsolatedDebugProfile.kt | 21 +++++++++++++------
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml
index a328f62868..9be1345ad5 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml
@@ -19,6 +19,7 @@
           <li>MSBuildEvaluator timeout breaks right-click + publish (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/611">#611</a>)</li>
           <li>Dispose of response body when retrying is needed (<a href="https://github.com/JetBrains/azure-tools-for-intellij/pull/616">#616</a>)</li>
           <li>SSLHandshakeException connecting to Azure Functions Core Tools release feed (<a href="https://youtrack.jetbrains.com/issue/RIDER-79897">RIDER-79897</a>)</li>
+          <li>Azure Functions: Isolated worker process ID not recognized when control characters are present in process output (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/623">#623</a>)</li>
         </ul>
     </html>
     ]]>
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
index 3b4d258110..3298ca3714 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml
@@ -38,6 +38,7 @@
           <li>MSBuildEvaluator timeout breaks right-click + publish (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/611">#611</a>)</li>
           <li>Dispose of response body when retrying is needed (<a href="https://github.com/JetBrains/azure-tools-for-intellij/pull/616">#616</a>)</li>
           <li>SSLHandshakeException connecting to Azure Functions Core Tools release feed (<a href="https://youtrack.jetbrains.com/issue/RIDER-79897">RIDER-79897</a>)</li>
+          <li>Azure Functions: Isolated worker process ID not recognized when control characters are present in process output (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/623">#623</a>)</li>
         </ul>
         <p>[3.50.0-2022.1]</p>
         <ul>
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/messages/RiderAzureMessages.properties b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/messages/RiderAzureMessages.properties
index e1c77a7373..e3fea2a52b 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/messages/RiderAzureMessages.properties
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/messages/RiderAzureMessages.properties
@@ -317,6 +317,7 @@ run_config.run_function_app.form.function_app.before_run_tasks.build_function_pr
 run_config.run_function_app.form.function_app.before_run_tasks.build_function_project_description=Build Functions project
 
 run_config.run_function_app.debug.notification.title=Azure Functions - Debug
+run_config.run_function_app.debug.notification.isolated_worker_process_terminated=Azure Functions host process terminated before the debugger could attach.
 run_config.run_function_app.debug.notification.isolated_worker_pid_unspecified=Azure Functions host did not return isolated worker process id. Could not attach the debugger. Check the process output for more information.
 run_config.run_function_app.debug.progress.starting_debugger=Waiting for Azure Functions host to start...
 run_config.run_function_app.debug.ignore.externalconsole=The 'Use external console' option was ignored. Process Input/Output redirection is required to debug Azure Functions isolated workers.
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsDotNetCoreIsolatedDebugProfile.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsDotNetCoreIsolatedDebugProfile.kt
index fe2b067f0e..ae8baf28b0 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsDotNetCoreIsolatedDebugProfile.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsDotNetCoreIsolatedDebugProfile.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021 JetBrains s.r.o.
+ * Copyright (c) 2021-2022 JetBrains s.r.o.
  *
  * All rights reserved.
  *
@@ -51,7 +51,6 @@ import com.jetbrains.rider.runtime.DotNetExecutable
 import com.jetbrains.rider.runtime.DotNetRuntime
 import com.jetbrains.rider.runtime.apply
 import com.microsoft.intellij.util.PluginUtil
-import org.apache.commons.lang.StringUtils
 import org.jetbrains.plugins.azure.RiderAzureBundle
 import java.time.Duration
 
@@ -65,6 +64,7 @@ class AzureFunctionsDotNetCoreIsolatedDebugProfile(
         private val logger = Logger.getInstance(AzureFunctionsDotNetCoreIsolatedDebugProfile::class.java)
         private val waitDuration = Duration.ofMinutes(1)
         private const val DOTNET_ISOLATED_DEBUG_ARGUMENT = "--dotnet-isolated-debug"
+        private val controlCharsRegex = "\u001B\\[[\\d;]*[^\\d;]".toRegex()
     }
 
     private var processId = 0
@@ -91,6 +91,15 @@ class AzureFunctionsDotNetCoreIsolatedDebugProfile(
         pumpMessages(waitDuration) {
             processId != 0 || targetProcessHandler.isProcessTerminated
         }
+        if (targetProcessHandler.isProcessTerminated) {
+            logger.warn("Azure Functions host process terminated before the debugger could attach.")
+
+            // Notify user
+            PluginUtil.showErrorNotificationProject(
+                    executionEnvironment.project,
+                    RiderAzureBundle.message("run_config.run_function_app.debug.notification.title"),
+                    RiderAzureBundle.message("run_config.run_function_app.debug.notification.isolated_worker_process_terminated"))
+        }
         if (processId == 0) {
             logger.warn("Azure Functions host did not return isolated worker process id.")
 
@@ -138,13 +147,13 @@ class AzureFunctionsDotNetCoreIsolatedDebugProfile(
             }
 
             override fun onTextAvailable(event: ProcessEvent, outputType: Key<*>) {
-                val line = event.text
+                val processText = event.text.replace(controlCharsRegex, "")
 
                 if (processId == 0 &&
-                        StringUtils.containsIgnoreCase(line, "Azure Functions .NET Worker (PID: ") &&
-                        StringUtils.containsIgnoreCase(line, ") initialized")) {
+                        processText.contains("Azure Functions .NET Worker (PID: ", ignoreCase = true) &&
+                        processText.contains(") initialized", ignoreCase = true)) {
 
-                    val pidFromLog = line.substringAfter("PID: ")
+                    val pidFromLog = processText.substringAfter("PID: ")
                             .dropWhile { !it.isDigit() }
                             .takeWhile { it.isDigit() }
                             .toInt()