Addressed reviews

microsoft · May 20, 2019 · 2c6022a · 2c6022a
1 parent 4bb0056
commit 2c6022a
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -889,6 +889,36 @@
                                 "description": "Debug port (default is 0, resulting in the use of a dynamic port).",
                                 "default": 0
                             },
+                            "pathMappings": {
+                                "type": "array",
+                                "label": "Path mappings.",
+                                "items": {
+                                    "type": "object",
+                                    "label": "Path mapping",
+                                    "required": [
+                                        "localRoot",
+                                        "remoteRoot"
+                                    ],
+                                    "properties": {
+                                        "localRoot": {
+                                            "type": "string",
+                                            "label": "Local source root.",
+                                            "default": "${workspaceFolder}"
+                                        },
+                                        "remoteRoot": {
+                                            "type": "string",
+                                            "label": "Remote source root.",
+                                            "default": "."
+                                        }
+                                    }
+                                },
+                                "default": [
+                                    {
+                                        "localRoot": "${workspaceFolder}",
+                                        "remoteRoot": "."
+                                    }
+                                ]
+                            },
                             "host": {
                                 "type": "string",
                                 "description": "IP address of the of the local debug server (default is localhost).",

diff --git a/src/client/debugger/extension/configuration/resolvers/launch.ts b/src/client/debugger/extension/configuration/resolvers/launch.ts
@@ -123,7 +123,10 @@ export class LaunchConfigurationResolver extends BaseConfigurationResolver<Launc
             debugConfiguration.program = (await this.configurationProviderUtils.getPyramidStartupScriptFilePath(workspaceFolder))!;
         }
         if (!debugConfiguration.pathMappings) {
-            debugConfiguration.pathMappings = [];
+            debugConfiguration.pathMappings = workspaceFolder ? [{
+                localRoot: workspaceFolder.fsPath,
+                remoteRoot: '.'
+            }] : [];
         }
         // This is for backwards compatibility.
         if (debugConfiguration.localRoot && debugConfiguration.remoteRoot) {

diff --git a/src/test/debugger/extension/configuration/resolvers/launch.unit.test.ts b/src/test/debugger/extension/configuration/resolvers/launch.unit.test.ts
@@ -381,7 +381,7 @@ suite('Debugging - Config Resolver Launch', () => {
         setupActiveEditor(pythonFile, PYTHON_LANGUAGE);
         const debugConfig = await debugProvider.resolveDebugConfiguration!(workspaceFolder, { localRoot: 'abc', remoteRoot: 'remoteabc' } as LaunchRequestArguments);
         expect(debugConfig).to.have.property('pathMappings');
-        expect(debugConfig!.pathMappings).to.deep.equal([{ localRoot: 'abc', remoteRoot: 'remoteabc' }]);
+        expect(debugConfig!.pathMappings).to.deep.equal([{ localRoot: workspaceFolder.uri.fsPath, remoteRoot: '.' }, { localRoot: 'abc', remoteRoot: 'remoteabc' }]);
     });
     async function testFixFilePathCase(isWindows: boolean, isMac: boolean, isLinux: boolean) {
         const pythonPath = `PythonPath_${new Date().toString()}`;

diff --git a/src/test/testing/common/debugLauncher.unit.test.ts b/src/test/testing/common/debugLauncher.unit.test.ts
@@ -233,7 +233,10 @@ suite('Unit Tests - Debug Launcher', () => {
             expected.debugOptions.push(DebugOptions.FixFilePathCase);
         }
         if (!expected.pathMappings) {
-            expected.pathMappings = [];
+            expected.pathMappings = expected.workspaceFolder ? [{
+                localRoot: expected.workspaceFolder.fsPath,
+                remoteRoot: '.'
+            }] : [];
         }
         // This is for backwards compatibility.
         if (expected.localRoot && expected.remoteRoot) {