Disable proposed api used for custom editor

Author: DonJayamanne

.vscode/launch.json

@@ -8,9 +8,7 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                "--extensionDevelopmentPath=${workspaceFolder}",
-                "--enable-proposed-api",
-                "ms-python.python"
+                "--extensionDevelopmentPath=${workspaceFolder}"
             ],
             "stopOnEntry": false,
             "smartStep": true,
@@ -21,7 +19,7 @@
             "preLaunchTask": "Compile",
             "skipFiles": [
                 "<node_internals>/**"
-            ],
+            ]
         },
         {
             "name": "Extension inside container",

src/client/common/insidersBuild/insidersExtensionService.ts

@@ -85,10 +85,7 @@ export class InsidersExtensionService implements IExtensionSingleActivationServi
      * @returns `true` if install channel is handled in these miscellaneous cases, `false` if install channel needs further handling
      */
     public async handleEdgeCases(installChannel: ExtensionChannels, isDefault: boolean): Promise<boolean> {
-        // When running UI Tests we might want to disable these prompts.
-        if (process.env.UITEST_DISABLE_INSIDERS) {
-            return true;
-        } else if (await this.promptToInstallInsidersIfApplicable(isDefault)) {
+        if (await this.promptToInstallInsidersIfApplicable(isDefault)) {
             return true;
         } else if (await this.setInsidersChannelToOffIfApplicable(installChannel)) {
             return true;

src/test/common/insidersBuild/insidersExtensionService.unit.test.ts

@@ -106,10 +106,7 @@ suite('Insiders Extension Service - Activation', () => {
     let handleEdgeCases: sinon.SinonStub<any>;
     let insidersInstaller: IExtensionBuildInstaller;
     let insidersExtensionService: InsidersExtensionService;
-    let envUITEST_DISABLE_INSIDERSExists = false;
     setup(() => {
-        envUITEST_DISABLE_INSIDERSExists = process.env.UITEST_DISABLE_INSIDERS !== undefined;
-        delete process.env.UITEST_DISABLE_INSIDERS;
         extensionChannelService = mock(ExtensionChannelService);
         insidersInstaller = mock(InsidersBuildInstaller);
         appEnvironment = mock(ApplicationEnvironment);
@@ -122,9 +119,6 @@ suite('Insiders Extension Service - Activation', () => {
     });
 
     teardown(() => {
-        if (envUITEST_DISABLE_INSIDERSExists) {
-            process.env.UITEST_DISABLE_INSIDERS = '1';
-        }
         sinon.restore();
     });
 

src/test/debuggerTest.ts

@@ -18,8 +18,7 @@ function start() {
         extensionDevelopmentPath: EXTENSION_ROOT_DIR_FOR_TESTS,
         extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
         launchArgs: [workspacePath],
-        version: 'insiders',
-        extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
+        version: 'insiders'
     }).catch(ex => {
         console.error('End Debugger tests (with errors)', ex);
         process.exit(1);

src/test/multiRootTest.ts

@@ -13,9 +13,8 @@ function start() {
     runTests({
         extensionDevelopmentPath: EXTENSION_ROOT_DIR_FOR_TESTS,
         extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
-        launchArgs: [workspacePath, '--enable-proposed-api', 'ms-python.python'],
-        version: 'insiders',
-        extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
+        launchArgs: [workspacePath],
+        version: 'stable'
     }).catch(ex => {
         console.error('End Multiroot tests (with errors)', ex);
         process.exit(1);

src/test/standardTest.ts

@@ -19,9 +19,8 @@ function start() {
     runTests({
         extensionDevelopmentPath: extensionDevelopmentPath,
         extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
-        launchArgs: [workspacePath, '--enable-proposed-api', 'ms-python.python'],
-        version: 'insiders',
-        extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
+        launchArgs: [workspacePath],
+        version: 'stable'
     }).catch(ex => {
         console.error('End Standard tests (with errors)', ex);
         process.exit(1);