Update venv labeling to show [uv] when uv is available #810
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,7 +29,7 @@ import { | |
| SetEnvironmentScope, | ||
| } from '../../api'; | ||
| import { PYTHON_EXTENSION_ID } from '../../common/constants'; | ||
| import { VenvManagerStringsNoUv } from '../../common/localize'; | ||
| import { traceError, traceWarn } from '../../common/logging'; | ||
| import { createDeferred, Deferred } from '../../common/utils/deferred'; | ||
| import { showErrorMessage, withProgress } from '../../common/window.apis'; | ||
|
|
@@ -66,7 +66,7 @@ export class VenvManager implements EnvironmentManager { | |
| public readonly onDidChangeEnvironments = this._onDidChangeEnvironments.event; | ||
|
|
||
| readonly name: string; | ||
| displayName: string; // Made mutable to update with uv detection | ||
|
||
| readonly preferredPackageManagerId: string; | ||
| readonly description?: string | undefined; | ||
| readonly tooltip?: string | MarkdownString | undefined; | ||
|
|
@@ -83,7 +83,7 @@ export class VenvManager implements EnvironmentManager { | |
| // Descriptions were a bit too visually noisy | ||
| // https://github.com/microsoft/vscode-python-environments/issues/167 | ||
| this.description = undefined; | ||
| this.tooltip = new MarkdownString(VenvManagerStringsNoUv.venvManagerDescription, true); | ||
| this.preferredPackageManagerId = 'ms-python.python:pip'; | ||
| this.iconPath = new ThemeIcon('python'); | ||
| } | ||
|
|
@@ -97,7 +97,7 @@ export class VenvManager implements EnvironmentManager { | |
| this._initialized = createDeferred(); | ||
|
|
||
| try { | ||
| await this.internalRefresh(undefined, false, VenvManagerStringsNoUv.venvInitialize); | ||
| } finally { | ||
| this._initialized.resolve(); | ||
| } | ||
|
|
@@ -119,6 +119,14 @@ export class VenvManager implements EnvironmentManager { | |
| }; | ||
| } | ||
|
|
||
| /** | ||
| * Updates the display name for this environment manager. | ||
| * @param name The new display name to set. | ||
| */ | ||
| public setDisplayName(name: string): void { | ||
| this.displayName = name; | ||
| } | ||
|
|
||
| async create( | ||
| scope: CreateEnvironmentScope, | ||
| options: CreateEnvironmentOptions | undefined, | ||
|
|
@@ -148,15 +156,15 @@ export class VenvManager implements EnvironmentManager { | |
| // error on missing information | ||
| if (!this.globalEnv) { | ||
| this.log.error('No base python found'); | ||
| showErrorMessage(VenvManagerStringsNoUv.venvErrorNoBasePython); | ||
| throw new Error('No base python found'); | ||
| } | ||
| if (!this.globalEnv.version.startsWith('3.')) { | ||
| this.log.error('Did not find any base python 3.*'); | ||
| globals.forEach((e, i) => { | ||
| this.log.error(`${i}: ${e.version} : ${e.environmentPath.fsPath}`); | ||
| }); | ||
| showErrorMessage(VenvManagerStringsNoUv.venvErrorNoPython3); | ||
| throw new Error('Did not find any base python 3.*'); | ||
| } | ||
| if (this.globalEnv && this.globalEnv.version.startsWith('3.')) { | ||
|
|
@@ -284,14 +292,14 @@ export class VenvManager implements EnvironmentManager { | |
| } | ||
|
|
||
| async refresh(scope: RefreshEnvironmentsScope): Promise<void> { | ||
| return this.internalRefresh(scope, true, VenvManagerStringsNoUv.venvRefreshing); | ||
| } | ||
|
|
||
| async watcherRefresh(): Promise<void> { | ||
| if (this.skipWatcherRefresh) { | ||
| return; | ||
| } | ||
| return this.internalRefresh(undefined, true, VenvManagerStringsNoUv.venvRefreshing); | ||
| } | ||
|
|
||
| private async internalRefresh( | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@karthiknadig can you just review this to make sure this structure of setting strings makes sense and follows good coding practices
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This actually looks a bit weird. There are several string duplicates.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@karthiknadig moved to duplicates to a diff function so there shouldn't be repeats. Lmk your thoughts