LDEV-4892 - fixing regression with function listener

lucee · Jun 10, 2024 · 5e66506 · 5e66506
1 parent 54c4774
commit 5e66506
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 3 deletions.
diff --git a/core/src/main/java/lucee/transformer/cfml/expression/AbstrCFMLExprTransformer.java b/core/src/main/java/lucee/transformer/cfml/expression/AbstrCFMLExprTransformer.java
@@ -1887,7 +1887,7 @@ private FunctionMember getFunctionMember(Data data, final ExprString name, boole
 	}
 
 	private Expression getListener(Data data) throws TemplateException {
-		if (!insideCase && tenaryContext != CTX_TENARY_MIDDLE && data.srcCode.forwardIfCurrent(':')) {
+		if (!insideCase && tenaryContext != CTX_TENARY_MIDDLE && data.srcCode.isPreviousIgnoreSpace(')') && data.srcCode.forwardIfCurrent(':')) {
 			int pos = data.srcCode.getPos();
 			comments(data);
 			Expression expr = assignOp(data);

diff --git a/core/src/main/java/lucee/transformer/util/SourceCode.java b/core/src/main/java/lucee/transformer/util/SourceCode.java
@@ -145,6 +145,20 @@ public boolean isPrevious(char c) {
 		return lcText[pos - 1] == c;
 	}
 
+	public boolean isPreviousIgnoreSpace(char c) {
+		int start = pos;
+		try {
+			while (isPrevious(' ')) {
+				pos--;
+			}
+			if (!hasPrevious()) return false;
+			return charAt(getPos() - 1) == c;
+		}
+		finally {
+			pos = start;
+		}
+	}
+
 	/**
 	 * is the character at the next position the same as the character provided by the input parameter
 	 */

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.1.0.190-SNAPSHOT"/>
+  <property name="version" value="6.1.0.191-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.1.0.190-SNAPSHOT</version>
+  <version>6.1.0.191-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>

diff --git a/test/tickets/LDEV4892.cfc b/test/tickets/LDEV4892.cfc
@@ -0,0 +1,21 @@
+component extends="org.lucee.cfml.test.LuceeTestCase" {
+    function test() {
+        return "abc";
+    }
+	function run( testResults, testBox ) {
+		describe("Testcase for LDEV-4892 - Invalid struct shorthand syntax", function() {
+			it( title="check syntax colon with space", body=function( currentSpec ) {
+				var x={ "#test()#" : function(){} };
+			});
+            it( title="check syntax colon no space", body=function( currentSpec ) {
+				var x={ "#test()#":function(){} };
+			});
+            it( title="check syntax colon no space", body=function( currentSpec ) {
+				var x={ "#test()#" = function(){} };
+			});
+            it( title="check syntax colon no space", body=function( currentSpec ) {
+				var x={ "#test()#"=function(){} };
+			});
+		}); 
+	}
+}