Fixed #134 [AQL] Empty collection defined in extension produce a warn…

…ing.
eclipse-acceleo · Feb 14, 2024 · 237b2bc · 237b2bc
1 parent d4a949a
commit 237b2bc
Show file tree

Hide file tree

Showing 7 changed files with 185 additions and 471 deletions.
diff --git a/.../plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstValidator.java b/.../plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2023 Obeo.
+ * Copyright (c) 2015, 2024 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -1014,8 +1014,8 @@ public Set<IType> caseSetInExtensionLiteral(SetInExtensionLiteral object) {
 				}
 			}
 		} else {
-			possibleTypes.add(new SetType(services.getQueryEnvironment(), services.nothing(
-					"Empty OrderedSet defined in extension")));
+			possibleTypes.add(new SetType(services.getQueryEnvironment(), new ClassType(services
+					.getQueryEnvironment(), null)));
 		}
 
 		return checkWarningsAndErrors(object, possibleTypes);
@@ -1032,8 +1032,8 @@ public Set<IType> caseSequenceInExtensionLiteral(SequenceInExtensionLiteral obje
 				}
 			}
 		} else {
-			possibleTypes.add(new SequenceType(services.getQueryEnvironment(), services.nothing(
-					"Empty Sequence defined in extension")));
+			possibleTypes.add(new SequenceType(services.getQueryEnvironment(), new ClassType(services
+					.getQueryEnvironment(), null)));
 		}
 
 		return checkWarningsAndErrors(object, possibleTypes);

diff --git a/...clipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/ValidationTest.java b/...clipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/ValidationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2023 Obeo.
+ * Copyright (c) 2015, 2024 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -915,8 +915,8 @@ public void setInExtensionLiteralEmpty() {
 		final Iterator<IType> it = possibleTypes.iterator();
 		IType possibleType = it.next();
 		assertTrue(possibleType instanceof SetType);
-		assertNothingType("Empty OrderedSet defined in extension", ((SetType)possibleType)
-				.getCollectionType());
+		assertTrue(((SetType)possibleType).getCollectionType() instanceof ClassType);
+		assertEquals(null, ((ClassType)((SetType)possibleType).getCollectionType()).getType());
 
 		assertEquals(0, validationResult.getMessages().size());
 
@@ -965,8 +965,8 @@ public void sequenceInExtensionLiteralEmpty() {
 		final Iterator<IType> it = possibleTypes.iterator();
 		IType possibleType = it.next();
 		assertTrue(possibleType instanceof SequenceType);
-		assertNothingType("Empty Sequence defined in extension", ((SequenceType)possibleType)
-				.getCollectionType());
+		assertTrue(((SequenceType)possibleType).getCollectionType() instanceof ClassType);
+		assertEquals(null, ((ClassType)((SequenceType)possibleType).getCollectionType()).getType());
 
 		assertEquals(0, validationResult.getMessages().size());
 

diff --git a/...sts/src/org/eclipse/acceleo/query/services/tests/CollectionServicesAstValidationTest.java b/...sts/src/org/eclipse/acceleo/query/services/tests/CollectionServicesAstValidationTest.java
diff --git a/...n/forStatement/forStatementEmpty/forStatementEmpty-WindowsEndLine-expected-quickFixes.txt b/...n/forStatement/forStatementEmpty/forStatementEmpty-WindowsEndLine-expected-quickFixes.txt
@@ -1,8 +0,0 @@
-//@moduleElements.1/@body/@statements.0/@body/@statements.0/@body/@statements.0/@expression/@aql
-Add parameter myVariable
-Replace file:/home/development/git/acceleo/tests/org.eclipse.acceleo.aql.tests/resources/evaluation/forStatement/forStatementEmpty/forStatementEmpty.mtl [135, 3, 53, 135, 3, 53] , myVariable: String
-Surround with Let: myVariable
-Replace file:/home/development/git/acceleo/tests/org.eclipse.acceleo.aql.tests/resources/evaluation/forStatement/forStatementEmpty/forStatementEmpty.mtl [227, 6, 6, 242, 7, 0] [let myVariable : String = '']
-        [myVariable/]
-
-      [/let]

diff --git a/...n/forStatement/forStatementEmpty/forStatementEmpty-WindowsEndLine-expected-validation.txt b/...n/forStatement/forStatementEmpty/forStatementEmpty-WindowsEndLine-expected-validation.txt
@@ -1 +0,0 @@
-ERROR Empty Sequence defined in extension - 228 238

diff --git a/...urces/evaluation/forStatement/forStatementEmpty/forStatementEmpty-expected-quickFixes.txt b/...urces/evaluation/forStatement/forStatementEmpty/forStatementEmpty-expected-quickFixes.txt
@@ -1,8 +0,0 @@
-//@moduleElements.1/@body/@statements.0/@body/@statements.0/@body/@statements.0/@expression/@aql
-Add parameter myVariable
-Replace file:/home/development/git/acceleo/tests/org.eclipse.acceleo.aql.tests/resources/evaluation/forStatement/forStatementEmpty/forStatementEmpty.mtl [132, 3, 53, 132, 3, 53] , myVariable: String
-Surround with Let: myVariable
-Replace file:/home/development/git/acceleo/tests/org.eclipse.acceleo.aql.tests/resources/evaluation/forStatement/forStatementEmpty/forStatementEmpty.mtl [221, 6, 6, 235, 7, 0] [let myVariable : String = '']
-        [myVariable/]
-
-      [/let]

diff --git a/...urces/evaluation/forStatement/forStatementEmpty/forStatementEmpty-expected-validation.txt b/...urces/evaluation/forStatement/forStatementEmpty/forStatementEmpty-expected-validation.txt
@@ -1 +0,0 @@
-ERROR Empty Sequence defined in extension - 222 232