touchups

Author: eleanorjboyd

src/features/creators/creationHelpers.ts

@@ -147,10 +147,10 @@ export async function manageCopilotInstructionsFile(
     const customInstructions = await fs.pathExists(customInstructionsPath);
     if (customInstructions) {
         // Append to the existing file
-        await fs.appendFile(customInstructionsPath, instructionsText.replace('<package_name>', packageName));
+        await fs.appendFile(customInstructionsPath, instructionsText.replace(/<package_name>/g, packageName));
     } else {
         // Create the file if it doesn't exist
-        await fs.writeFile(customInstructionsPath, instructionsText.replace('<package_name>', packageName));
+        await fs.writeFile(customInstructionsPath, instructionsText.replace(/<package_name>/g, packageName));
     }
 }
 

src/features/creators/newPackageProject.ts

@@ -17,7 +17,7 @@ import {
 export class NewPackageProject implements PythonProjectCreator {
     public readonly name = 'newPackage';
     public readonly displayName = 'Package';
-    public readonly description = 'Create a package folder nested in the current workspace.';
+    public readonly description = 'Creates a package folder in your current workspace';
     public readonly tooltip = new MarkdownString('Create a new Python package');
 
     constructor(private readonly envManagers: EnvironmentManagers) {}
@@ -41,6 +41,16 @@ export class NewPackageProject implements PythonProjectCreator {
                         prompt: 'What is the name of the package? (e.g. my_package)',
                         ignoreFocusOut: true,
                         showBackButton: true,
+                        validateInput: (value) => {
+                            // following PyPI (PEP 508) rules for package names
+                            if (!/^([a-z_]|[a-z0-9_][a-z0-9._-]*[a-z0-9_])$/i.test(value)) {
+                                return 'Invalid package name. Use only letters, numbers, underscores, hyphens, or periods. Must start and end with a letter or number.';
+                            }
+                            if (/^[-._0-9]$/i.test(value)) {
+                                return 'Single-character package names cannot be a number, hyphen, or period.';
+                            }
+                            return null;
+                        },
                     });
                 } catch (ex) {
                     if (ex === QuickInputButtons.Back) {

src/features/creators/templates/copilot-instructions-text/package-copilot-instructions.md

@@ -1,10 +1,10 @@
 # Copilot Instructions for <package_name>
 
 -   The package `<package_name>` is a Python Project located in the folder `<package_name>-folder`.
--   You need to call the `Get Python Environment Information` tool on the <package_name> path to get the Python executable details.
--   Substitute the Python executable you get from the `Get Python Environment Information` tool anywhere you see <python> in these instructions.
+-   You need to call the `Get Python Environment Information` tool on the `<package_name>` path to get the Python executable details.
+-   Substitute the Python executable you get from the `Get Python Environment Information` tool anywhere you see `<python>` in these instructions.
     -   Run command for `<package_name>`: `<python> -m <package_name>`
     -   Command to run tests for `<package_name>`: `<python> -m pytest <package_name>/tests`
--   To run an editable install for the package `<package_name>`, use the `Install Python Package` tool with the `<package_name>-folder` path and arguments ['-e', '.'].
+-   To run an editable install for the package `<package_name>`, use the `Install Python Package` tool with the `<package_name>-folder` path and arguments `['-e', '.']`.
 -   In the workspace `launch.json` file, configurations related to this package have the prefix `<package_name>`.
 -   The package `<package_name>` has a defined `pyproject.toml` file that you should use and keep up to date.