[Java.Interop.Tools.JavaCallableWrappers] Fix IsValidIdentifier() #610
Conversation
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
jpobst
reviewed
Mar 20, 2020
|
|
||
| private const string Identifier = IdentifierStartCharacter + "(" + IdentifierPartCharacter + ")"; | ||
|
|
||
| static Regex IsValidIdentifierRegex = new Regex ($"^[{IdentifierStartCharacter}][{IdentifierPartCharacter}]*$"); |
Contributor
There was a problem hiding this comment.
Presumably this will be called a bunch, probably worth adding RegexOptions.Compiled?
jonpryor
force-pushed
the
jonp-fix-identifier-check
branch
from
dfba529 to
bb7f276
Compare
Context: dotnet/android#4431 Commit e7c5f54 added `IdentifierValidator.IsValidIdentifier()`, replacing use of `CSharpCodeProvider.IsValidIdentifier()`, and this change caused a unit test failure within xamarin-android: // Xamarin.Android.Build.Tests.BuildTest.GeneratorValidateEventName obj/Debug/generated/src/Com.Xamarin.Testing.Test.cs(350,29,350,32): error CS1001: Identifier expected The line in question? public event EventHandler 123 { Oops. It Turns Out™ that `IdentifierValidator.IsValidIdentifier("123")` returned True, so we attempted to create an event named `123`, which the C# compiler Does Not Like. Fix `IdentifierValidator.IsValidIdentifier()` by using a new `IsValidIdentifierRegex` regex to match against identifiers, instead of attempting to reuse the `validIdentifier` regex, which matches for *invalid* characters (it negates the match via `[^...]`), and thus cannot differentiate between "starting" characters and everything else, which is fine for `IdentifierValidator.CreateValidIdentifier()`, but not for `IdentifierValidator.IsValidIdentifier()`. Add unit tests for `IdentifierValidator.IsValidIdentifier()`. Update `make run-test-generator-core` tests so that we add a `View.setOn123Listener()` method, which prior to this commit would add a `View.123` event: partial class View { public event EventHandler 123 { add { … } remove { … } } } With a corrected `IdentifierValidator.IsValidIdentifier()`, this event is no longer generated.
jonpryor
force-pushed
the
jonp-fix-identifier-check
branch
from
bb7f276 to
a584de1
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
Context: dotnet/android#4431
Commit e7c5f54 added
IdentifierValidator.IsValidIdentifier(),replacing use of
CSharpCodeProvider.IsValidIdentifier(), and thischange caused a unit test failure within xamarin-android:
The line in question?
Oops.
It Turns Out™ that
IdentifierValidator.IsValidIdentifier("123")returned True, so we attempted to create an event named
123, whichthe C# compiler Does Not Like.
Fix
IdentifierValidator.IsValidIdentifier()by using a newIsValidIdentifierRegexregex to match against identifiers, insteadof attempting to reuse the
validIdentifierregex, which matches forinvalid characters (it negates the match via
[^...]), and thuscannot differentiate between "starting" characters and everything
else, which is fine for
CreateValidIdentifier(), but not forIsValidIdentifier().Add unit tests for
IsValidIdentifier().