fixes

Author: eleanorjboyd

src/extension/common/application/commands/reportIssueCommand.ts

@@ -26,9 +26,9 @@ export async function openReportIssue(): Promise<void> {
     const interpreterPath = await getActiveEnvironmentPath();
     let interpreter: PythonEnvironment | undefined = undefined;
     if (interpreterPath && 'environmentPath' in interpreterPath) {
-        interpreter = interpreterPath ? await resolveEnvironment(interpreterPath.environmentPath.fsPath) : undefined;
+        interpreter = await resolveEnvironment(interpreterPath.environmentPath.fsPath);
     } else if (interpreterPath && 'path' in interpreterPath) {
-        interpreter = interpreterPath ? await resolveEnvironment(interpreterPath.path) : undefined;
+        interpreter = await resolveEnvironment(interpreterPath.path);
     }
     const virtualEnvKind = interpreter && interpreter.envId ? interpreter.envId.managerId : 'Unknown';
     const pythonVersion = interpreter?.version ?? 'unknown';

src/extension/common/python.ts

@@ -28,7 +28,7 @@ const onDidChangePythonInterpreterEvent = new EventEmitter<IInterpreterDetails>(
 export const onDidChangePythonInterpreter: Event<IInterpreterDetails> = onDidChangePythonInterpreterEvent.event;
 
 async function activateExtensions() {
-    traceWarn('Value during activateExtensions of useEnvExtension(): ', useEnvExtension());
+    traceLog('Value during activateExtensions of useEnvExtension(): ', useEnvExtension());
     await activatePythonExtension();
     await activateEnvsExtension();
 }
@@ -73,7 +73,6 @@ export async function initializePython(disposables: Disposable[]): Promise<void>
             if (api) {
                 disposables.push(
                     api.onDidChangeEnvironments(async () => {
-                        // not sure if this is the right event....
                         const details = await getInterpreterDetails();
                         traceLog(`initializePython:onDidChangeEnvironments fired executable='${details.path?.[0]}'`);
                         onDidChangePythonInterpreterEvent.fire(details);
@@ -217,8 +216,7 @@ export async function resolveEnvironment(
 export async function getActiveEnvironmentPath(
     resource?: Resource,
 ): Promise<PythonEnvironment | EnvironmentPath | undefined> {
-    // if I add environmentPath. or there needs to be some conversion between the two here
-    //TODO: fix this return type??
+
     if (!useEnvExtension()) {
         const envPath: EnvironmentPath = await legacyGetActiveEnvironmentPath(resource);
         traceLog(`getActiveEnvironmentPath: legacy active path='${envPath.path}'`);

src/extension/debugger/adapter/factory.ts

@@ -199,7 +199,7 @@ export class DebugAdapterDescriptorFactory implements IDebugAdapterDescriptorFac
             // Parse version string (e.g., "3.8.10" -> major: 3, minor: 8)
             const parseMajorMinor = (v: string) => {
                 const m = v.match(/^(\d+)(?:\.(\d+))?/);
-                return { major: m ? Number(m[1]) : 0, minor: m && m[2] ? Number(m[2]) : 0 };
+                return { major: m && m[1] ? Number(m[1]) : 0, minor: m && m[2] ? Number(m[2]) : 0 };
             };
             const { major, minor } = parseMajorMinor(version || '');
 

src/test/unittest/common/pythonFalse.unit.test.ts

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-('use strict');
-
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 import { Uri, Disposable, Extension, commands, extensions } from 'vscode';