Fix for interpreter selection (#14693)

* Fix for interpreter selection

* Fix linting errors

* Minor tweak to property removal

Author: karthiknadig

src/client/common/configSettings.ts

@@ -196,6 +196,21 @@ export class PythonSettings implements IPythonSettings {
         PythonSettings.pythonSettings.forEach((item) => item && item.dispose());
         PythonSettings.pythonSettings.clear();
     }
+
+    public static toSerializable(settings: IPythonSettings): IPythonSettings {
+        // tslint:disable-next-line: no-any
+        const clone: any = {};
+        const keys = Object.entries(settings);
+        keys.forEach((e) => {
+            const [k, v] = e;
+            if (!k.includes('Manager') && !k.includes('Service') && !k.includes('onDid')) {
+                clone[k] = v;
+            }
+        });
+
+        return clone as IPythonSettings;
+    }
+
     public dispose() {
         // tslint:disable-next-line:no-unsafe-any
         this.disposables.forEach((disposable) => disposable && disposable.dispose());

src/client/common/startPage/webviewHost.ts

@@ -15,6 +15,7 @@ import * as localize from '../utils/localize';
 import { DefaultTheme, Telemetry } from './constants';
 import { ICodeCssGenerator, IThemeFinder } from './types';
 
+import { PythonSettings } from '../configSettings';
 import { isTestExecution } from '../constants';
 import { IConfigurationService, IDisposable, IPythonSettings, Resource } from '../types';
 import { CssMessages, IGetCssRequest, IGetMonacoThemeRequest, SharedMessages } from './messages';
@@ -104,18 +105,8 @@ export abstract class WebviewHost<IMapping> implements IDisposable {
     }
 
     protected async generateExtraSettings(): Promise<IPythonSettings> {
-        const resource = this.owningResource;
-        // tslint:disable-next-line: no-any
-        const prunedSettings = this.configService.getSettings(resource) as any;
-
-        // Remove keys that aren't serializable
-        const keys = Object.keys(prunedSettings);
-        keys.forEach((k) => {
-            if (k.includes('Manager') || k.includes('Service') || k.includes('onDid')) {
-                delete prunedSettings[k];
-            }
-        });
-        return prunedSettings;
+        const settings = this.configService.getSettings(this.owningResource);
+        return PythonSettings.toSerializable(settings);
     }
 
     protected async sendLocStrings() {