From d0a07de90b5cce0a0047093cc26ec7af15e3c1c1 Mon Sep 17 00:00:00 2001 From: Kartik Raj Date: Tue, 27 Feb 2024 21:11:21 +0530 Subject: [PATCH] Log best effort versions calculated for an environment (#22980) For https://github.com/microsoft/vscode-python/issues/22877 --- src/client/pythonEnvironments/common/commonUtils.ts | 5 ++++- .../envCollectionActivation/shellIntegrationService.ts | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/client/pythonEnvironments/common/commonUtils.ts b/src/client/pythonEnvironments/common/commonUtils.ts index 85462531e5e3..4bd94e0402ab 100644 --- a/src/client/pythonEnvironments/common/commonUtils.ts +++ b/src/client/pythonEnvironments/common/commonUtils.ts @@ -5,7 +5,7 @@ import * as fs from 'fs'; import * as path from 'path'; import { convertFileType, DirEntry, FileType, getFileFilter, getFileType } from '../../common/utils/filesystem'; import { getOSType, OSType } from '../../common/utils/platform'; -import { traceError } from '../../logging'; +import { traceError, traceVerbose } from '../../logging'; import { PythonVersion, UNKNOWN_PYTHON_VERSION } from '../base/info'; import { comparePythonVersionSpecificity } from '../base/info/env'; import { parseVersion } from '../base/info/pythonVersion'; @@ -246,8 +246,11 @@ export async function getPythonVersionFromPath(interpreterPath: string, hint?: s versionA = UNKNOWN_PYTHON_VERSION; } const versionB = interpreterPath ? await getPythonVersionFromNearByFiles(interpreterPath) : UNKNOWN_PYTHON_VERSION; + traceVerbose('Best effort version B for', interpreterPath, JSON.stringify(versionB)); const versionC = interpreterPath ? await getPythonVersionFromPyvenvCfg(interpreterPath) : UNKNOWN_PYTHON_VERSION; + traceVerbose('Best effort version C for', interpreterPath, JSON.stringify(versionC)); const versionD = interpreterPath ? await getPythonVersionFromConda(interpreterPath) : UNKNOWN_PYTHON_VERSION; + traceVerbose('Best effort version D for', interpreterPath, JSON.stringify(versionD)); let version = UNKNOWN_PYTHON_VERSION; for (const v of [versionA, versionB, versionC, versionD]) { diff --git a/src/client/terminals/envCollectionActivation/shellIntegrationService.ts b/src/client/terminals/envCollectionActivation/shellIntegrationService.ts index cba2ccbc6867..8ab3d84122b7 100644 --- a/src/client/terminals/envCollectionActivation/shellIntegrationService.ts +++ b/src/client/terminals/envCollectionActivation/shellIntegrationService.ts @@ -57,7 +57,6 @@ export class ShellIntegrationService implements IShellIntegrationService { } this.appShell.onDidWriteTerminalData( (e) => { - traceVerbose(e.data); // Log this temporarily for analysis if (e.data.includes('\x1b]633;A\x07') || e.data.includes('\x1b]133;A\x07')) { let { shell } = this.appEnvironment; if ('shellPath' in e.terminal.creationOptions && e.terminal.creationOptions.shellPath) {