@@ -34,9 +34,12 @@ async function getVsCodeLaunchConfig(lldConfig?: LldConfig) {
34
34
35
35
const moduleDirname = getModuleDirname ( ) ;
36
36
//Logger.log("Module folder", moduleDirname);
37
- const currentFolder = path . resolve ( ) ;
37
+ const projectDirname = getProjectDirname ( ) ;
38
+
38
39
//Logger.log("Current folder", currentFolder);
39
- const localFolder = path . join ( currentFolder , "node_modules/.bin/lld" ) ;
40
+ const localFolder = path . resolve (
41
+ path . join ( projectDirname , "node_modules/.bin/lld" )
42
+ ) ;
40
43
41
44
let runtimeExecutableSet = false ;
42
45
@@ -45,7 +48,10 @@ async function getVsCodeLaunchConfig(lldConfig?: LldConfig) {
45
48
Logger . verbose ( "Lambda Live Debugger is installed locally" ) ;
46
49
// check if file exists
47
50
try {
48
- //Logger.log("Checking local folder", localFolder);
51
+ Logger . log (
52
+ "Checking local folder for runtimeExecutable setting for VsCode configuration" ,
53
+ localFolder
54
+ ) ;
49
55
await fs . access ( localFolder , fs . constants . F_OK ) ;
50
56
config . configurations ! [ 0 ] . runtimeExecutable = localRuntimeExecutable ;
51
57
runtimeExecutableSet = true ;
@@ -61,6 +67,7 @@ async function getVsCodeLaunchConfig(lldConfig?: LldConfig) {
61
67
Logger . verbose (
62
68
`Setting absolute path for runtimeExecutable setting for VsCode configuration`
63
69
) ;
70
+ const localFolderSubfolder = path . resolve ( "node_modules/.bin/lld" ) ;
64
71
const globalModule1 = path . join ( moduleDirname , ".." , ".." , ".bin/lld" ) ;
65
72
const globalModule2 = path . join ( moduleDirname , ".." , ".." , "bin/lld" ) ;
66
73
const globalModule3 = path . join (
@@ -73,6 +80,7 @@ async function getVsCodeLaunchConfig(lldConfig?: LldConfig) {
73
80
) ;
74
81
const possibleFolders = {
75
82
[ localFolder ] : "${workspaceFolder}/node_modules/.bin/lld" ,
83
+ [ localFolderSubfolder ] : localFolderSubfolder ,
76
84
[ globalModule1 ] : globalModule1 ,
77
85
[ globalModule2 ] : globalModule2 ,
78
86
[ globalModule3 ] : globalModule3 ,
0 commit comments