Merge branch 'hotfix-0.5.8'

CadixDev · Oct 23, 2021 · 014802b · 014802b
2 parents edb2b65 + 3628c91
commit 014802b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,7 @@ val isSnapshot = version.toString().endsWith("-SNAPSHOT")
 
 allprojects {
     group = "org.cadixdev"
-    version = "0.5.7"
+    version = "0.5.8"
 }
 
 subprojects {

diff --git a/changelogs/0.5.8.md b/changelogs/0.5.8.md
@@ -0,0 +1,9 @@
+Lorenz 0.5.8
+===
+
+## Fixes
+
+- [GH-53]\: Don't de-obfuscate field types twice, which can cause
+  invalid output in some conditions.
+
+[GH-53]: https://github.com/CadixDev/Lorenz/issues/53
diff --git a/lorenz/src/main/java/org/cadixdev/lorenz/MappingSet.java b/lorenz/src/main/java/org/cadixdev/lorenz/MappingSet.java
@@ -244,7 +244,7 @@ default MappingSet removeFieldTypeProvider(final FieldTypeProvider fieldTypeProv
      */
     default Type deobfuscate(final Type type) {
         if (type instanceof FieldType) {
-            return this.deobfuscate(this.deobfuscate((FieldType) type));
+            return this.deobfuscate((FieldType) type);
         }
         return type;
     }

diff --git a/lorenz/src/main/java/org/cadixdev/lorenz/io/TextMappingFormat.java b/lorenz/src/main/java/org/cadixdev/lorenz/io/TextMappingFormat.java
@@ -37,7 +37,7 @@
 import java.nio.file.Path;
 
 /**
- * A representation of a de-obfuscation mapping format serialized as text.
+ * A representation of a de-obfuscation mapping format serialised as text.
  *
  * @author Minecrell
  * @since 0.4.0

diff --git a/lorenz/src/test/java/org/cadixdev/lorenz/test/MappingSetTest.java b/lorenz/src/test/java/org/cadixdev/lorenz/test/MappingSetTest.java
@@ -161,6 +161,9 @@ private static MappingSet mappings() {
         a.getOrCreateInnerClassMapping("a")
                 .setDeobfuscatedName("Inner");
 
+        final TopLevelClassMapping demo = mappings.getOrCreateTopLevelClassMapping("Demo")
+                .setDeobfuscatedName("DoubleDeobf");
+
         return mappings;
     }