diff options
| author | Jonas Herzig <jonas@spark-squared.com> | 2021-11-11 16:52:27 +0100 |
|---|---|---|
| committer | Jonas Herzig <jonas@spark-squared.com> | 2021-11-11 21:38:47 +0100 |
| commit | 982982c63027e416bd78ca40708c7238e7eed26b (patch) | |
| tree | 509517275b8664157f0cfc58e20675527fcc9ce8 /src/test/resources/mappings.srg | |
| parent | b4462eb6030f8e5a072ad4b6508d7a93d574522f (diff) | |
| download | Remap-982982c63027e416bd78ca40708c7238e7eed26b.tar.gz Remap-982982c63027e416bd78ca40708c7238e7eed26b.tar.bz2 Remap-982982c63027e416bd78ca40708c7238e7eed26b.zip | |
Fix remapping of qualified inner class reference in Kotlin code
When we used to remap `a.pkg.A.Inner` we would apply both mappings (the one for
the inner class and the one for the outer class) at the same time, resulting in
`b.pkg.B.Inner.Inner`.
The direct cause being that we only checked conflicts for the range of the
respective expression (which is just `A` and `Inner` for Kotlin, and therefore
not conflicting) instead of the parent as we should have.
With that fixed, it now also becomes apparent that we need to apply mappings for
dot qualified expressions back to front (otherwise the outer class takes
priority), so that is the second thing this commit change.
Diffstat (limited to 'src/test/resources/mappings.srg')
| -rw-r--r-- | src/test/resources/mappings.srg | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/resources/mappings.srg b/src/test/resources/mappings.srg index 4213107..91f6822 100644 --- a/src/test/resources/mappings.srg +++ b/src/test/resources/mappings.srg @@ -9,6 +9,8 @@ MD: a/pkg/A/commonOverloaded (La/pkg/A;)V b/pkg/B/commonOverloaded (La/pkg/B;)V CL: a/pkg/A$1 b/pkg/B$1 CL: a/pkg/A$Inner b/pkg/B$Inner FD: a/pkg/A$Inner/aField b/pkg/B$Inner/bField +CL: a/pkg/A$InnerA b/pkg/B$InnerB +CL: a/pkg/A$GenericA b/pkg/B$GenericB CL: a/pkg/AParent b/pkg/BParent CL: a/pkg/AInterface b/pkg/BInterface MD: a/pkg/AInterface/aInterfaceMethod ()V b/pkg/BInterface/bInterfaceMethod ()V |