Skip to content

Commit d0a07de

Browse files
author
Kartik Raj
authored
Log best effort versions calculated for an environment (#22980)
For #22877
1 parent f1d7799 commit d0a07de

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/client/pythonEnvironments/common/commonUtils.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as fs from 'fs';
55
import * as path from 'path';
66
import { convertFileType, DirEntry, FileType, getFileFilter, getFileType } from '../../common/utils/filesystem';
77
import { getOSType, OSType } from '../../common/utils/platform';
8-
import { traceError } from '../../logging';
8+
import { traceError, traceVerbose } from '../../logging';
99
import { PythonVersion, UNKNOWN_PYTHON_VERSION } from '../base/info';
1010
import { comparePythonVersionSpecificity } from '../base/info/env';
1111
import { parseVersion } from '../base/info/pythonVersion';
@@ -246,8 +246,11 @@ export async function getPythonVersionFromPath(interpreterPath: string, hint?: s
246246
versionA = UNKNOWN_PYTHON_VERSION;
247247
}
248248
const versionB = interpreterPath ? await getPythonVersionFromNearByFiles(interpreterPath) : UNKNOWN_PYTHON_VERSION;
249+
traceVerbose('Best effort version B for', interpreterPath, JSON.stringify(versionB));
249250
const versionC = interpreterPath ? await getPythonVersionFromPyvenvCfg(interpreterPath) : UNKNOWN_PYTHON_VERSION;
251+
traceVerbose('Best effort version C for', interpreterPath, JSON.stringify(versionC));
250252
const versionD = interpreterPath ? await getPythonVersionFromConda(interpreterPath) : UNKNOWN_PYTHON_VERSION;
253+
traceVerbose('Best effort version D for', interpreterPath, JSON.stringify(versionD));
251254

252255
let version = UNKNOWN_PYTHON_VERSION;
253256
for (const v of [versionA, versionB, versionC, versionD]) {

src/client/terminals/envCollectionActivation/shellIntegrationService.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ export class ShellIntegrationService implements IShellIntegrationService {
5757
}
5858
this.appShell.onDidWriteTerminalData(
5959
(e) => {
60-
traceVerbose(e.data); // Log this temporarily for analysis
6160
if (e.data.includes('\x1b]633;A\x07') || e.data.includes('\x1b]133;A\x07')) {
6261
let { shell } = this.appEnvironment;
6362
if ('shellPath' in e.terminal.creationOptions && e.terminal.creationOptions.shellPath) {

0 commit comments

Comments
 (0)