From 1ebfe11730191e914dcf20297cdfdac5b7c297fc Mon Sep 17 00:00:00 2001
From: vsrs <vit@conrlab.com>
Date: Thu, 22 Apr 2021 16:09:46 +0300
Subject: Add special `auto` value for `debug.sourceFileMap`

---
 editors/code/src/debug.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'editors/code/src/debug.ts')

diff --git a/editors/code/src/debug.ts b/editors/code/src/debug.ts
index fe8ec1be454..8c6969dc670 100644
--- a/editors/code/src/debug.ts
+++ b/editors/code/src/debug.ts
@@ -3,7 +3,7 @@ import * as vscode from 'vscode';
 import * as path from 'path';
 import * as ra from './lsp_ext';
 
-import { Cargo, sysrootForDir as getSysroot } from './toolchain';
+import { Cargo, getSysroot } from './toolchain';
 import { Ctx } from "./ctx";
 import { prepareEnv } from "./run";
 
@@ -105,11 +105,11 @@ async function getDebugConfiguration(ctx: Ctx, runnable: ra.Runnable): Promise<v
     const executable = await getDebugExecutable(runnable);
     const env = prepareEnv(runnable, ctx.config.runnableEnv);
     let sourceFileMap = debugOptions.sourceFileMap;
-    if ( !sourceFileMap || Object.keys(sourceFileMap).length === 0 ) {
+    if (sourceFileMap === "auto") {
         // let's try to use the default toolchain
         const sysroot = await getSysroot(wsFolder);
-        const rustlib_src = path.normalize(sysroot + "/lib/rustlib/src/rust");
-        sourceFileMap = { "/rustc/*": rustlib_src };
+        const rustlib = path.normalize(sysroot + "/lib/rustlib/src/rust");
+        sourceFileMap = { "/rustc/*": rustlib };
     }
 
     const debugConfig = knownEngines[debugEngine.id](runnable, simplifyPath(executable), env, sourceFileMap);
-- 
cgit 1.4.1-3-g733a5