Point release for May release (#5846)

* Revert "Ensure using request: launch item in launch.json for debugging sends pathmappings (#5552)"

This reverts commit 1fad96f.

* Update change log

* Update version numbers

Author: DonJayamanne

CHANGELOG.md

@@ -1,7 +1,14 @@
 # Changelog
 
+## 2019.5.1 (30 May 2019)
 
-## 2019.5.0 (28 May 2019)
+### Fixes
+
+1. Revert changes related to pathMappings in `launch.json` for `debugging` [#3568](https://github.com/Microsoft/vscode-python/issues/3568)
+   ([#5833](https://github.com/microsoft/vscode-python/issues/5833))
+
+
+## 2019.5.17059 (28 May 2019)
 
 ### Enhancements
 

package-lock.json

@@ -2,7 +2,7 @@
     "name": "python",
     "displayName": "Python",
     "description": "Linting, Debugging (multi-threaded, remote), Intellisense, code formatting, refactoring, unit tests, snippets, and more.",
-    "version": "2019.5.0",
+    "version": "2019.5.1",
     "languageServerVersion": "0.2.82",
     "publisher": "ms-python",
     "author": {

package.json

@@ -122,19 +122,6 @@ export class LaunchConfigurationResolver extends BaseConfigurationResolver<Launc
         if (debugConfiguration.pyramid) {
             debugConfiguration.program = (await this.configurationProviderUtils.getPyramidStartupScriptFilePath(workspaceFolder))!;
         }
-        if (!debugConfiguration.pathMappings) {
-            debugConfiguration.pathMappings = workspaceFolder ? [{
-                localRoot: workspaceFolder.fsPath,
-                remoteRoot: '.'
-            }] : [];
-        }
-        // This is for backwards compatibility.
-        if (debugConfiguration.localRoot && debugConfiguration.remoteRoot) {
-            debugConfiguration.pathMappings!.push({
-                localRoot: debugConfiguration.localRoot,
-                remoteRoot: debugConfiguration.remoteRoot
-            });
-        }
         this.sendTelemetry(
             debugConfiguration.request as 'launch' | 'test',
             debugConfiguration

src/client/debugger/extension/configuration/resolvers/launch.ts

@@ -36,13 +36,13 @@ interface ICommonDebugArguments {
     // Show return values of functions while stepping.
     showReturnValue?: boolean;
     subProcess?: boolean;
+}
+export interface IKnownAttachDebugArguments extends ICommonDebugArguments {
+    workspaceFolder?: string;
     // An absolute path to local directory with source.
     localRoot?: string;
     remoteRoot?: string;
     pathMappings?: { localRoot: string; remoteRoot: string }[];
-}
-export interface IKnownAttachDebugArguments extends ICommonDebugArguments {
-    workspaceFolder?: string;
     customDebugger?: boolean;
 }
 

src/client/debugger/types.ts

@@ -373,16 +373,6 @@ suite('Debugging - Config Resolver Launch', () => {
             expect(debugConfig).to.have.property('justMyCode', testParams.expectedResult);
         });
     });
-    test('Ensure pathMappings property is correctly derived', async () => {
-        const pythonPath = `PythonPath_${new Date().toString()}`;
-        const workspaceFolder = createMoqWorkspaceFolder(__dirname);
-        const pythonFile = 'xyz.py';
-        setupIoc(pythonPath);
-        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: workspaceFolder.uri.fsPath, remoteRoot: '.' }, { localRoot: 'abc', remoteRoot: 'remoteabc' }]);
-    });
     async function testFixFilePathCase(isWindows: boolean, isMac: boolean, isLinux: boolean) {
         const pythonPath = `PythonPath_${new Date().toString()}`;
         const workspaceFolder = createMoqWorkspaceFolder(__dirname);