Revert "* workaround: idea debugger doesn't stop in Inner classes that extend…" (#815)

This reverts commit f8a81f5.

Co-authored-by: Tomski <tomwojciechowski@asidik.com>

Author: dkimitsa

compiler/compiler/src/main/java/org/robovm/compiler/plugin/objc/ObjCMemberPlugin.java

@@ -46,7 +46,6 @@
 import org.robovm.compiler.plugin.AbstractCompilerPlugin;
 import org.robovm.compiler.plugin.CompilerPlugin;
 import org.robovm.compiler.target.framework.FrameworkTarget;
-import org.robovm.compiler.util.generic.SootClassUtils;
 import org.robovm.compiler.util.generic.SootMethodType;
 import soot.Body;
 import soot.BooleanType;
@@ -88,7 +87,6 @@
 import soot.tagkit.SignatureTag;
 import soot.util.Chain;
 
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -696,7 +694,6 @@ public void beforeClass(Config config, Clazz clazz, ModuleBuilder moduleBuilder)
     @Override
     public void beforeLinker(Config config, Linker linker, Set<Clazz> classes) {
         preloadClassesForFramework(config, linker, classes);
-        preloadObjCClassHosts(config, linker, classes);
     }
 
     private static <E> List<E> l(E head, List<E> tail) {
@@ -2032,49 +2029,6 @@ private void preloadClassesForFramework(Config config, Linker linker, Set<Clazz>
         }
     }
 
-    private void preloadObjCClassHosts(Config config, Linker linker, Set<Clazz> classes) {
-        // TODO: remove once resolved on Idea side
-        // affects only debug builds
-        // workaround for Idea Bug: https://youtrack.jetbrains.com/issue/IDEA-332794
-        // Idea debugger is not happy if inner class is being loaded before host ones and
-        // ignores breakpoints inside.
-        // preload if all ObjCClass's is happening in ObjCClass.java, static initializer
-        // workaround -- is to preload all hosts before loading ObjCClass
-        if (config.isDebug()) {
-            SootClass objCObjectClazz = classes.stream()
-                    .filter( c -> c.getClassName().equals(OBJC_OBJECT))
-                    .map(Clazz::getSootClass)
-                    .findFirst()
-                    .orElse(null);
-            Set<String> objClassHosts = new HashSet<>();
-            if (objCObjectClazz != null) {
-                // proceed if we link with ObjObject
-                // look for all ObjCClasses, and these are internal -- preload hosts as well
-                for (Clazz clazz : classes) {
-                    SootClass sootClass = clazz.getSootClass();
-                    // skip if doesn't extend ObjCClass
-                    if (!SootClassUtils.isAssignableFrom(sootClass, objCObjectClazz))
-                        continue;
-                    // skip if not inner
-                    String hostClassName = SootClassUtils.getEnclosingClassName(sootClass);
-                    if (hostClassName == null)
-                        hostClassName = SootClassUtils.getDeclaringClassName(sootClass);
-                    if (hostClassName != null)
-                        objClassHosts.add(hostClassName);
-                }
-
-                if (!objClassHosts.isEmpty()) {
-                    try {
-                        byte[] bytes = StringUtils.join(objClassHosts, ",").getBytes("UTF8");
-                        linker.addRuntimeData(OBJC_CLASS + ".preloadClasses", bytes);
-                    } catch (UnsupportedEncodingException e) {
-                        config.getLogger().error("Failed to prepare ObjCClass' hosts preload list");
-                    }
-                }
-            }
-        }
-    }
-
     public static class MethodCompiler extends AbstractMethodCompiler {
         // structure to expose CustomClasses to objc side
         // check https://opensource.apple.com/source/objc4/objc4-437/runtime/objc-runtime-new.h for details

compiler/compiler/src/main/java/org/robovm/compiler/util/generic/SootClassUtils.java

@@ -15,7 +15,6 @@
  */
 package org.robovm.objc;
 
-import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -57,31 +56,6 @@ public final class ObjCClass extends ObjCObject {
 
     static {
         ObjCRuntime.bind(ObjCClass.class);
-
-        // TODO: remove once resolved on Idea side
-        // affects only debug builds
-        // workaround for Idea Bug: https://youtrack.jetbrains.com/issue/IDEA-332794
-        // there is code bellow loads all ObjCClass' and some of them might be Inner ones
-        // idea seems to be ignoring PREPARE class events in case Inner class is
-        // being loaded before the host one
-        byte[] data = VM.getRuntimeData(ObjCClass.class.getName() + ".preloadClasses");
-        if (data != null) {
-            String[] innerClassHosts;
-            try {
-                innerClassHosts = new String(data, "UTF8").split(",");
-            } catch (UnsupportedEncodingException e) {
-                innerClassHosts = new String[0];
-            }
-            for (String host : innerClassHosts) {
-                try {
-                    // preload class.
-                    Class.forName(host);
-                } catch (Throwable t) {
-                    System.err.println("Failed to preload inner ObjCClass host class " + host + ": " + t.getMessage());
-                }
-            }
-        }
-
         @SuppressWarnings("unchecked")
         Class<? extends ObjCObject>[] classes = (Class<? extends ObjCObject>[]) 
                 VM.listClasses(ObjCObject.class, ClassLoader.getSystemClassLoader());