From 8b19ad58662186d2295a6241e8c3f84fbfd45809 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Tue, 18 Oct 2022 14:23:39 -0500 Subject: [PATCH] pybricksMicropython: don't allow files with dash Since we are adding user imports, we need to make sure all file names are valid module names, so this means we can't use a dash. --- src/pybricksMicropython/lib.test.ts | 4 ++-- src/pybricksMicropython/lib.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pybricksMicropython/lib.test.ts b/src/pybricksMicropython/lib.test.ts index 139f5135..f480d095 100644 --- a/src/pybricksMicropython/lib.test.ts +++ b/src/pybricksMicropython/lib.test.ts @@ -34,9 +34,9 @@ describe('validateFileName', () => { ); }); - it('should allow file names with dashes', () => { + it('should not allow file names with dashes', () => { expect(validateFileName('file-name', pythonFileExtension, [])).toBe( - FileNameValidationResult.IsOk, + FileNameValidationResult.HasInvalidCharacters, ); }); diff --git a/src/pybricksMicropython/lib.ts b/src/pybricksMicropython/lib.ts index 47a85fbb..1360fb6d 100644 --- a/src/pybricksMicropython/lib.ts +++ b/src/pybricksMicropython/lib.ts @@ -61,7 +61,7 @@ export function validateFileName( return FileNameValidationResult.HasInvalidFirstCharacter; } - if (!fileName.match(/^[a-zA-Z0-9_-]+$/)) { + if (!fileName.match(/^[a-zA-Z0-9_]+$/)) { return FileNameValidationResult.HasInvalidCharacters; }