From 3967429440cf6314a8024f8bd3562d0b3a8d9f94 Mon Sep 17 00:00:00 2001
From: Elaheh Rashedi <elahehrashedi@gmail.com>
Date: Thu, 1 Jul 2021 13:31:51 -0700
Subject: [PATCH] fix debugger for clang compilers (#7765)

---
 .../src/Debugger/configurationProvider.ts     | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/Extension/src/Debugger/configurationProvider.ts b/Extension/src/Debugger/configurationProvider.ts
index e187fea578..6126c92830 100644
--- a/Extension/src/Debugger/configurationProvider.ts
+++ b/Extension/src/Debugger/configurationProvider.ts
@@ -161,11 +161,11 @@ class CppConfigurationProvider implements vscode.DebugConfigurationProvider {
                 return false;
             }
             if (defaultConfig.name.startsWith("(Windows) ")) {
-                if (command.includes("cl.exe")) {
+                if (command.startsWith("cl.exe")) {
                     return true;
                 }
             } else {
-                if (!command.includes("cl.exe")) {
+                if (!command.startsWith("cl.exe")) {
                     return true;
                 }
             }
@@ -203,9 +203,16 @@ class CppConfigurationProvider implements vscode.DebugConfigurationProvider {
                     let debuggerName: string;
                     if (compilerName.startsWith("clang")) {
                         newConfig.MIMode = "lldb";
-                        const suffixIndex: number = compilerName.indexOf("-");
-                        const suffix: string = suffixIndex === -1 ? "" : compilerName.substr(suffixIndex);
-                        debuggerName = "lldb-mi" + suffix;
+                        debuggerName = "lldb-mi";
+                        // Search for clang-8, clang-10, etc.
+                        if ((compilerName !== "clang-cl.exe") && (compilerName !== "clang-cpp.exe")) {
+                            const suffixIndex: number = compilerName.indexOf("-");
+                            if (suffixIndex !== -1) {
+                                const suffix: string = compilerName.substr(suffixIndex);
+                                debuggerName += suffix;
+                            }
+                        }
+                        newConfig.type = "cppdbg";
                     } else if (compilerName === "cl.exe") {
                         newConfig.miDebuggerPath = undefined;
                         newConfig.type = "cppvsdbg";
@@ -213,11 +220,9 @@ class CppConfigurationProvider implements vscode.DebugConfigurationProvider {
                     } else {
                         debuggerName = "gdb";
                     }
-
                     if (isWindows) {
-                        debuggerName += ".exe";
+                        debuggerName = debuggerName.endsWith(".exe") ? debuggerName : (debuggerName + ".exe");
                     }
-
                     const compilerDirname: string = path.dirname(compilerPath);
                     const debuggerPath: string = path.join(compilerDirname, debuggerName);
                     if (isWindows) {