Update launch resolver

paulacamargo25 · paulacamargo25 · commit 50c6282342a8 · 2022-10-06T16:48:16.000-07:00
diff --git a/src/client/debugger/extension/configuration/providers/djangoLaunch.ts b/src/client/debugger/extension/configuration/providers/djangoLaunch.ts
@@ -65,12 +65,13 @@ export async function validateManagePy(
         return error;
     }
     const resolvedPath = resolveVariables(selected, undefined, folder);
-
-    if (selected !== defaultValue && !(await fs.pathExists(resolvedPath))) {
-        return error;
-    }
-    if (!resolvedPath.trim().toLowerCase().endsWith('.py')) {
-        return error;
+    if (resolvedPath) {
+        if (selected !== defaultValue && !(await fs.pathExists(resolvedPath))) {
+            return error;
+        }
+        if (!resolvedPath.trim().toLowerCase().endsWith('.py')) {
+            return error;
+        }
     }
     return;
 }
diff --git a/src/client/debugger/extension/configuration/providers/pyramidLaunch.ts b/src/client/debugger/extension/configuration/providers/pyramidLaunch.ts
@@ -77,11 +77,13 @@ export async function validateIniPath(
         return error;
     }
     const resolvedPath = resolveVariables(selected, undefined, folder);
-    if (selected !== defaultValue && !fs.pathExists(resolvedPath)) {
-        return error;
-    }
-    if (!resolvedPath.trim().toLowerCase().endsWith('.ini')) {
-        return error;
+    if (resolvedPath) {
+        if (selected !== defaultValue && !fs.pathExists(resolvedPath)) {
+            return error;
+        }
+        if (!resolvedPath.trim().toLowerCase().endsWith('.ini')) {
+            return error;
+        }
     }
 }
 
diff --git a/src/client/debugger/extension/configuration/resolvers/base.ts b/src/client/debugger/extension/configuration/resolvers/base.ts
@@ -6,10 +6,8 @@
 import { injectable } from 'inversify';
 import * as path from 'path';
 import * as vscode from 'vscode';
-import { CancellationToken, DebugConfiguration, Uri, WorkspaceFolder } from 'vscode';
-import { IDocumentManager, IWorkspaceService } from '../../../../common/application/types';
+import { CancellationToken, DebugConfiguration, Uri, WorkspaceFolder, window } from 'vscode';
 import { PYTHON_LANGUAGE } from '../../../../common/constants';
-import { IPlatformService } from '../../../../common/platform/types';
 import { IConfigurationService } from '../../../../common/types';
 import { SystemVariables } from '../../../../common/variables/systemVariables';
 import { IInterpreterService } from '../../../../interpreter/contracts';
