Fix undefined error when debugging modules (DonJayamanne#589)

xoob · DonJayamanne · commit 39d20622b4db · 2016-12-18T22:10:04.000+11:00
Fixes an issue where launching a debug session with modules results in the error "Cannot read property 'cwd' of undefined"
diff --git a/src/client/debugger/Main.ts b/src/client/debugger/Main.ts
@@ -188,7 +188,7 @@ export class PythonDebugger extends DebugSession {
         }
         else {
             // When using modules ensure the cwd has been provided
-            if (typeof args.cwd !== 'string' || args.cwd.length === 0 || this.launchArgs.cwd === 'null') {
+            if (typeof args.cwd !== 'string' || args.cwd.length === 0 || (this.launchArgs && this.launchArgs.cwd === 'null')) {
                 return this.sendErrorResponse(response, 2001, `'cwd' in 'launch.json' needs to point to the working directory`);
             }
         }
@@ -674,4 +674,4 @@ export class PythonDebugger extends DebugSession {
     }
 }
 
-DebugSession.run(PythonDebugger);
+DebugSession.run(PythonDebugger);

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ export class PythonDebugger extends DebugSession {`
`188`	`188`	`}`
`189`	`189`	`else {`
`190`	`190`	`// When using modules ensure the cwd has been provided`
`191`		`- if (typeof args.cwd !== 'string' \|\| args.cwd.length === 0 \|\| this.launchArgs.cwd === 'null') {`
	`191`	`+ if (typeof args.cwd !== 'string' \|\| args.cwd.length === 0 \|\| (this.launchArgs && this.launchArgs.cwd === 'null')) {`
`192`	`192`	return this.sendErrorResponse(response, 2001, `'cwd' in 'launch.json' needs to point to the working directory`);
`193`	`193`	`}`
`194`	`194`	`}`
`@@ -674,4 +674,4 @@ export class PythonDebugger extends DebugSession {`
`674`	`674`	`}`
`675`	`675`	`}`
`676`	`676`
`677`		`-DebugSession.run(PythonDebugger);`
	`677`	`+DebugSession.run(PythonDebugger);`