Ensure 64-bit interpreters are preferred over 32-bit when auto-selecting (#19043)

* Ensure 64-bit interpreters are preferred over 32-bit when auto-selecting

* Fix bug

* News

Author: Kartik Raj

news/2 Fixes/19042.md

@@ -0,0 +1 @@
+Ensure 64-bit interpreters are preferred over 32-bit when auto-selecting.

src/client/interpreter/configuration/environmentTypeComparer.ts

@@ -2,8 +2,8 @@
 // Licensed under the MIT License.
 
 import { injectable, inject } from 'inversify';
-import { getArchitectureDisplayName } from '../../common/platform/registry';
 import { Resource } from '../../common/types';
+import { Architecture } from '../../common/utils/platform';
 import { isParentPath } from '../../pythonEnvironments/common/externalDependencies';
 import { EnvironmentType, PythonEnvironment, virtualEnvTypes } from '../../pythonEnvironments/info';
 import { PythonVersion } from '../../pythonEnvironments/info/pythonVersion';
@@ -111,7 +111,7 @@ function getSortName(info: PythonEnvironment, interpreterHelper: IInterpreterHel
         sortNameParts.push(info.version.raw);
     }
     if (info.architecture) {
-        sortNameParts.push(getArchitectureDisplayName(info.architecture));
+        sortNameParts.push(getArchitectureSortName(info.architecture));
     }
     if (info.companyDisplayName && info.companyDisplayName.length > 0) {
         sortNameParts.push(info.companyDisplayName.trim());
@@ -133,6 +133,18 @@ function getSortName(info: PythonEnvironment, interpreterHelper: IInterpreterHel
     return `${sortNameParts.join(' ')} ${envSuffix}`.trim();
 }
 
+function getArchitectureSortName(arch?: Architecture) {
+    // Strings are choosen keeping in mind that 64-bit gets preferred over 32-bit.
+    switch (arch) {
+        case Architecture.x64:
+            return 'x64';
+        case Architecture.x86:
+            return 'x86';
+        default:
+            return '';
+    }
+}
+
 function isBaseCondaEnvironment(environment: PythonEnvironment): boolean {
     return (
         environment.envType === EnvironmentType.Conda &&

src/test/configuration/environmentTypeComparer.unit.test.ts

@@ -4,6 +4,7 @@
 import * as assert from 'assert';
 import * as path from 'path';
 import * as sinon from 'sinon';
+import { Architecture } from '../../client/common/utils/platform';
 import {
     EnvironmentTypeComparer,
     EnvLocationHeuristic,
@@ -218,6 +219,20 @@ suite('Environment sorting', () => {
             } as PythonEnvironment,
             expected: 1,
         },
+        {
+            title: 'If 2 global interpreters have the same Python version, they should be sorted by architecture',
+            envA: {
+                envType: EnvironmentType.Global,
+                architecture: Architecture.x86,
+                version: { major: 3, minor: 10, patch: 2 },
+            } as PythonEnvironment,
+            envB: {
+                envType: EnvironmentType.Global,
+                architecture: Architecture.x64,
+                version: { major: 3, minor: 10, patch: 2 },
+            } as PythonEnvironment,
+            expected: 1,
+        },
     ];
 
     testcases.forEach(({ title, envA, envB, expected }) => {