From 87e3d358598825a8a7b3225cf1c974a9787df9bd Mon Sep 17 00:00:00 2001
From: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com>
Date: Fri, 13 Jun 2025 10:46:07 -0700
Subject: [PATCH 1/2] update to add all new projects to projects view

---
 src/extension.ts                           |  2 +-
 src/features/creators/newPackageProject.ts | 20 ++++++--------------
 src/features/creators/newScriptProject.ts  | 11 +++++++++--
 src/features/views/treeViewItems.ts        | 11 ++++++-----
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/extension.ts b/src/extension.ts
index d87098b9..5a3813cf 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -119,7 +119,7 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
         projectCreators.registerPythonProjectCreator(new ExistingProjects(projectManager)),
         projectCreators.registerPythonProjectCreator(new AutoFindProjects(projectManager)),
         projectCreators.registerPythonProjectCreator(new NewPackageProject(envManagers, projectManager)),
-        projectCreators.registerPythonProjectCreator(new NewScriptProject()),
+        projectCreators.registerPythonProjectCreator(new NewScriptProject(projectManager)),
     );
 
     setPythonApi(envManagers, projectManager, projectCreators, terminalManager, envVarManager);
diff --git a/src/features/creators/newPackageProject.ts b/src/features/creators/newPackageProject.ts
index d701b557..36ec8e7c 100644
--- a/src/features/creators/newPackageProject.ts
+++ b/src/features/creators/newPackageProject.ts
@@ -114,15 +114,8 @@ export class NewPackageProject implements PythonProjectCreator {
             await replaceInFilesAndNames(projectDestinationFolder, 'package_name', packageName);
 
             // 4. Create virtual environment if requested
-            let createdPackage: PythonProject | undefined;
             if (createVenv) {
-                createdPackage = {
-                    name: packageName,
-                    uri: Uri.file(projectDestinationFolder),
-                };
-
                 // add package to list of packages before creating the venv
-                this.projectManager.add(createdPackage);
                 await quickCreateNewVenv(this.envManagers, projectDestinationFolder);
             }
 
@@ -156,13 +149,12 @@ export class NewPackageProject implements PythonProjectCreator {
             };
             await manageLaunchJsonFile(destRoot, JSON.stringify(launchJsonConfig));
 
-            if (createdPackage) {
-                // return package if created (ie when venv is created)
-                return createdPackage;
-            } else {
-                // otherwise its not a package and just a folder
-                return Uri.file(projectDestinationFolder);
-            }
+            const createdPackage: PythonProject | undefined = {
+                name: packageName,
+                uri: Uri.file(projectDestinationFolder),
+            };
+            this.projectManager.add(createdPackage);
+            return createdPackage;
         }
         return undefined;
     }
diff --git a/src/features/creators/newScriptProject.ts b/src/features/creators/newScriptProject.ts
index f2ac95f4..cc978120 100644
--- a/src/features/creators/newScriptProject.ts
+++ b/src/features/creators/newScriptProject.ts
@@ -5,6 +5,7 @@ import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from
 import { NEW_PROJECT_TEMPLATES_FOLDER } from '../../common/constants';
 import { traceError } from '../../common/logging';
 import { showInputBoxWithButtons } from '../../common/window.apis';
+import { PythonProjectManager } from '../../internal.api';
 import { isCopilotInstalled, manageCopilotInstructionsFile, replaceInFilesAndNames } from './creationHelpers';
 
 export class NewScriptProject implements PythonProjectCreator {
@@ -13,7 +14,7 @@ export class NewScriptProject implements PythonProjectCreator {
     public readonly description = l10n.t('Creates a new script folder in your current workspace with PEP 723 support');
     public readonly tooltip = new MarkdownString(l10n.t('Create a new Python script'));
 
-    constructor() {}
+    constructor(private readonly projectManager: PythonProjectManager) {}
 
     async create(options?: PythonProjectCreatorOptions): Promise<PythonProject | Uri | undefined> {
         // quick create (needs name, will always create venv and copilot instructions)
@@ -113,7 +114,13 @@ export class NewScriptProject implements PythonProjectCreator {
                 ]);
             }
 
-            return Uri.file(scriptDestination);
+            // Add the created script to the project manager
+            const createdScript: PythonProject | undefined = {
+                name: scriptFileName,
+                uri: Uri.file(scriptDestination),
+            };
+            this.projectManager.add(createdScript);
+            return createdScript;
         }
         return undefined;
     }
diff --git a/src/features/views/treeViewItems.ts b/src/features/views/treeViewItems.ts
index 6b83a9e2..363ee06b 100644
--- a/src/features/views/treeViewItems.ts
+++ b/src/features/views/treeViewItems.ts
@@ -1,9 +1,9 @@
-import { TreeItem, TreeItemCollapsibleState, MarkdownString, Command, ThemeIcon } from 'vscode';
+import { Command, MarkdownString, ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode';
+import { EnvironmentGroupInfo, IconPath, Package, PythonEnvironment, PythonProject } from '../../api';
+import { EnvViewStrings } from '../../common/localize';
 import { InternalEnvironmentManager, InternalPackageManager } from '../../internal.api';
-import { PythonEnvironment, IconPath, Package, PythonProject, EnvironmentGroupInfo } from '../../api';
-import { removable } from './utils';
 import { isActivatableEnvironment } from '../common/activation';
-import { EnvViewStrings } from '../../common/localize';
+import { removable } from './utils';
 
 export enum EnvTreeItemKind {
     manager = 'python-env-manager',
@@ -213,7 +213,8 @@ export class ProjectItem implements ProjectTreeItem {
         item.description = this.project.description;
         item.tooltip = this.project.tooltip;
         item.resourceUri = project.uri.fsPath.endsWith('.py') ? this.project.uri : undefined;
-        item.iconPath = this.project.iconPath ?? (project.uri.fsPath.endsWith('.py') ? ThemeIcon.File : undefined);
+
+        item.iconPath = this.project.iconPath;
         this.treeItem = item;
     }
 

From 61932134704999abd5f28f5d1ae20ee1ad6a07e3 Mon Sep 17 00:00:00 2001
From: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com>
Date: Fri, 13 Jun 2025 11:08:16 -0700
Subject: [PATCH 2/2] revert file icon edit

---
 src/features/views/treeViewItems.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/features/views/treeViewItems.ts b/src/features/views/treeViewItems.ts
index 363ee06b..403ed647 100644
--- a/src/features/views/treeViewItems.ts
+++ b/src/features/views/treeViewItems.ts
@@ -213,8 +213,7 @@ export class ProjectItem implements ProjectTreeItem {
         item.description = this.project.description;
         item.tooltip = this.project.tooltip;
         item.resourceUri = project.uri.fsPath.endsWith('.py') ? this.project.uri : undefined;
-
-        item.iconPath = this.project.iconPath;
+        item.iconPath = this.project.iconPath ?? (project.uri.fsPath.endsWith('.py') ? ThemeIcon.File : undefined);
         this.treeItem = item;
     }