Fixed missing or and and keywords and auto content assist in AQL view…

… configuration.
eclipse-acceleo · Feb 21, 2024 · 7a69ec1 · 7a69ec1
1 parent 5652d9c
commit 7a69ec1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/...se.acceleo.query.ide.ui/src/org/eclipse/acceleo/query/ide/ui/viewer/AQLConfiguration.java b/...se.acceleo.query.ide.ui/src/org/eclipse/acceleo/query/ide/ui/viewer/AQLConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017 Obeo.
+ * Copyright (c) 2017, 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
@@ -114,7 +114,7 @@ public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceVie
 	public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
 		final ContentAssistant assistant = new ContentAssistant();
 		assistant.setContentAssistProcessor(processor, IDocument.DEFAULT_CONTENT_TYPE);
-		assistant.enableAutoActivation(true);
+		assistant.enableAutoActivation(false);
 		assistant.setAutoActivationDelay(COMPLETION_AUTO_ACTIVATION_DELAY);
 		assistant.setProposalPopupOrientation(IContentAssistant.PROPOSAL_OVERLAY);
 		assistant.setInformationControlCreator(getInformationControlCreator(sourceViewer));

diff --git a/....eclipse.acceleo.query.ide.ui/src/org/eclipse/acceleo/query/ide/ui/viewer/AQLScanner.java b/....eclipse.acceleo.query.ide.ui/src/org/eclipse/acceleo/query/ide/ui/viewer/AQLScanner.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017 Obeo.
+ * Copyright (c) 2017, 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
@@ -30,7 +30,7 @@ public class AQLScanner implements ITokenScanner {
 	/**
 	 * Keyword regular expression.
 	 */
-	private static final String KEYWORD_REGEX = "if|then|else|endif|let|in|true|false|null|not";
+	private static final String KEYWORD_REGEX = "if|then|else|endif|let|in|true|false|null|not|and|or";
 
 	/**
 	 * String literal regular expression.
@@ -51,8 +51,9 @@ public class AQLScanner implements ITokenScanner {
 	/**
 	 * Scanner {@link Pattern}.
 	 */
-	private static final Pattern SCANNER = Pattern.compile("(\\s+)|((?<![a-zA-Z])(" + KEYWORD_REGEX + ")(?![a-zA-Z]))|("
-			+ STRING_LITERAL_REGEX + ")|((?<![a-zA-Z])((String|Integer|Real|Boolean)(?![a-zA-Z]))|Sequence(?=\\()|OrderedSet(?=\\()|"
+	private static final Pattern SCANNER = Pattern.compile("(\\s+)|((?<![a-zA-Z])(" + KEYWORD_REGEX
+			+ ")(?![a-zA-Z]))|(" + STRING_LITERAL_REGEX
+			+ ")|((?<![a-zA-Z])((String|Integer|Real|Boolean)(?![a-zA-Z]))|Sequence(?=\\()|OrderedSet(?=\\()|"
 			+ ECLASSIFIER_SET_TYPE_REGEX + "|" + ECLASSIFIER_TYPE_REGEX + ")");
 
 	/**
@@ -129,8 +130,8 @@ public class AQLScanner implements ITokenScanner {
 	public AQLScanner(ColorManager colorManager) {
 		keywordToken = new Token(new TextAttribute(colorManager.getColor(IAQLColorConstants.KEYWORD)));
 		stringToken = new Token(new TextAttribute(colorManager.getColor(IAQLColorConstants.STRING)));
-		typeLiteralToken = new Token(
-				new TextAttribute(colorManager.getColor(IAQLColorConstants.TYPE_LITERAL)));
+		typeLiteralToken = new Token(new TextAttribute(colorManager.getColor(
+				IAQLColorConstants.TYPE_LITERAL)));
 	}
 
 	/**