-
Notifications
You must be signed in to change notification settings - Fork 92
Tune/adjust static analysis recipes to work properly on Kotlin file. #136
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
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
95 changes: 95 additions & 0 deletions
95
src/test/java/org/openrewrite/staticanalysis/kotlin/NeedBracesTest.java
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,95 @@ | ||
| /* | ||
| * Copyright 2023 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.staticanalysis.kotlin; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.junitpioneer.jupiter.ExpectedToFail; | ||
| import org.openrewrite.staticanalysis.NeedBraces; | ||
| import org.openrewrite.test.RecipeSpec; | ||
| import org.openrewrite.test.RewriteTest; | ||
|
|
||
| import static org.openrewrite.kotlin.Assertions.kotlin; | ||
|
|
||
| class NeedBracesTest implements RewriteTest { | ||
|
|
||
| @Override | ||
| public void defaults(RecipeSpec spec) { | ||
| spec.recipe(new NeedBraces()); | ||
| } | ||
|
|
||
| @ExpectedToFail("Kotlin version visitor to be implemented") | ||
| @Test | ||
| void addBracesForIfBranch() { | ||
| rewriteRun( | ||
| kotlin( | ||
| """ | ||
| fun getSymbol(num : Int) : String { | ||
| if (num > 0) return "+" | ||
|
|
||
| return "-" | ||
| } | ||
| """, | ||
| """ | ||
| fun getSymbol(num : Int) : String { | ||
| if (num > 0) { | ||
| return "+" | ||
| } | ||
|
|
||
| return "-" | ||
| } | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @ExpectedToFail("Kotlin version visitor to be implemented") | ||
| @Test | ||
| void addBracesForElseBranch() { | ||
| rewriteRun( | ||
| kotlin( | ||
| """ | ||
| fun getSymbol(num : Int) : String { | ||
| return if (num > 0) | ||
| "+" | ||
| else "-" | ||
| } | ||
| """, | ||
| """ | ||
| fun getSymbol(num : Int) : String { | ||
| return if (num > 0) { | ||
| "+" | ||
| } else { | ||
| "-" | ||
| } | ||
| } | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| void doNotChangeForArguments() { | ||
| rewriteRun( | ||
| kotlin( | ||
| """ | ||
| fun run(foo: String, bar: String) {} | ||
| var x = run( if (true) "" else "", | ||
| if (true) "" else "") | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
| } |
99 changes: 99 additions & 0 deletions
99
...test/java/org/openrewrite/staticanalysis/kotlin/ReplaceLambdaWithMethodReferenceTest.java
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,99 @@ | ||
| /* | ||
| * Copyright 2023 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.staticanalysis.kotlin; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.junitpioneer.jupiter.ExpectedToFail; | ||
| import org.openrewrite.staticanalysis.ReplaceLambdaWithMethodReference; | ||
| import org.openrewrite.test.RecipeSpec; | ||
| import org.openrewrite.test.RewriteTest; | ||
|
|
||
|
|
||
| import static org.openrewrite.kotlin.Assertions.kotlin; | ||
|
|
||
| class ReplaceLambdaWithMethodReferenceTest implements RewriteTest { | ||
| @Override | ||
| public void defaults(RecipeSpec spec) { | ||
| spec.recipe(new ReplaceLambdaWithMethodReference()); | ||
| } | ||
|
|
||
| @ExpectedToFail("Kotlin visitor to be implemented") | ||
| @Test | ||
| void toQualifiedMethodReference() { | ||
| rewriteRun( | ||
| kotlin( | ||
| """ | ||
| interface Pet { | ||
| fun move() { | ||
| } | ||
| } | ||
|
|
||
| class Cat : Pet { | ||
| override fun move() { | ||
| println("Cat is moving") | ||
| } | ||
| } | ||
|
|
||
| class Dog : Pet { | ||
| override fun move() { | ||
| println("Dog is moving") | ||
| } | ||
| } | ||
| """ | ||
| ), | ||
| kotlin( | ||
| """ | ||
| fun main() { | ||
| val pets = listOf(Cat(), Dog()) | ||
| pets.forEach { it.move() } | ||
| } | ||
| """, | ||
| """ | ||
| fun main() { | ||
| val pets = listOf(Cat(), Dog()) | ||
| pets.forEach ( Pet::move ) | ||
| } | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @ExpectedToFail("Kotlin visitor to be implemented") | ||
| @Test | ||
| void toUnqualifiedMethodReference() { | ||
| rewriteRun( | ||
| kotlin( | ||
| """ | ||
| fun isEven(number: Int): Boolean { | ||
| return number % 2 == 0 | ||
| } | ||
| """ | ||
| ), | ||
| kotlin( | ||
| """ | ||
| val numbers = listOf(1, 2, 3, 4, 5) | ||
| val evenNumbers = numbers.filter{isEven(it)} | ||
| """ | ||
| , | ||
| """ | ||
| val numbers = listOf(1, 2, 3, 4, 5) | ||
| val evenNumbers = numbers.filter(::isEven) | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| } |
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.
What's the plan here? Should this be logged as an issue for improvement @kunli2 ?
Or is it mostly to prevent exceptions and not make any changes just yet?
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.
created #138 for tracking.