Fixed #135 For iterator index variable is not proposed by the complet…

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

Hide file tree

Showing 6 changed files with 46 additions and 21 deletions.
diff --git a/...s/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/completion/AcceleoAstCompletor.java b/...s/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/completion/AcceleoAstCompletor.java
@@ -57,6 +57,7 @@
 import org.eclipse.acceleo.aql.completion.proposals.templates.AcceleoCodeTemplateCompletionProposalsProvider;
 import org.eclipse.acceleo.aql.completion.proposals.templates.AcceleoCodeTemplates;
 import org.eclipse.acceleo.aql.parser.AcceleoParser;
+import org.eclipse.acceleo.aql.validation.AcceleoValidator;
 import org.eclipse.acceleo.aql.validation.IAcceleoValidationResult;
 import org.eclipse.acceleo.query.parser.AstCompletor;
 import org.eclipse.acceleo.query.runtime.ICompletionProposal;
@@ -577,6 +578,10 @@ private Map<String, Set<IType>> getVariables(AcceleoASTNode scope) {
 			} else if (currentScope instanceof ForStatement) {
 				final ForStatement forStatement = (ForStatement)currentScope;
 				res.put(forStatement.getBinding().getName(), getPossibleTypes(forStatement.getBinding()));
+				final Set<IType> possibleIndexTypes = new LinkedHashSet<>();
+				possibleIndexTypes.add(new ClassType(queryEnvironment, Integer.class));
+				res.put(forStatement.getBinding().getName() + AcceleoValidator.INDEX_SUFFIX,
+						possibleIndexTypes);
 			}
 
 			if (currentScope.eContainer() instanceof AcceleoASTNode) {
@@ -615,7 +620,7 @@ private LinkedHashSet<IType> getPossibleTypes(Variable variable) {
 	 *            the {@link Variable}
 	 * @return the {@link Set} of possible {@link IType} for the given {@link Variable}
 	 */
-	private LinkedHashSet<IType> getPossibleTypes(Binding binding) {
+	private Set<IType> getPossibleTypes(Binding binding) {
 		final LinkedHashSet<IType> res;
 
 		if (binding.getInitExpression() != null) {
@@ -653,8 +658,10 @@ public List<AcceleoCompletionProposal> caseErrorBinding(ErrorBinding errorBindin
 					.getMissingAffectationSymbole() + SPACE, AcceleoPackage.Literals.BINDING));
 		} else if (errorBinding.getInitExpression().getAst()
 				.getAst() instanceof org.eclipse.acceleo.query.ast.Error) {
-			res.addAll(this.getAqlCompletionProposals(getVariables(errorBinding), acceleoValidationResult
-					.getValidationResult(errorBinding.getInitExpression().getAst())));
+			final AcceleoASTNode context = (AcceleoASTNode)errorBinding.eContainer()
+							.eContainer();
+			res.addAll(this.getAqlCompletionProposals(getVariables(context), acceleoValidationResult.getValidationResult(errorBinding
+							.getInitExpression().getAst())));
 		}
 
 		return res;

diff --git a/...eleo.aql.tests/resources/completion/forStatementBindingExpression-expected-completion.txt b/...eleo.aql.tests/resources/completion/forStatementBindingExpression-expected-completion.txt
@@ -7,15 +7,6 @@ myParam
 * Type (optional):
 http://www.eclipse.org/acceleo/4.0#//Expression
 
-* Label:
-myVariable
-* Description:
-Variable myVariable
-* Text:
-myVariable
-* Type (optional):
-http://www.eclipse.org/acceleo/4.0#//Expression
-
 * Label:
 ecore::EAnnotation
 * Description:

diff --git a/...eo.aql.tests/resources/completion/forStatementSeparatorExpression-expected-completion.txt b/...eo.aql.tests/resources/completion/forStatementSeparatorExpression-expected-completion.txt
@@ -16,6 +16,15 @@ myVariable
 * Type (optional):
 http://www.eclipse.org/acceleo/4.0#//Expression
 
+* Label:
+myVariableIndex
+* Description:
+Variable myVariableIndex
+* Text:
+myVariableIndex
+* Type (optional):
+http://www.eclipse.org/acceleo/4.0#//Expression
+
 * Label:
 ecore::EAnnotation
 * Description:

diff --git a/...eleo.aql.tests/resources/completion/letStatementBindingExpression-expected-completion.txt b/...eleo.aql.tests/resources/completion/letStatementBindingExpression-expected-completion.txt
@@ -7,15 +7,6 @@ myParam
 * Type (optional):
 http://www.eclipse.org/acceleo/4.0#//Expression
 
-* Label:
-myVariable
-* Description:
-Variable myVariable
-* Text:
-myVariable
-* Type (optional):
-http://www.eclipse.org/acceleo/4.0#//Expression
-
 * Label:
 ecore::EAnnotation
 * Description:

diff --git a/...leo.aql.tests/resources/completion/nestedQueryStatementExpression-expected-completion.txt b/...leo.aql.tests/resources/completion/nestedQueryStatementExpression-expected-completion.txt
@@ -34,6 +34,15 @@ myVariable3
 * Type (optional):
 http://www.eclipse.org/acceleo/4.0#//Expression
 
+* Label:
+myVariable3Index
+* Description:
+Variable myVariable3Index
+* Text:
+myVariable3Index
+* Type (optional):
+http://www.eclipse.org/acceleo/4.0#//Expression
+
 * Label:
 myVariable4
 * Description:
@@ -43,6 +52,15 @@ myVariable4
 * Type (optional):
 http://www.eclipse.org/acceleo/4.0#//Expression
 
+* Label:
+myVariable4Index
+* Description:
+Variable myVariable4Index
+* Text:
+myVariable4Index
+* Type (optional):
+http://www.eclipse.org/acceleo/4.0#//Expression
+
 * Label:
 ecore::EAnnotation
 * Description:

diff --git a/...ql.tests/resources/completion/nestedQueryStatementExpressionInFor-expected-completion.txt b/...ql.tests/resources/completion/nestedQueryStatementExpressionInFor-expected-completion.txt
@@ -16,6 +16,15 @@ myVariable
 * Type (optional):
 http://www.eclipse.org/acceleo/4.0#//Expression
 
+* Label:
+myVariableIndex
+* Description:
+Variable myVariableIndex
+* Text:
+myVariableIndex
+* Type (optional):
+http://www.eclipse.org/acceleo/4.0#//Expression
+
 * Label:
 ecore::EAnnotation
 * Description: