Qute parser does not parse operator parameters with '=' correctly

Fixes redhat-developer#742 Signed-off-by: azerr <azerr@redhat.com>
angelozerr · Sep 14, 2022 · 0e5302f · 0e5302f
1 parent 50f76d7
commit 0e5302f
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/qute.ls/com.redhat.qute.ls/src/main/java/com/redhat/qute/parser/template/Parameter.java b/qute.ls/com.redhat.qute.ls/src/main/java/com/redhat/qute/parser/template/Parameter.java
@@ -96,6 +96,9 @@ public String toString() {
 	 * @return the parameter name.
 	 */
 	public String getName() {
+		if (name != null) {
+			return name;
+		}
 		if (!hasValueAssigned()) {
 			// ex : {#if foo?? }
 			Expression expression = getJavaTypeExpression();

diff --git a/...om.redhat.qute.ls/src/main/java/com/redhat/qute/parser/template/sections/CaseSection.java b/...om.redhat.qute.ls/src/main/java/com/redhat/qute/parser/template/sections/CaseSection.java
@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.redhat.qute.parser.parameter.ParameterParser;
 import com.redhat.qute.parser.template.ASTVisitor;
 import com.redhat.qute.parser.template.CaseOperator;
 import com.redhat.qute.parser.template.Parameter;
@@ -87,12 +88,28 @@ public CaseSection(int start, int end) {
 
 	@Override
 	protected void initializeParameters(List<Parameter> parameters) {
-		// All parameters can have expression (ex : {#case OFF})
+		// All parameters can have expression.
+		// Ex :
+		// - {#case OFF}
+		// - {#case in ON OFF}
 		for (Parameter parameter : parameters) {
+			// We consider that case parameter has value to get the proper name when
+			// parameter#getName() is called for operator which could contains '='.
+			parameter.setStartValue(parameter.getEnd());
+			parameter.getName();
+			parameter.setStartValue(NULL_VALUE);
 			parameter.setCanHaveExpression(true);
 		}
 	}
 
+	protected List<Parameter> collectParameters() {
+		// Don't split parameters with '=' to support operator like
+		// !=
+		// >=
+		boolean splitWithEquals = false;
+		return ParameterParser.parse(this, false, splitWithEquals);
+	}
+
 	@Override
 	public SectionKind getSectionKind() {
 		return SectionKind.CASE;

diff --git a/.../com/redhat/qute/services/diagnostics/QuteDiagnosticsInExpressionWithWhenSectionTest.java b/.../com/redhat/qute/services/diagnostics/QuteDiagnosticsInExpressionWithWhenSectionTest.java
@@ -290,6 +290,26 @@ public void whenExpressionOperatorExpectedParam() {
 		testDiagnosticsFor(template);
 	}
 
+	@Test
+	public void whenExpressionOperatorWhichContainsEquals() {
+		String template = "{@org.acme.Machine Machine}\r\n" + //
+				"		{#when Machine.getMachine()}\r\n" + //
+				"		{#is != ON}\r\n" + //
+				"		{#is <= ON}\r\n" + //
+				"		{/when}";
+		testDiagnosticsFor(template);
+
+		template = "{@org.acme.Machine Machine}\r\n" + //
+				"		{#when Machine.getMachine()}\r\n" + //
+				"		{#is != ON OFF}\r\n" + //
+				"		{#is <= ON}\r\n" + //
+				"		{/when}";
+		testDiagnosticsFor(template, //
+				d(2, 13, 2, 16, QuteErrorCode.UnexpectedParameter,
+						"Unexpected operand `OFF`. The operator `!=` in the `#is` section expects only one parameter.",
+						DiagnosticSeverity.Error));
+	}
+
 	@Test
 	public void whenExpressionOperatorNoParameters() {
 		String template = "{@org.acme.Machine Machine}\r\n" + //