Try something out

Author: Kartik Raj

src/client/common/interpreterPathService.ts

@@ -9,7 +9,6 @@ import { ConfigurationChangeEvent, ConfigurationTarget, Event, EventEmitter, Uri
 import { IWorkspaceService } from './application/types';
 import { PythonSettings } from './configSettings';
 import { isTestExecution } from './constants';
-import { FileSystemPaths } from './platform/fs-paths';
 import {
     IDisposable,
     IDisposableRegistry,
@@ -40,14 +39,12 @@ export class InterpreterPathService implements IInterpreterPathService {
         return this._didChangeInterpreterEmitter.event;
     }
     public _didChangeInterpreterEmitter = new EventEmitter<InterpreterConfigurationScope>();
-    private fileSystemPaths: FileSystemPaths;
     constructor(
         @inject(IPersistentStateFactory) private readonly persistentStateFactory: IPersistentStateFactory,
         @inject(IWorkspaceService) private readonly workspaceService: IWorkspaceService,
         @inject(IDisposableRegistry) disposables: IDisposable[]
     ) {
         disposables.push(this.workspaceService.onDidChangeConfiguration(this.onDidChangeConfiguration.bind(this)));
-        this.fileSystemPaths = FileSystemPaths.withDefaults();
     }
 
     public async onDidChangeConfiguration(event: ConfigurationChangeEvent) {
@@ -128,9 +125,7 @@ export class InterpreterPathService implements IInterpreterPathService {
             settingKey = `WORKSPACE_FOLDER_INTERPRETER_PATH_${folderKey}`;
         } else {
             settingKey = this.workspaceService.workspaceFile
-                ? `WORKSPACE_INTERPRETER_PATH_${this.fileSystemPaths.normCase(
-                      this.workspaceService.workspaceFile.fsPath
-                  )}`
+                ? `WORKSPACE_INTERPRETER_PATH_${this.workspaceService.workspaceFile.fsPath}`
                 : // Only a single folder is opened, use fsPath of the folder as key
                   `WORKSPACE_FOLDER_INTERPRETER_PATH_${folderKey}`;
         }
@@ -165,7 +160,7 @@ export class InterpreterPathService implements IInterpreterPathService {
     public async _copyWorkspaceValueToNewStorage(resource: Resource, value: string | undefined): Promise<void> {
         // Copy workspace setting into the new storage if it hasn't been copied already
         const workspaceKey = this.workspaceService.workspaceFile
-            ? this.fileSystemPaths.normCase(this.workspaceService.workspaceFile.fsPath)
+            ? this.workspaceService.workspaceFile.fsPath
             : undefined;
         if (!workspaceKey) {
             return;

src/test/common/interpreterPathService.unit.test.ts

@@ -126,7 +126,7 @@ suite('Interpreter Path Service', async () => {
 
     test('If the one-off transfer to new storage has not happened yet for the workspace, do it and record the transfer', async () => {
         const workspaceFileUri = Uri.parse('path/to/workspaceFile');
-        const expectedWorkspaceKey = 'PATH\\TO\\WORKSPACEFILE';
+        const expectedWorkspaceKey = workspaceFileUri.fsPath;
         const update = sinon.stub(InterpreterPathService.prototype, 'update');
         const persistentState = TypeMoq.Mock.ofType<IPersistentState<string[]>>();
         workspaceService.setup((w) => w.workspaceFile).returns(() => workspaceFileUri);
@@ -148,7 +148,7 @@ suite('Interpreter Path Service', async () => {
 
     test('If the one-off transfer to new storage has already happened for the workspace, do not update and simply return', async () => {
         const workspaceFileUri = Uri.parse('path/to/workspaceFile');
-        const expectedWorkspaceKey = 'PATH\\TO\\WORKSPACEFILE';
+        const expectedWorkspaceKey = workspaceFileUri.fsPath;
         const update = sinon.stub(InterpreterPathService.prototype, 'update');
         const persistentState = TypeMoq.Mock.ofType<IPersistentState<string[]>>();
         workspaceService.setup((w) => w.workspaceFile).returns(() => workspaceFileUri);
@@ -330,7 +330,7 @@ suite('Interpreter Path Service', async () => {
 
     test('Workspace settings are correctly updated in case of multiroot folders', async () => {
         const workspaceFileUri = Uri.parse('path/to/workspaceFile');
-        const expectedSettingKey = 'WORKSPACE_INTERPRETER_PATH_PATH\\TO\\WORKSPACEFILE';
+        const expectedSettingKey = `WORKSPACE_INTERPRETER_PATH_${workspaceFileUri.fsPath}`;
         const persistentState = TypeMoq.Mock.ofType<IPersistentState<string | undefined>>();
         workspaceService.setup((w) => w.getWorkspaceFolderIdentifier(resource)).returns(() => resource.fsPath);
         workspaceService.setup((w) => w.workspaceFile).returns(() => workspaceFileUri);
@@ -507,7 +507,7 @@ suite('Interpreter Path Service', async () => {
 
     test('Inspecting settings returns as expected in case of multiroot folders', async () => {
         const workspaceFileUri = Uri.parse('path/to/workspaceFile');
-        const expectedWorkspaceSettingKey = 'WORKSPACE_INTERPRETER_PATH_PATH\\TO\\WORKSPACEFILE';
+        const expectedWorkspaceSettingKey = `WORKSPACE_INTERPRETER_PATH_${workspaceFileUri.fsPath}`;
         const expectedWorkspaceFolderSettingKey = `WORKSPACE_FOLDER_INTERPRETER_PATH_${resource.fsPath}`;
         const workspaceConfig = TypeMoq.Mock.ofType<WorkspaceConfiguration>();
         // A workspace file is present in case of multiroot workspace folders