-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add CSharp implementation of proposed NamingService
#25
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
06c492c
Add CSharp implementation that is also returned when a NamingService …
Laurens-W 1c2cbce
Apply regex to check if name isn't pascal case already
Laurens-W 17af876
FMT
Laurens-W 29b6ea8
FMT pt2
Laurens-W d5a72b2
Add test and improvement that was also made to JavaNamingService
Laurens-W dfa1bac
Touching up
Laurens-W File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
66 changes: 66 additions & 0 deletions
66
rewrite-csharp/src/main/java/org/openrewrite/csharp/service/CSharpNamingService.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * Copyright 2024 the original author or authors. | ||
| * <p> | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * <p> | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.openrewrite.csharp.service; | ||
|
|
||
| import org.openrewrite.internal.NameCaseConvention; | ||
| import org.openrewrite.internal.NamingService; | ||
|
|
||
| import java.util.regex.Pattern; | ||
|
|
||
| public class CSharpNamingService implements NamingService { | ||
|
|
||
| private static final Pattern STANDARD_METHOD_NAME = Pattern.compile("^[A-Z][a-zA-Z0-9]*$"); | ||
| private static final Pattern SNAKE_CASE = Pattern.compile("^[a-zA-Z0-9]+_\\w+$"); | ||
|
|
||
| @Override | ||
| public String standardizeMethodName(String oldMethodName) { | ||
| if (!STANDARD_METHOD_NAME.matcher(oldMethodName).matches()) { | ||
| StringBuilder result = new StringBuilder(); | ||
| if (SNAKE_CASE.matcher(oldMethodName).matches()) { | ||
| result.append(NameCaseConvention.format(NameCaseConvention.UPPER_CAMEL, oldMethodName)); | ||
| } else { | ||
| int nameLength = oldMethodName.length(); | ||
| for (int i = 0; i < nameLength; i++) { | ||
| char c = oldMethodName.charAt(i); | ||
| if (i == 0) { | ||
| // the java specification requires identifiers to start with [a-zA-Z$_] | ||
| if (c != '$' && c != '_') { | ||
| result.append(Character.toUpperCase(c)); | ||
| } | ||
| } else { | ||
| if (!Character.isLetterOrDigit(c)) { | ||
| while ((!Character.isLetterOrDigit(c) || c > 'z')) { | ||
| i++; | ||
| if (i < nameLength) { | ||
| c = oldMethodName.charAt(i); | ||
| } else { | ||
| break; | ||
| } | ||
| } | ||
| if (i < nameLength) { | ||
| result.append(Character.toUpperCase(c)); | ||
| } | ||
| } else { | ||
| result.append(c); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return result.toString(); | ||
| } | ||
| return oldMethodName; | ||
| } | ||
| } | ||
21 changes: 21 additions & 0 deletions
21
rewrite-csharp/src/main/java/org/openrewrite/csharp/service/package-info.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| /* | ||
| * Copyright 2024 the original author or authors. | ||
| * <p> | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * <p> | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| @NullMarked | ||
| @NonNullFields | ||
| package org.openrewrite.csharp.service; | ||
|
|
||
| import org.jspecify.annotations.NullMarked; | ||
| import org.openrewrite.internal.lang.NonNullFields; |
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
Oops, something went wrong.
Oops, something went wrong.
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.
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 made some changes in openrewrite/rewrite#4725 ; might be best to similarly test here that we use C# expected naming from a few valid but odd inputs in a unit test.