@@ -20,16 +18,14 @@ import { AttachRequestArguments, DebugOptions, LaunchRequestArguments, PathMappi
 import { PythonPathSource } from '../../types';
 import { IDebugConfigurationResolver } from '../types';
 import { resolveVariables } from '../utils/common';
+import { getWorkspaceFolder as getVSCodeWorkspaceFolder } from '../utils/workspaceFolder';
 
 @injectable()
 export abstract class BaseConfigurationResolver<T extends DebugConfiguration>
     implements IDebugConfigurationResolver<T> {
     protected pythonPathSource: PythonPathSource = PythonPathSource.launchJson;
 
     constructor(
-        protected readonly workspaceService: IWorkspaceService,
-        protected readonly documentManager: IDocumentManager,
-        protected readonly platformService: IPlatformService,
         protected readonly configurationService: IConfigurationService,
         protected readonly interpreterService: IInterpreterService,
     ) {}
@@ -61,24 +57,25 @@ export abstract class BaseConfigurationResolver<T extends DebugConfiguration>
             return folder.uri;
         }
         const program = this.getProgram();
+
         if (!Array.isArray(vscode.workspace.workspaceFolders) || vscode.workspace.workspaceFolders.length === 0) {
             return program ? Uri.file(path.dirname(program)) : undefined;
         }
         if (vscode.workspace.workspaceFolders.length === 1) {
             return vscode.workspace.workspaceFolders[0].uri;
         }
         if (program) {
-            const workspaceFolder = vscode.workspace.getWorkspaceFolder(Uri.file(program));
+            const workspaceFolder = getVSCodeWorkspaceFolder(Uri.file(program));
             if (workspaceFolder) {
                 return workspaceFolder.uri;
             }
         }
     }
 
     protected getProgram(): string | undefined {
-        const editor = this.documentManager.activeTextEditor;
-        if (editor && editor.document.languageId === PYTHON_LANGUAGE) {
-            return editor.document.fileName;
+        const { activeTextEditor } = window;
+        if (activeTextEditor && activeTextEditor.document.languageId === PYTHON_LANGUAGE) {
+            return activeTextEditor.document.fileName;
         }
     }
 
@@ -111,29 +108,30 @@ export abstract class BaseConfigurationResolver<T extends DebugConfiguration>
         debugConfiguration: LaunchRequestArguments,
     ): Promise<void> {
         if (!debugConfiguration) {
-            45;
             return;
         }
-        const systemVariables: SystemVariables = new SystemVariables(
-            undefined,
-            workspaceFolder?.fsPath,
-            this.workspaceService,
-        );
         if (debugConfiguration.pythonPath === '${command:python.interpreterPath}' || !debugConfiguration.pythonPath) {
             const interpreterPath =
                 (await this.interpreterService.getActiveInterpreter(workspaceFolder))?.path ??
                 this.configurationService.getSettings(workspaceFolder).pythonPath;
             debugConfiguration.pythonPath = interpreterPath;
         } else {
-            debugConfiguration.pythonPath = systemVariables.resolveAny(debugConfiguration.pythonPath);
+            debugConfiguration.pythonPath = resolveVariables(
+                debugConfiguration.pythonPath ? debugConfiguration.pythonPath : undefined,
+                workspaceFolder?.fsPath,
+                undefined,
+            );
         }
         if (debugConfiguration.python === '${command:python.interpreterPath}' || !debugConfiguration.python) {
             this.pythonPathSource = PythonPathSource.settingsJson;
         } else {
             this.pythonPathSource = PythonPathSource.launchJson;
         }
-        debugConfiguration.python = systemVariables.resolveAny(debugConfiguration.python);
-        const newDebug = resolveVariables(debugConfiguration.python.pythonPath);
+        debugConfiguration.python = resolveVariables(
+            debugConfiguration.python ? debugConfiguration.python : undefined,
+            workspaceFolder?.fsPath,
+            undefined,
+        );
     }
 
     protected debugOption(debugOptions: DebugOptions[], debugOption: DebugOptions) {
@@ -179,7 +177,7 @@ export abstract class BaseConfigurationResolver<T extends DebugConfiguration>
 
         // If on Windows, lowercase the drive letter for path mappings.
         // TODO: Apply even if no localRoot?
-        if (this.platformService.isWindows) {
+        if (/^win/.test(process.platform)) {
             // TODO: Apply to remoteRoot too?
             pathMappings = pathMappings.map(({ localRoot: windowsLocalRoot, remoteRoot }) => {
                 let localRoot = windowsLocalRoot;
diff --git a/src/client/debugger/extension/configuration/resolvers/launch.ts b/src/client/debugger/extension/configuration/resolvers/launch.ts
@@ -7,8 +7,6 @@ import { inject, injectable, named } from 'inversify';
 import { CancellationToken, Uri, WorkspaceFolder } from 'vscode';
 import { InvalidPythonPathInDebuggerServiceId } from '../../../../application/diagnostics/checks/invalidPythonPathInDebugger';
 import { IDiagnosticsService, IInvalidPythonPathInDebuggerService } from '../../../../application/diagnostics/types';
-import { IDocumentManager, IWorkspaceService } from '../../../../common/application/types';
-import { IPlatformService } from '../../../../common/platform/types';
 import { IConfigurationService } from '../../../../common/types';
 import { IInterpreterService } from '../../../../interpreter/contracts';
 import { DebuggerTypeName } from '../../../constants';
@@ -19,17 +17,14 @@ import { IDebugEnvironmentVariablesService } from './helper';
 @injectable()
 export class LaunchConfigurationResolver extends BaseConfigurationResolver<LaunchRequestArguments> {
     constructor(
-        @inject(IWorkspaceService) workspaceService: IWorkspaceService,
-        @inject(IDocumentManager) documentManager: IDocumentManager,
         @inject(IDiagnosticsService)
         @named(InvalidPythonPathInDebuggerServiceId)
         private readonly invalidPythonPathInDebuggerService: IInvalidPythonPathInDebuggerService,
-        @inject(IPlatformService) platformService: IPlatformService,
         @inject(IConfigurationService) configurationService: IConfigurationService,
         @inject(IDebugEnvironmentVariablesService) private readonly debugEnvHelper: IDebugEnvironmentVariablesService,
         @inject(IInterpreterService) interpreterService: IInterpreterService,
     ) {
-        super(workspaceService, documentManager, platformService, configurationService, interpreterService);
+        super(configurationService, interpreterService);
     }
 
     public async resolveDebugConfiguration(
@@ -153,7 +148,7 @@ export class LaunchConfigurationResolver extends BaseConfigurationResolver<Launc
         if (debugConfiguration.subProcess === true) {
             this.debugOption(debugOptions, DebugOptions.SubProcess);
         }
-        if (this.platformService.isWindows) {
+        if (/^win/.test(process.platform)) {
             this.debugOption(debugOptions, DebugOptions.FixFilePathCase);
         }
         const isFastAPI = this.isDebuggingFastAPI(debugConfiguration);
diff --git a/src/client/debugger/extension/configuration/utils/common.ts b/src/client/debugger/extension/configuration/utils/common.ts
@@ -21,20 +21,23 @@ function isString(str: any): str is string {
 }
 
 export function resolveVariables(
-    value: string,
+    value: string | undefined,
     rootFolder: string | undefined,
     folder: WorkspaceFolder | undefined,
-): string {
-    const workspace = folder ? getWorkspaceFolder(folder.uri) : undefined;
-    const variablesObject: { [key: string]: any } = {};
-    variablesObject.workspaceFolder = workspace ? workspace.uri.fsPath : rootFolder;
+): string | undefined {
+    if (value) {
+        const workspace = folder ? getWorkspaceFolder(folder.uri) : undefined;
+        const variablesObject: { [key: string]: any } = {};
+        variablesObject.workspaceFolder = workspace ? workspace.uri.fsPath : rootFolder;
 
-    const regexp = /\$\{(.*?)\}/g;
-    return value.replace(regexp, (match: string, name: string) => {
-        const newValue = variablesObject[name];
-        if (isString(newValue)) {
-            return newValue;
-        }
-        return match && (match.indexOf('env.') > 0 || match.indexOf('env:') > 0) ? '' : match;
-    });
+        const regexp = /\$\{(.*?)\}/g;
+        return value.replace(regexp, (match: string, name: string) => {
+            const newValue = variablesObject[name];
+            if (isString(newValue)) {
+                return newValue;
+            }
+            return match && (match.indexOf('env.') > 0 || match.indexOf('env:') > 0) ? '' : match;
+        });
+    }
+    return value;
 }

Original file line number	Diff line number	Diff line change
`@@ -77,11 +77,13 @@ export async function validateIniPath(`
`77`	`77`	`return error;`
`78`	`78`	`}`
`79`	`79`	`const resolvedPath = resolveVariables(selected, undefined, folder);`
`80`		`- if (selected !== defaultValue && !fs.pathExists(resolvedPath)) {`
`81`		`- return error;`
`82`		`- }`
`83`		`- if (!resolvedPath.trim().toLowerCase().endsWith('.ini')) {`
`84`		`- return error;`
	`80`	`+ if (resolvedPath) {`
	`81`	`+ if (selected !== defaultValue && !fs.pathExists(resolvedPath)) {`
	`82`	`+ return error;`
	`83`	`+ }`
	`84`	`+ if (!resolvedPath.trim().toLowerCase().endsWith('.ini')) {`
	`85`	`+ return error;`
	`86`	`+ }`
`85`	`87`	`}`
`86`	`88`	`}`
`87`	`89`