Preserve renamed Lua callback targets

Author: Frotty

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

@@ -406,14 +406,23 @@ LuaFunction callbackAdapterFor(ImFunction target) {
         callbackAdapters.put(target, adapter);
 
         LuaFunction errorHandler = callbackErrorHandler();
-        String xpcall = "xpcall(" + targetLua.getName() + ", " + errorHandler.getName() + ", ...)";
+        LuaExprFunctionCallByName xpcall = LuaAst.LuaExprFunctionCallByName("xpcall",
+            LuaAst.LuaExprlist(
+                LuaAst.LuaExprFuncRef(targetLua),
+                LuaAst.LuaExprFuncRef(errorHandler),
+                LuaAst.LuaExprVarAccess(dots.copy())));
         if (target.getReturnType() instanceof ImVoid) {
-            adapter.getBody().add(LuaAst.LuaLiteral(xpcall));
+            adapter.getBody().add(xpcall);
         } else {
             // Keep exactly the first callback result. Returning select(2, xpcall(...)) directly
             // could leak additional Lua return values into a surrounding argument list.
-            adapter.getBody().add(LuaAst.LuaLiteral("local _, result = " + xpcall));
-            adapter.getBody().add(LuaAst.LuaLiteral("return result"));
+            LuaVariable ignored = LuaAst.LuaVariable("_", LuaAst.LuaNoExpr());
+            LuaVariable result = LuaAst.LuaVariable("result", LuaAst.LuaNoExpr());
+            adapter.getBody().add(ignored);
+            adapter.getBody().add(result);
+            adapter.getBody().add(LuaAst.LuaAssignment(
+                LuaAst.LuaLiteral("_, result"), xpcall));
+            adapter.getBody().add(LuaAst.LuaReturn(LuaAst.LuaExprVarAccess(result)));
         }
         luaModel.add(adapter);
         return adapter;

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

@@ -2523,11 +2523,38 @@ public void luaFunctionRefsReuseOneAdapterAndPreserveSingleReturn() {
         assertEquals("both Condition calls must reference the cached adapter", 2,
             countMatches(compiled, "Condition\\(" + Pattern.quote(adapter) + "\\)"));
         String adapterBody = getFunctionBody(compiled, adapter);
-        assertTrue(adapterBody.contains("local _, result = xpcall(predicate,"));
+        assertTrue(adapterBody.contains("_, result = xpcall(predicate,"));
         assertTrue(adapterBody.contains("return result"));
         assertFalse("callback sites must not allocate anonymous wrappers", compiled.contains("Condition(function ("));
     }
 
+    @Test
+    public void luaFunctionRefAdapterTracksLateClassFunctionRename() {
+        String compiled = compileLuaWithCUs(
+            "LuaTranslationTests_luaFunctionRefAdapterTracksLateClassFunctionRename",
+            false,
+            Collections.emptyList(),
+            new RunArgs().with("-lua"),
+            "package Test",
+            "@extern native consume(code callback)",
+            "@extern native CallbackOwner_staticCallback()",
+            "class CallbackOwner",
+            "    function start()",
+            "        consume(function staticCallback)",
+            "    private static function staticCallback()",
+            "        consume(function staticCallback)",
+            "init",
+            "    CallbackOwner_staticCallback()",
+            "    new CallbackOwner().start()"
+        );
+
+        String callbackName = singleMatch(compiled,
+            "function\\s+(CallbackOwner_[A-Za-z0-9_]*staticCallback[A-Za-z0-9_]*)\\(\\)", 1);
+        assertTrue("adapter must track the class callback's final name:\n" + compiled,
+            compiled.contains("xpcall(" + callbackName + ","));
+        assertFalse(compiled.contains("xpcall(staticCallback,"));
+    }
+
     @Test
     public void luaFunctionRefStacktraceHandlerUsesWurstStackPosition() throws IOException {
         CU errorHandling = new CU("ErrorHandling.wurst", String.join("\n",