Revert "Debug use cargo workspace root as cwd. fixes#13022"

This reverts commit 4ca86ed.

Author: roife

src/tools/rust-analyzer/editors/code/src/debug.ts

@@ -3,7 +3,7 @@ import * as vscode from "vscode";
 import*aspathfrom"path";
 importtype*asrafrom"./lsp_ext";
 
-import{Cargo,typeExecutableInfo,getRustcId,getSysroot}from"./toolchain";
+import{Cargo,getRustcId,getSysroot}from"./toolchain";
 importtype{Ctx}from"./ctx";
 import{prepareEnv}from"./run";
 import{unwrapUndefinable}from"./undefinable";
@@ -12,7 +12,6 @@ const debugOutput = vscode.window.createOutputChannel("Debug");
 typeDebugConfigProvider=(
 config: ra.Runnable,
 executable: string,
-cargoWorkspace: string,
 env: Record<string,string>,
 sourceFileMap?: Record<string,string>,
 )=>vscode.DebugConfiguration;
@@ -134,7 +133,7 @@ async function getDebugConfiguration(
 }
 
 constenv=prepareEnv(runnable,ctx.config.runnablesExtraEnv);
-const{executable,workspace: cargoWorkspace}=awaitgetDebugExecutableInfo(runnable,env);
+constexecutable=awaitgetDebugExecutable(runnable,env);
 letsourceFileMap=debugOptions.sourceFileMap;
 if(sourceFileMap==="auto"){
 // let's try to use the default toolchain
@@ -148,13 +147,7 @@ async function getDebugConfiguration(
 }
 
 constprovider=unwrapUndefinable(knownEngines[debugEngine.id]);
-constdebugConfig=provider(
-runnable,
-simplifyPath(executable),
-cargoWorkspace,
-env,
-sourceFileMap,
-);
+constdebugConfig=provider(runnable,simplifyPath(executable),env,sourceFileMap);
 if(debugConfig.typeindebugOptions.engineSettings){
 constsettingsMap=(debugOptions.engineSettingsasany)[debugConfig.type];
 for(varkeyinsettingsMap){
@@ -176,21 +169,20 @@ async function getDebugConfiguration(
 returndebugConfig;
 }
 
-asyncfunctiongetDebugExecutableInfo(
+asyncfunctiongetDebugExecutable(
 runnable: ra.Runnable,
 env: Record<string,string>,
-): Promise<ExecutableInfo>{
+): Promise<string>{
 constcargo=newCargo(runnable.args.workspaceRoot||".",debugOutput,env);
-constexecutableInfo=awaitcargo.executableInfoFromArgs(runnable.args.cargoArgs);
+constexecutable=awaitcargo.executableFromArgs(runnable.args.cargoArgs);
 
 // if we are here, there were no compilation errors.
-returnexecutableInfo;
+returnexecutable;
 }
 
 functiongetCCppDebugConfig(
 runnable: ra.Runnable,
 executable: string,
-cargoWorkspace: string,
 env: Record<string,string>,
 sourceFileMap?: Record<string,string>,
 ): vscode.DebugConfiguration{
@@ -200,7 +192,7 @@ function getCCppDebugConfig(
 name: runnable.label,
 program: executable,
 args: runnable.args.executableArgs,
-cwd: cargoWorkspace||runnable.args.workspaceRoot,
+cwd: runnable.args.workspaceRoot,
  sourceFileMap,
  env,
 // See https://github.com/rust-lang/rust-analyzer/issues/16901#issuecomment-2024486941
@@ -213,7 +205,6 @@ function getCCppDebugConfig(
 functiongetCodeLldbDebugConfig(
 runnable: ra.Runnable,
 executable: string,
-cargoWorkspace: string,
 env: Record<string,string>,
 sourceFileMap?: Record<string,string>,
 ): vscode.DebugConfiguration{
@@ -223,7 +214,7 @@ function getCodeLldbDebugConfig(
 name: runnable.label,
 program: executable,
 args: runnable.args.executableArgs,
-cwd: cargoWorkspace||runnable.args.workspaceRoot,
+cwd: runnable.args.workspaceRoot,
 sourceMap: sourceFileMap,
 sourceLanguages: ["rust"],
  env,
@@ -233,7 +224,6 @@ function getCodeLldbDebugConfig(
 functiongetNativeDebugConfig(
 runnable: ra.Runnable,
 executable: string,
-cargoWorkspace: string,
 env: Record<string,string>,
 _sourceFileMap?: Record<string,string>,
 ): vscode.DebugConfiguration{
@@ -244,7 +234,7 @@ function getNativeDebugConfig(
 target: executable,
 // See https://github.com/WebFreak001/code-debug/issues/359
 arguments: quote(runnable.args.executableArgs),
-cwd: cargoWorkspace||runnable.args.workspaceRoot,
+cwd: runnable.args.workspaceRoot,
  env,
 valuesFormatting: "prettyPrinters",
 };

src/tools/rust-analyzer/editors/code/src/toolchain.ts

@@ -9,17 +9,11 @@ import { unwrapUndefinable } from "./undefinable";
 
 interfaceCompilationArtifact{
 fileName: string;
-workspace: string;
 name: string;
 kind: string;
 isTest: boolean;
 }
 
-exportinterfaceExecutableInfo{
-executable: string;
-workspace: string;
-}
-
 exportinterfaceArtifactSpec{
 cargoArgs: string[];
 filter?: (artifacts: CompilationArtifact[])=>CompilationArtifact[];
@@ -74,7 +68,6 @@ export class Cargo {
 artifacts.push({
 fileName: message.executable,
 name: message.target.name,
-workspace: path.dirname(message.manifest_path),
 kind: message.target.kind[0],
 isTest: message.profile.test,
 });
@@ -93,7 +86,7 @@ export class Cargo {
 returnspec.filter?.(artifacts)??artifacts;
 }
 
-asyncexecutableInfoFromArgs(args: readonlystring[]): Promise<ExecutableInfo>{
+asyncexecutableFromArgs(args: readonlystring[]): Promise<string>{
 constartifacts=awaitthis.getArtifacts(Cargo.artifactSpec(args));
 
 if(artifacts.length===0){
@@ -103,10 +96,7 @@ export class Cargo {
 }
 
 constartifact=unwrapUndefinable(artifacts[0]);
-return{
-executable: artifact.fileName,
-workspace: artifact.workspace,
-};
+returnartifact.fileName;
 }
 
 privateasyncrunCargo(