diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/kotlin/com/replaymod/gradle/remap/PsiPattern.kt | 3 | ||||
| -rw-r--r-- | src/test/kotlin/com/replaymod/gradle/remap/pattern/TestFieldReference.kt | 40 |
2 files changed, 41 insertions, 2 deletions
diff --git a/src/main/kotlin/com/replaymod/gradle/remap/PsiPattern.kt b/src/main/kotlin/com/replaymod/gradle/remap/PsiPattern.kt index c1cdf0f..8573560 100644 --- a/src/main/kotlin/com/replaymod/gradle/remap/PsiPattern.kt +++ b/src/main/kotlin/com/replaymod/gradle/remap/PsiPattern.kt @@ -18,9 +18,8 @@ internal class PsiPattern( val matcher = Matcher(element) if (matcher.match(pattern)) { result.add(matcher) - } else { - super.visitElement(element) } + super.visitElement(element) } }) } diff --git a/src/test/kotlin/com/replaymod/gradle/remap/pattern/TestFieldReference.kt b/src/test/kotlin/com/replaymod/gradle/remap/pattern/TestFieldReference.kt new file mode 100644 index 0000000..a3a6efc --- /dev/null +++ b/src/test/kotlin/com/replaymod/gradle/remap/pattern/TestFieldReference.kt @@ -0,0 +1,40 @@ +package com.replaymod.gradle.remap.pattern + +import com.replaymod.gradle.remap.util.TestData +import io.kotest.matchers.shouldBe +import org.junit.jupiter.api.Test + +class TestFieldReference { + @Test + fun `should match field on left side of assignment when replaced by field`() { + TestData.remap("test/Test.java", """ + class Test { + Test field; + private void test() { + field = field; + this.field = this.field; + this.field.field = this.field.field; + } + } + """.trimIndent(), """ + @remap.Pattern + private test.Test pattern(test.Test obj) { + return obj.field; + } + """.trimIndent(), """ + @remap.Pattern + private test.Test pattern(test.Test obj) { + return obj.matched; + } + """.trimIndent()) shouldBe """ + class Test { + Test field; + private void test() { + field = field; + this.matched = this.matched; + this.matched.matched = this.matched.matched; + } + } + """.trimIndent() + } +}
\ No newline at end of file |