fix: enforce valid sketch folder name on Save as
#1821
+731
−82
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 |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| import * as remote from '@theia/core/electron-shared/@electron/remote'; | ||
| import { Dialog } from '@theia/core/lib/browser/dialogs'; | ||
| import { nls } from '@theia/core/lib/common/nls'; | ||
| import { Deferred } from '@theia/core/lib/common/promise-util'; | ||
| import { injectable } from '@theia/core/shared/inversify'; | ||
| import { WorkspaceCommands } from '@theia/workspace/lib/browser/workspace-commands'; | ||
| import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl'; | ||
| import { Sketch, SketchContribution, URI } from './contribution'; | ||
| import { SaveAsSketch } from './save-as-sketch'; | ||
|
|
||
| @injectable() | ||
| export class ValidateSketch extends SketchContribution { | ||
| override onReady(): void { | ||
| this.validate(); | ||
| } | ||
|
|
||
| private async validate(): Promise<void> { | ||
| const result = await this.promptFixActions(); | ||
| if (!result) { | ||
| const yes = await this.prompt( | ||
| nls.localize('arduino/validateSketch/abortFixTitle', 'Invalid sketch'), | ||
| nls.localize( | ||
| 'arduino/validateSketch/abortFixMessage', | ||
| "The sketch is still invalid. Do you want to fix the remaining problems? By clicking '{0}', a new sketch will open.", | ||
| Dialog.NO | ||
| ), | ||
| [Dialog.NO, Dialog.YES] | ||
| ); | ||
| if (yes) { | ||
| return this.validate(); | ||
| } | ||
| const sketch = await this.sketchService.createNewSketch(); | ||
| this.workspaceService.open(new URI(sketch.uri), { | ||
| preserveWindow: true, | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns with an array of actions the user has to perform to fix the invalid sketch. | ||
| */ | ||
| private validateSketch(sketch: Sketch): FixAction[] { | ||
| // sketch folder + main sketch file (requires `Save as...` and window reload) | ||
| const sketchFolderName = new URI(sketch.uri).path.base; | ||
| const sketchFolderNameError = | ||
| Sketch.validateSketchFolderName(sketchFolderName); | ||
| if (sketchFolderNameError) { | ||
| return [ | ||
| { | ||
| execute: async () => { | ||
| const unknown = | ||
| (await this.promptRenameSketch(sketch)) && | ||
| (await this.commandService.executeCommand( | ||
| SaveAsSketch.Commands.SAVE_AS_SKETCH.id, | ||
| <SaveAsSketch.Options>{ | ||
| markAsRecentlyOpened: true, | ||
| openAfterMove: true, | ||
| wipeOriginal: true, | ||
| } | ||
| )); | ||
| return !!unknown; | ||
| }, | ||
| }, | ||
| ]; | ||
| } | ||
|
|
||
| // sketch code files (does not require window reload) | ||
| return Sketch.uris(sketch) | ||
| .filter((uri) => uri !== sketch.mainFileUri) | ||
| .map((uri) => new URI(uri)) | ||
| .filter((uri) => Sketch.Extensions.CODE_FILES.includes(uri.path.ext)) | ||
| .map((uri) => ({ | ||
| uri, | ||
| error: Sketch.validateSketchFolderName(uri.path.name), | ||
| })) | ||
| .filter(({ error }) => Boolean(error)) | ||
| .map(({ uri }) => ({ | ||
| execute: async () => { | ||
| const unknown = | ||
| (await this.promptRenameSketchFile(uri)) && | ||
| (await this.commandService.executeCommand( | ||
| WorkspaceCommands.FILE_RENAME.id, | ||
| uri | ||
| )); | ||
| return !!unknown; | ||
| }, | ||
| })); | ||
| } | ||
|
|
||
| private async currentSketch(): Promise<Sketch> { | ||
| const sketch = this.sketchServiceClient.tryGetCurrentSketch(); | ||
| if (CurrentSketch.isValid(sketch)) { | ||
| return sketch; | ||
| } | ||
| const deferred = new Deferred<Sketch>(); | ||
| const disposable = this.sketchServiceClient.onCurrentSketchDidChange( | ||
| (sketch) => { | ||
| if (CurrentSketch.isValid(sketch)) { | ||
| disposable.dispose(); | ||
| deferred.resolve(sketch); | ||
| } | ||
| } | ||
| ); | ||
| return deferred.promise; | ||
| } | ||
|
|
||
| private async promptFixActions(): Promise<boolean> { | ||
| const sketch = await this.currentSketch(); | ||
| const fixActions = this.validateSketch(sketch); | ||
| for (const fixAction of fixActions) { | ||
| const result = await fixAction.execute(); | ||
| if (!result) { | ||
| return false; | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| private async promptRenameSketch(sketch: Sketch): Promise<boolean> { | ||
| return this.prompt( | ||
| nls.localize( | ||
| 'arduino/validateSketch/renameSketchFolderTitle', | ||
| 'Invalid sketch name' | ||
| ), | ||
| nls.localize( | ||
| 'arduino/validateSketch/renameSketchFolderMessage', | ||
| "The sketch '{0}' cannot be used. Sketch names must start with a letter or number, followed by letters, numbers, dashes, dots and underscores. Maximum length is 63 characters. To get rid of this message, rename the sketch. Do you want to rename the sketch now?", | ||
| sketch.name | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| private async promptRenameSketchFile(uri: URI): Promise<boolean> { | ||
| return this.prompt( | ||
| nls.localize( | ||
| 'arduino/validateSketch/renameSketchFileTitle', | ||
| 'Invalid sketch filename' | ||
| ), | ||
| nls.localize( | ||
| 'arduino/validateSketch/renameSketchFileMessage', | ||
| "The sketch file '{0}' cannot be used. Sketch filenames must start with a letter or number, followed by letters, numbers, dashes, dots and underscores. Maximum length is 63 characters without the file extension. To get rid of this message, rename the sketch file. Do you want to rename the sketch file now?", | ||
| uri.path.base | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| private async prompt( | ||
| title: string, | ||
| message: string, | ||
| buttons: string[] = [Dialog.CANCEL, Dialog.OK] | ||
| ): Promise<boolean> { | ||
| const { response } = await remote.dialog.showMessageBox( | ||
| remote.getCurrentWindow(), | ||
| { | ||
| title, | ||
| message, | ||
| type: 'warning', | ||
| buttons, | ||
| } | ||
| ); | ||
| // cancel | ||
| if (response === 0) { | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| interface FixAction { | ||
| execute(): Promise<boolean>; | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,215 @@ | ||
| import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom'; | ||
| const disableJSDOM = enableJSDOM(); | ||
|
|
||
| import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider'; | ||
| FrontendApplicationConfigProvider.set({}); | ||
|
|
||
| import { | ||
| FrontendApplication, | ||
| LabelProvider, | ||
| OpenerService, | ||
| } from '@theia/core/lib/browser'; | ||
| import { ClipboardService } from '@theia/core/lib/browser/clipboard-service'; | ||
| import { ApplicationServer } from '@theia/core/lib/common/application-protocol'; | ||
| import { CommandService } from '@theia/core/lib/common/command'; | ||
| import { MessageService } from '@theia/core/lib/common/message-service'; | ||
| import { nls } from '@theia/core/lib/common/nls'; | ||
| import { OS } from '@theia/core/lib/common/os'; | ||
| import { SelectionService } from '@theia/core/lib/common/selection-service'; | ||
| import URI from '@theia/core/lib/common/uri'; | ||
| import { Container } from '@theia/core/shared/inversify'; | ||
| import { FileDialogService } from '@theia/filesystem/lib/browser'; | ||
| import { FileService } from '@theia/filesystem/lib/browser/file-service'; | ||
| import { FileStat } from '@theia/filesystem/lib/common/files'; | ||
| import { WorkspaceCompareHandler } from '@theia/workspace/lib/browser/workspace-compare-handler'; | ||
| import { WorkspaceDeleteHandler } from '@theia/workspace/lib/browser/workspace-delete-handler'; | ||
| import { WorkspaceDuplicateHandler } from '@theia/workspace/lib/browser/workspace-duplicate-handler'; | ||
| import { WorkspacePreferences } from '@theia/workspace/lib/browser/workspace-preferences'; | ||
| import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service'; | ||
| import { expect } from 'chai'; | ||
| import { | ||
| invalidExtension as invalidExtensionMessage, | ||
| parseFileInput, | ||
| WorkspaceCommandContribution, | ||
| } from '../../browser/theia/workspace/workspace-commands'; | ||
| import { Sketch, SketchesService } from '../../common/protocol'; | ||
| import { SketchesServiceClientImpl } from '../../common/protocol/sketches-service-client-impl'; | ||
|
|
||
| disableJSDOM(); | ||
|
|
||
| describe('workspace-commands', () => { | ||
| describe('parseFileInput', () => { | ||
| it("should parse input without extension as '.ino'", () => { | ||
| const actual = parseFileInput('foo'); | ||
| expect(actual).to.be.deep.equal({ | ||
| raw: 'foo', | ||
| name: 'foo', | ||
| extension: '.ino', | ||
| }); | ||
| }); | ||
| it("should parse input with a trailing dot as '.ino'", () => { | ||
| const actual = parseFileInput('foo.'); | ||
| expect(actual).to.be.deep.equal({ | ||
| raw: 'foo.', | ||
| name: 'foo', | ||
| extension: '.ino', | ||
| }); | ||
| }); | ||
| it('should parse input with a valid extension', () => { | ||
| const actual = parseFileInput('lib.cpp'); | ||
| expect(actual).to.be.deep.equal({ | ||
| raw: 'lib.cpp', | ||
| name: 'lib', | ||
| extension: '.cpp', | ||
| }); | ||
| }); | ||
| it('should calculate the file extension based on the last dot index', () => { | ||
| const actual = parseFileInput('lib.ino.x'); | ||
| expect(actual).to.be.deep.equal({ | ||
| raw: 'lib.ino.x', | ||
| name: 'lib.ino', | ||
| extension: '.x', | ||
| }); | ||
| }); | ||
| it('should ignore trailing spaces after the last dot', () => { | ||
| const actual = parseFileInput(' foo. '); | ||
| expect(actual).to.be.deep.equal({ | ||
| raw: ' foo. ', | ||
| name: ' foo', | ||
| extension: '.ino', | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| describe('validateFileName', () => { | ||
| const child: FileStat = { | ||
| isFile: true, | ||
| isDirectory: false, | ||
| isSymbolicLink: false, | ||
| resource: new URI('sketch/sketch.ino'), | ||
| name: 'sketch.ino', | ||
| }; | ||
| const parent: FileStat = { | ||
| isFile: false, | ||
| isDirectory: true, | ||
| isSymbolicLink: false, | ||
| resource: new URI('sketch'), | ||
| name: 'sketch', | ||
| children: [child], | ||
| }; | ||
|
|
||
| let workspaceCommands: WorkspaceCommandContribution; | ||
| const trimmedName = (name: string) => | ||
| workspaceCommands['trimFileName'](name); | ||
|
|
||
| async function testMe(userInput: string): Promise<string> { | ||
| return workspaceCommands['validateFileName'](userInput, parent); | ||
| } | ||
|
|
||
| function createContainer(): Container { | ||
| const container = new Container(); | ||
| container.bind(FileDialogService).toConstantValue(<FileDialogService>{}); | ||
| container.bind(FileService).toConstantValue(<FileService>{ | ||
| async exists(resource: URI): Promise<boolean> { | ||
| return ( | ||
| resource.path.base.includes('_sketch') || | ||
| resource.path.base.includes('sketch') | ||
| ); | ||
| }, | ||
| }); | ||
| container | ||
| .bind(FrontendApplication) | ||
| .toConstantValue(<FrontendApplication>{}); | ||
| container.bind(LabelProvider).toConstantValue(<LabelProvider>{}); | ||
| container.bind(MessageService).toConstantValue(<MessageService>{}); | ||
| container.bind(OpenerService).toConstantValue(<OpenerService>{}); | ||
| container.bind(SelectionService).toConstantValue(<SelectionService>{}); | ||
| container.bind(WorkspaceCommandContribution).toSelf().inSingletonScope(); | ||
| container | ||
| .bind(WorkspaceCompareHandler) | ||
| .toConstantValue(<WorkspaceCompareHandler>{}); | ||
| container | ||
| .bind(WorkspaceDeleteHandler) | ||
| .toConstantValue(<WorkspaceDeleteHandler>{}); | ||
| container | ||
| .bind(WorkspaceDuplicateHandler) | ||
| .toConstantValue(<WorkspaceDuplicateHandler>{}); | ||
| container | ||
| .bind(WorkspacePreferences) | ||
| .toConstantValue(<WorkspacePreferences>{}); | ||
| container.bind(WorkspaceService).toConstantValue(<WorkspaceService>{}); | ||
| container.bind(ClipboardService).toConstantValue(<ClipboardService>{}); | ||
| container.bind(ApplicationServer).toConstantValue(<ApplicationServer>{ | ||
| async getBackendOS(): Promise<OS.Type> { | ||
| return OS.type(); | ||
| }, | ||
| }); | ||
| container.bind(CommandService).toConstantValue(<CommandService>{}); | ||
| container.bind(SketchesService).toConstantValue(<SketchesService>{}); | ||
| container | ||
| .bind(SketchesServiceClientImpl) | ||
| .toConstantValue(<SketchesServiceClientImpl>{}); | ||
| return container; | ||
| } | ||
|
|
||
| beforeEach(() => { | ||
| workspaceCommands = createContainer().get<WorkspaceCommandContribution>( | ||
| WorkspaceCommandContribution | ||
| ); | ||
| }); | ||
|
|
||
| it("should validate input string without an extension as an '.ino' file", async () => { | ||
| const actual = await testMe('valid'); | ||
| expect(actual).to.be.empty; | ||
| }); | ||
|
|
||
| it('code files cannot start with number (no extension)', async () => { | ||
| const actual = await testMe('_invalid'); | ||
| expect(actual).to.be.equal(Sketch.invalidSketchFolderNameMessage); | ||
| }); | ||
|
|
||
| it('code files cannot start with number (trailing dot)', async () => { | ||
| const actual = await testMe('_invalid.'); | ||
| expect(actual).to.be.equal(Sketch.invalidSketchFolderNameMessage); | ||
| }); | ||
|
|
||
| it('code files cannot start with number (trailing dot)', async () => { | ||
| const actual = await testMe('_invalid.cpp'); | ||
| expect(actual).to.be.equal(Sketch.invalidSketchFolderNameMessage); | ||
| }); | ||
|
|
||
| it('should warn about invalid extension first', async () => { | ||
| const actual = await testMe('_invalid.xxx'); | ||
| expect(actual).to.be.equal(invalidExtensionMessage('.xxx')); | ||
| }); | ||
|
|
||
| it('should not warn about invalid file extension for empty input', async () => { | ||
| const actual = await testMe(''); | ||
| expect(actual).to.be.equal(Sketch.invalidSketchFolderNameMessage); | ||
| }); | ||
|
|
||
| it('should ignore non-code filename validation from the spec', async () => { | ||
| const actual = await testMe('_invalid.json'); | ||
| expect(actual).to.be.empty; | ||
| }); | ||
|
|
||
| it('non-code files should be validated against default new file validation rules', async () => { | ||
| const name = ' invalid.json'; | ||
| const actual = await testMe(name); | ||
| const expected = nls.localizeByDefault( | ||
| 'Leading or trailing whitespace detected in file or folder name.' | ||
| ); | ||
| expect(actual).to.be.equal(expected); | ||
| }); | ||
|
|
||
| it('should warn about existing resource', async () => { | ||
| const name = 'sketch.ino'; | ||
| const actual = await testMe(name); | ||
| const expected = nls.localizeByDefault( | ||
| 'A file or folder **{0}** already exists at this location. Please choose a different name.', | ||
| trimmedName(name) | ||
| ); | ||
| expect(actual).to.be.equal(expected); | ||
| }); | ||
| }); | ||
| }); |
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 |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| import { expect } from 'chai'; | ||
| import { Sketch } from '../../common/protocol'; | ||
|
|
||
| describe('sketch', () => { | ||
| describe('validateSketchFolderName', () => { | ||
| ( | ||
| [ | ||
| ['sketch', true], | ||
| ['can-contain-slash-and-dot.ino', true], | ||
| ['regex++', false], | ||
| ['dots...', true], | ||
| ['No Spaces', false], | ||
| ['_invalidToStartWithUnderscore', false], | ||
| ['Invalid+Char.ino', false], | ||
| ['', false], | ||
| ['/', false], | ||
| ['//trash/', false], | ||
| [ | ||
| '63Length_012345678901234567890123456789012345678901234567890123', | ||
| true, | ||
| ], | ||
| [ | ||
| 'TooLong__0123456789012345678901234567890123456789012345678901234', | ||
| false, | ||
| ], | ||
| ] as [string, boolean][] | ||
| ).map(([input, expected]) => { | ||
| it(`'${input}' should ${ | ||
| !expected ? 'not ' : '' | ||
| }be a valid sketch folder name`, () => { | ||
| const actual = Sketch.validateSketchFolderName(input); | ||
| if (expected) { | ||
| expect(actual).to.be.undefined; | ||
| } else { | ||
| expect(actual).to.be.not.undefined; | ||
| expect(actual?.length).to.be.greaterThan(0); | ||
| } | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| describe('validateCloudSketchFolderName', () => { | ||
| ( | ||
| [ | ||
| ['sketch', true], | ||
| ['no-dashes', false], | ||
| ['no-dots', false], | ||
| ['No Spaces', false], | ||
| ['_canStartWithUnderscore', true], | ||
| ['Invalid+Char.ino', false], | ||
| ['', false], | ||
| ['/', false], | ||
| ['//trash/', false], | ||
| ['36Length_012345678901234567890123456', true], | ||
| ['TooLong__0123456789012345678901234567', false], | ||
| ] as [string, boolean][] | ||
| ).map(([input, expected]) => { | ||
| it(`'${input}' should ${ | ||
| !expected ? 'not ' : '' | ||
| }be a valid cloud sketch folder name`, () => { | ||
| const actual = Sketch.validateCloudSketchFolderName(input); | ||
| if (expected) { | ||
| expect(actual).to.be.undefined; | ||
| } else { | ||
| expect(actual).to.be.not.undefined; | ||
| expect(actual?.length).to.be.greaterThan(0); | ||
| } | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| describe('toValidCloudSketchFolderName', () => { | ||
| ( | ||
| [ | ||
| ['sketch', 'sketch'], | ||
| ['can-contain-slash-and-dot.ino', 'can_contain_slash_and_dot_ino'], | ||
| ['regex++'], | ||
| ['dots...', 'dots___'], | ||
| ['No Spaces'], | ||
| ['_invalidToStartWithUnderscore'], | ||
| ['Invalid+Char.ino'], | ||
| [''], | ||
| ['/'], | ||
| ['//trash/'], | ||
| [ | ||
| '63Length_012345678901234567890123456789012345678901234567890123', | ||
| '63Length_012345678901234567890123456', | ||
| ], | ||
| ['TooLong__0123456789012345678901234567890123456789012345678901234'], | ||
| ] as [string, string?][] | ||
| ).map(([input, expected]) => { | ||
| it(`'${input}' should ${expected ? '' : 'not '}map the ${ | ||
| !expected ? 'invalid ' : '' | ||
| }sketch folder name to a valid cloud sketch folder name${ | ||
| expected ? `: '${expected}'` : '' | ||
| }`, () => { | ||
| if (!expected) { | ||
| try { | ||
| Sketch.toValidCloudSketchFolderName(input); | ||
| throw new Error( | ||
| `Expected an error when mapping ${input} to a valid sketch folder name.` | ||
| ); | ||
| } catch (err) { | ||
| if (err instanceof Error) { | ||
| expect(err.message).to.be.equal( | ||
| Sketch.invalidSketchFolderNameMessage | ||
| ); | ||
| } else { | ||
| throw err; | ||
| } | ||
| } | ||
| } else { | ||
| const actual = Sketch.toValidCloudSketchFolderName(input); | ||
| expect(actual).to.be.equal(expected); | ||
| } | ||
| }); | ||
| }); | ||
| }); | ||
| }); |
Empty file.
Empty file.
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 |
|---|---|---|
| @@ -162,6 +162,10 @@ const testSketchbookContainerTemplate: SketchContainer = { | ||
| name: 'bar++', | ||
| uri: 'template://bar%2B%2B', | ||
| }, | ||
| { | ||
| name: 'bar++ 2', | ||
| uri: 'template://bar%2B%2B%202', | ||
| }, | ||
| { | ||
| name: 'a_sketch', | ||
| uri: 'template://a_sketch', | ||
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 |
|---|---|---|
| @@ -311,7 +311,6 @@ | ||
| "unableToConnectToWebSocket": "Unable to connect to websocket" | ||
| }, | ||
| "newCloudSketch": { | ||
| "newSketchTitle": "Name of a new Remote Sketch", | ||
| "notFound": "Could not pull the remote sketch '{0}'. It does not exist.", | ||
| "sketchAlreadyExists": "Remote sketch '{0}' already exists." | ||
| @@ -405,7 +404,11 @@ | ||
| "createdArchive": "Created archive '{0}'.", | ||
| "doneCompiling": "Done compiling.", | ||
| "doneUploading": "Done uploading.", | ||
| "editInvalidSketchFolderName": "Do you want to try to save the sketch folder with a different name?", | ||
| "exportBinary": "Export Compiled Binary", | ||
| "invalidCloudSketchName": "The name must consist of basic letters, numbers, or underscores. The maximum length is 36 characters.", | ||
| "invalidSketchFolderNameTitle": "Invalid sketch folder name: '{0}'", | ||
| "invalidSketchName": "Sketch names must start with a letter or number, followed by letters, numbers, dashes, dots and underscores. Maximum length is 63 characters.", | ||
| "moving": "Moving", | ||
| "movingMsg": "The file \"{0}\" needs to be inside a sketch folder named \"{1}\".\nCreate this folder, move the file, and continue?", | ||
| "new": "New Sketch", | ||
| @@ -448,6 +451,14 @@ | ||
| "cancel": "Cancel", | ||
| "enterField": "Enter {0}", | ||
| "upload": "Upload" | ||
| }, | ||
| "validateSketch": { | ||
| "abortFixMessage": "The sketch is still invalid. Do you want to fix the remaining problems? By clicking '{0}', a new sketch will open.", | ||
| "abortFixTitle": "Invalid sketch", | ||
| "renameSketchFileMessage": "The sketch file '{0}' cannot be used. Sketch filenames must start with a letter or number, followed by letters, numbers, dashes, dots and underscores. Maximum length is 63 characters without the file extension. To get rid of this message, rename the sketch file. Do you want to rename the sketch file now?", | ||
| "renameSketchFileTitle": "Invalid sketch filename", | ||
| "renameSketchFolderMessage": "The sketch '{0}' cannot be used. Sketch names must start with a letter or number, followed by letters, numbers, dashes, dots and underscores. Maximum length is 63 characters. To get rid of this message, rename the sketch. Do you want to rename the sketch now?", | ||
| "renameSketchFolderTitle": "Invalid sketch name" | ||
| } | ||
| }, | ||
| "theia": { | ||
| @@ -470,7 +481,6 @@ | ||
| "deleteCurrentSketch": "Do you want to delete the current sketch?", | ||
| "fileNewName": "Name for new file", | ||
| "invalidExtension": ".{0} is not a valid extension", | ||
| "newFileName": "New name for file" | ||
| } | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
We need to get a confirmation that it really is necessary to disallow the
-and.characters in Cloud sketches. That seems a completely unnecessary departure from the Arduino Sketch Specification to me.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.
I started an internal dialog.