From bfddced4e257b1259865151c54669f3eab095eb9 Mon Sep 17 00:00:00 2001
From: Christopher Carpenter <intermediatelanguage@gmail.com>
Date: Thu, 21 Jan 2016 01:06:45 -0500
Subject: [PATCH] Fixed renaming class elements when using the decompilers
 -ren=1 option. Fixes issue IDEA-137253

---
 .../java/decompiler/struct/consts/ConstantPool.java          | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
index aa9ed9c..097440b 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
@@ -150,6 +150,11 @@ public class ConstantPool implements NewClassNameBuilder {
     String descriptor = ((PrimitiveConstant)getConstant(descriptorIndex)).getString();
 
     if (interceptor != null) {
+      String oldClassName = interceptor.getOldName(className);
+      if (oldClassName != null) {
+        className = oldClassName;
+      }
+
       String newElement = interceptor.getName(className + " " + elementName + " " + descriptor);
       if (newElement != null) {
         elementName = newElement.split(" ")[1];