Pass OS type to the debugger (#2129)

DonJayamanne · Aman Agarwal · commit feecfc1ae68c · 2018-08-30T14:13:07.000-07:00
diff --git a/news/3 Code Health/2128.md b/news/3 Code Health/2128.md
@@ -0,0 +1 @@
+Pass OS type to the debugger.
diff --git a/src/client/debugger/Common/Contracts.ts b/src/client/debugger/Common/Contracts.ts
@@ -48,7 +48,8 @@ export enum DebugOptions {
     Sudo = 'Sudo',
     Pyramid = 'Pyramid',
     FixFilePathCase = 'FixFilePathCase',
-    WindowsClient = 'WindowsClient'
+    WindowsClient = 'WindowsClient',
+    UnixClient = 'UnixClient'
 }
 
 export interface ExceptionHandling {
diff --git a/src/client/debugger/configProviders/pythonV2Provider.ts b/src/client/debugger/configProviders/pythonV2Provider.ts
@@ -82,6 +82,8 @@ export class PythonV2DebugConfigurationProvider extends BaseConfigurationProvide
         }
         if (this.serviceContainer.get<IPlatformService>(IPlatformService).isWindows) {
             this.debugOption(debugOptions, DebugOptions.WindowsClient);
+        } else {
+            this.debugOption(debugOptions, DebugOptions.UnixClient);
         }
 
         if (!debugConfiguration.pathMappings) {
diff --git a/src/test/debugger/configProvider/provider.attach.test.ts b/src/test/debugger/configProvider/provider.attach.test.ts
@@ -33,9 +33,13 @@ enum OS {
             let platformService: TypeMoq.IMock<IPlatformService>;
             let fileSystem: TypeMoq.IMock<IFileSystem>;
             const debugOptionsAvailable = [DebugOptions.RedirectOutput];
-            if (os.value === OS.Windows && provider.debugType === 'pythonExperimental') {
-                debugOptionsAvailable.push(DebugOptions.FixFilePathCase);
-                debugOptionsAvailable.push(DebugOptions.WindowsClient);
+            if (provider.debugType === 'pythonExperimental') {
+                if (os.value === OS.Windows) {
+                    debugOptionsAvailable.push(DebugOptions.FixFilePathCase);
+                    debugOptionsAvailable.push(DebugOptions.WindowsClient);
+                } else {
+                    debugOptionsAvailable.push(DebugOptions.UnixClient);
+                }
             }
             setup(() => {
                 serviceContainer = TypeMoq.Mock.ofType<IServiceContainer>();

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ export enum DebugOptions {`
`48`	`48`	`Sudo = 'Sudo',`
`49`	`49`	`Pyramid = 'Pyramid',`
`50`	`50`	`FixFilePathCase = 'FixFilePathCase',`
`51`		`- WindowsClient = 'WindowsClient'`
	`51`	`+ WindowsClient = 'WindowsClient',`
	`52`	`+ UnixClient = 'UnixClient'`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`export interface ExceptionHandling {`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,8 @@ export class PythonV2DebugConfigurationProvider extends BaseConfigurationProvide`
`82`	`82`	`}`
`83`	`83`	`if (this.serviceContainer.get<IPlatformService>(IPlatformService).isWindows) {`
`84`	`84`	`this.debugOption(debugOptions, DebugOptions.WindowsClient);`
	`85`	`+ } else {`
	`86`	`+ this.debugOption(debugOptions, DebugOptions.UnixClient);`
`85`	`87`	`}`
`86`	`88`
`87`	`89`	`if (!debugConfiguration.pathMappings) {`