LDEV-5895 AST include java function source

Author: zspitzer

core/src/main/java/lucee/transformer/bytecode/statement/TagIsland.java

@@ -50,7 +50,7 @@ public void dump(Struct sct) {
 			stmt.dump(stmtSct);
 			bodyArr.appendEL(stmtSct);
 		}
-		sct.setEL("body", bodyArr);
+		sct.setEL(KeyConstants._body, bodyArr);
 	}
 
 	// Body interface methods - delegate to inner body

core/src/main/java/lucee/transformer/bytecode/statement/udf/Function.java

@@ -153,6 +153,7 @@ public abstract class Function extends StatementBaseNoFinal implements Opcodes,
 	Literal cachedWithin;
 	int modifier;
 	protected JavaFunction jf;
+	protected String rawJavaSource; // raw Java source for AST round-tripping
 	// private final Root root;
 	protected int index = -1;
 
@@ -614,6 +615,10 @@ public void setJavaFunction(JavaFunction jf) {
 		this.jf = jf;
 	}
 
+	public void setRawJavaSource(String rawJavaSource) {
+		this.rawJavaSource = rawJavaSource;
+	}
+
 	public void setIndex(int index) {
 		this.index = index;
 	}
@@ -733,6 +738,10 @@ public void dump(Struct sct, String type) {
 		if (body != null) {
 			Struct s = new StructImpl(Struct.TYPE_LINKED);
 			body.dump(s);
+			// For Java functions, include raw Java source for round-tripping
+			if (rawJavaSource != null) {
+				s.setEL(KeyConstants._raw, rawJavaSource);
+			}
 			sct.setEL(KeyConstants._body, s);
 		}
 	}

core/src/main/java/lucee/transformer/cfml/expression/AbstrCFMLExprTransformer.java

@@ -1865,7 +1865,7 @@ private FunctionMember getFunctionMember(Data data, final ExprString name, boole
 						arg = it.next();
 						// Skip hidden args (internal metadata like __filename, __mapping) in ast mode only
 						if (data.ast && arg.isHidden()) continue;
-						if (arg.getDefaultValue() != null)bif.addArgument(new NamedArgumentImpl(data.factory.createLitString(arg.getName()),
+						if (arg.getDefaultValue() != null) bif.addArgument(new NamedArgumentImpl(data.factory.createLitString(arg.getName()),
 								data.factory.createLitString(arg.getDefaultValue()), arg.getTypeAsString(), false));
 					}
 				}

core/src/main/java/lucee/transformer/cfml/script/AbstrCFMLScriptTransformer.java

@@ -1217,8 +1217,8 @@ protected final Function closurePart(Data data, String id, int access, int modif
 
 				// TODO cachedwithin
 
-				func.setJavaFunction(java(data, body, id, access, modifier, hint, args, attrs, rtnType, output, bufferOutput, displayName, description, returnFormat, secureJson,
-						verifyClient, localMode));
+				java(data, func, body, id, access, modifier, hint, args, attrs, rtnType, output, bufferOutput, displayName, description, returnFormat, secureJson,
+						verifyClient, localMode);
 			}
 			else {
 				func.register(data.page);
@@ -1261,7 +1261,7 @@ private Attribute[] remove(Attribute[] attrs, String name) {
 		return list.toArray(new Attribute[list.size()]);
 	}
 
-	private JavaFunction java(Data data, Body body, String functionName, int access, int modifier, String hint, ArrayList<Argument> args, Attribute[] attrs, String rtnType,
+	private void java(Data data, Function func, Body body, String functionName, int access, int modifier, String hint, ArrayList<Argument> args, Attribute[] attrs, String rtnType,
 			Boolean output, Boolean bufferOutput, String displayName, String description, int returnFormat, Boolean secureJson, Boolean verifyClient, int localMode)
 			throws TemplateException {
 
@@ -1286,22 +1286,25 @@ private JavaFunction java(Data data, Body body, String functionName, int access,
 		SourceCode sc = data.srcCode;
 		Position start = sc.getPosition();
 		findTheEnd(data, start.line);
+		Position end = sc.getPosition();
+		String javaCode = sc.substring(start.pos, end.pos - start.pos);
 
-		// In AST mode without PageSource, we can't compile - just return null
+		// Always store raw Java source for AST round-tripping
+		func.setRawJavaSource(javaCode);
+
+		// In AST mode without PageSource, we can't compile - just store raw source
 		// The function body has already been parsed past by findTheEnd
 		if (ps == null) {
-			return null;
+			return;
 		}
-
-		Position end = sc.getPosition();
-		String javaCode = sc.substring(start.pos, end.pos - start.pos);
 		try {
 			String id = data.page.registerJavaFunctionName(functionName);
 			lucee.commons.lang.compiler.SourceCode _sc = fd.createSourceCode(ps, javaCode, id, functionName, access, modifier, hint, args, output, bufferOutput, displayName,
 					description, returnFormat, secureJson, verifyClient, localMode);
 			JavaFunction jf = new JavaFunction(ps, _sc, CompilerFactory.getInstance().compile((ConfigPro) data.config, _sc));
 
-			return jf;
+			func.setJavaFunction(jf);
+			return;
 		}
 		catch (JavaCompilerException e) {
 			Throwable cause = e.getCause();

test/tickets/LDEV5985.cfc

@@ -28,6 +28,20 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="ast" {
 				expect( funcDecl.type ).toBe( "FunctionDeclaration" );
 			});
 
+			it( "should preserve raw Java source in AST body for round-tripping", function() {
+				var code = fileRead( variables.testDir & "javaFunction.cfm" );
+				var ast = astFromString( code );
+
+				// Find the function declaration
+				var funcDecl = findNodeByType( ast, "FunctionDeclaration" );
+				expect( isNull( funcDecl ) ).toBeFalse( "FunctionDeclaration should be present" );
+
+				// The body should contain the raw Java source for round-tripping
+				expect( funcDecl ).toHaveKey( "body" );
+				expect( funcDecl.body ).toHaveKey( "raw" );
+				expect( funcDecl.body.raw ).toInclude( "return i*2" );
+			});
+
 		});
 
 	}