Scope name preservation to top-level functions

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/translation/lua/translation/LuaTranslator.java

@@ -503,15 +503,6 @@ private void collectPredefinedNames() {
             }
         }
 
-        for (ImClass clazz : prog.getClasses()) {
-            for (ImFunction function : clazz.getFunctions()) {
-                if (NamePreservation.isPreserved(function)) {
-                    LuaFunction luaFunction = luaFunc.getFor(function);
-                    usedNames.add(luaFunction.getName());
-                }
-            }
-        }
-
         for (ImVar global : prog.getGlobals()) {
             if (global.getIsBJ()) {
                 setNameFromTrace(global);
@@ -1056,9 +1047,7 @@ private void translateClass(ImClass c) {
         // translate functions
         for (ImFunction f : c.getFunctions()) {
             translateFunc(f);
-            if (!NamePreservation.isPreserved(f)) {
-                luaFunc.getFor(f).setName(uniqueName(c.getName() + "_" + f.getName()));
-            }
+            luaFunc.getFor(f).setName(uniqueName(c.getName() + "_" + f.getName()));
         }
 
         createClassInitFunction(c, classVar, initMethod);

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/translation/lua/translation/RemoveGarbage.java

@@ -222,12 +222,6 @@ private static void visitFunction(ImFunction f, Used used) {
             return;
         }
         used.addFunction(f);
-        if (f.getParent() != null && f.getParent().getParent() instanceof ImClass owner) {
-            // A preserved static method has no receiver type to retain its owner. Keep the class
-            // because Lua emits class methods together with their class table.
-            visitClass(owner, used, false);
-        }
-
         visitType(f.getReturnType(), used);
         f.accept(new Element.DefaultVisitor() {
             @Override

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/validation/WurstValidator.java

@@ -90,9 +90,6 @@ public void validate(Collection<CompilationUnit> toCheck) {
             guaranteedClassFieldInitCache.clear();
             moduleFieldCopiesCache.clear();
             moduleFieldCopiesIndexed = false;
-            if (runtimeNameIndex != null) {
-                runtimeNameIndex.clearSyntheticMarkers();
-            }
             trveWrapperFuncs.clear();
             wrapperCalls.clear();
             NamePreservation.clearSyntheticMarkers(prog);

de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/OptimizerTests.java

@@ -571,59 +571,6 @@ public void trvePreservesLoweredTupleComponent() throws IOException {
             "Expected TRVE to preserve the lowered tuple component.\n" + output);
     }
 
-    @Test
-    public void preserveNameAnnotationKeepsClassFunctionNameInLua() throws IOException {
-        test().testLua(true).luaOnly(true).executeProg(false).lines(
-            "package test",
-            "    class ExternalApi",
-            "        @preserveName function callback()",
-            "            skip",
-            "endpackage");
-
-        String output = Files.toString(
-            new File("./test-output/lua/OptimizerTests_preserveNameAnnotationKeepsClassFunctionNameInLua.lua"),
-            Charsets.UTF_8);
-        assertTrue(output.contains("function ExternalApi_callback"),
-            "Expected a preserved class function to keep its emitted name.\n" + output);
-    }
-
-    @Test
-    public void preserveNameAnnotationKeepsStaticClassFunctionReachableInLua() throws IOException {
-        test().testLua(true).luaOnly(true).executeProg(false).lines(
-            "package test",
-            "    class ExternalApi",
-            "        @preserveName static function callback()",
-            "            skip",
-            "endpackage");
-
-        String output = Files.toString(
-            new File("./test-output/lua/OptimizerTests_preserveNameAnnotationKeepsStaticClassFunctionReachableInLua.lua"),
-            Charsets.UTF_8);
-        assertTrue(output.contains("function callback("),
-            "Expected a preserved static class function to keep its emitted name.\n" + output);
-    }
-
-    @Test
-    public void preservedClassFunctionReservesItsLuaNameBeforeClassVariables() throws IOException {
-        test().testLua(true).luaOnly(true).executeProg(false).lines(
-            "package test",
-            "    class Foo",
-            "        @preserveName function bar()",
-            "            skip",
-            "    class Foo_bar",
-            "    init",
-            "        new Foo_bar",
-            "endpackage");
-
-        String output = Files.toString(
-            new File("./test-output/lua/OptimizerTests_preservedClassFunctionReservesItsLuaNameBeforeClassVariables.lua"),
-            Charsets.UTF_8);
-        assertTrue(output.contains("function Foo_bar("),
-            "Expected the preserved class function to keep its Lua name.\n" + output);
-        assertTrue(output.contains("Foo_bar1 = ({})"),
-            "Expected the colliding class variable to be uniqued around the preserved function.\n" + output);
-    }
-
     @Test
     public void test_tempVarRemover() throws IOException {
         test().lines(