Handle Java keywords for applicatoinIds #676
Merged
Conversation
This file contains 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
- Check for Java keywords when testing. - Add _ before a keyword when generating. See #672 for details
PEConn
approved these changes
Apr 25, 2022
| @@ -34,6 +34,17 @@ const extractZipPromise = promisify(extractZip); | |||
| const DISALLOWED_ANDROID_PACKAGE_CHARS_REGEX = /[^a-zA-Z0-9_\.]/g; | |||
| const VALID_PACKAGE_ID_SEGMENT_REGEX = /^[a-zA-Z][A-Za-z0-9_]*$/; | |||
|
|
|||
| // List of keywords for Java 11, as listed at | |||
| // https://docs.oracle.com/javase/specs/jls/se11/html/jls-3.html#jls-3.9. | |||
| const JAVA_KEYWORDS = [ | |||
There was a problem hiding this comment.
Sorry, but do you mind sorting these?
There was a problem hiding this comment.
LOL. I actually thought they were sorted, because I copied from the docs... but the docs use column-first sorting and this is using row first... I'll go change that.
packages/core/src/lib/util.ts
Outdated
|
|
||
| // Package names cannot contain Java keywords. The recommendation is adding an '_' before the | ||
| // keyword. See https://docs.oracle.com/javase/tutorial/java/package/namingpkgs.html. | ||
| if (JAVA_KEYWORDS.indexOf(part) >= 0) { |
There was a problem hiding this comment.
Can't we just use JAVA_KEYWORDS.includes(part)?
There was a problem hiding this comment.
Oh, silly me... I remembered there was a handy method in JS Array, but couldn't remember the name. I checked the docs, but couldn't find what I was looking for (I think I was looking for something like contains), and missed includes... I'll change that.
packages/core/src/lib/util.ts
Outdated
| @@ -195,6 +214,13 @@ export function validatePackageId(input: string): string | null { | |||
| } | |||
|
|
|||
| for (const part of parts) { | |||
| // Package names cannot contain Java keywords. The recommendation is adding an '_' before the | |||
| // keyword. See https://docs.oracle.com/javase/tutorial/java/package/namingpkgs.html. | |||
| if (JAVA_KEYWORDS.indexOf(part) >= 0) { | |||
- Sorts list of Java keywords. - Replaces indexOf with includes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
See #672 for details