Added validation of event direction in scope context. Update of proposals (YAKHMI-161)

plugins/org.yakindu.sct.model.stext.ui/src/org/yakindu/sct/model/stext/ui/contentassist/STextProposalProvider.java

@@ -95,11 +95,12 @@ public class STextProposalProvider extends AbstractSTextProposalProvider {
 					.getGroup().eContents()));
 			keywords.addAll(getKeywords(grammarAccess.getTimeEventTypeAccess()
 					.getAlternatives().eContents()));
+			keywords.add(grammarAccess.getDirectionAccess().getLOCALLocalKeyword_0_0());
 		}
 
 		if (contentAssistContext.getCurrentModel() instanceof InternalScope) {
-			keywords.addAll(getKeywords(grammarAccess.getDirectionAccess()
-					.getAlternatives().eContents()));
+			keywords.add(grammarAccess.getDirectionAccess().getINInKeyword_1_0());
+			keywords.add(grammarAccess.getDirectionAccess().getOUTOutKeyword_2_0());
 		}
 
 		if (!keywords.contains(keyword)) {

plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/validation/STextJavaValidator.java

@@ -18,12 +18,16 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.validation.Check;
 import org.eclipse.xtext.validation.CheckType;
 import org.yakindu.sct.model.sgraph.Declaration;
+import org.yakindu.sct.model.sgraph.Event;
 import org.yakindu.sct.model.sgraph.SGraphPackage;
 import org.yakindu.sct.model.stext.stext.AlwaysEvent;
+import org.yakindu.sct.model.stext.stext.Direction;
 import org.yakindu.sct.model.stext.stext.EntryEvent;
+import org.yakindu.sct.model.stext.stext.EventDefinition;
 import org.yakindu.sct.model.stext.stext.EventSpec;
 import org.yakindu.sct.model.stext.stext.ExitEvent;
 import org.yakindu.sct.model.stext.stext.InterfaceScope;
+import org.yakindu.sct.model.stext.stext.InternalScope;
 import org.yakindu.sct.model.stext.stext.LocalReaction;
 import org.yakindu.sct.model.stext.stext.OnCycleEvent;
 import org.yakindu.sct.model.stext.stext.Operation;
@@ -101,17 +105,23 @@ public class STextJavaValidator extends AbstractSTextJavaValidator {
 						SGraphPackage.Literals.SCOPE__DECLARATIONS);
 			}
 		}
+		for (Event event : interfaceScope.getEvents()) {
+			if (event instanceof EventDefinition && ((EventDefinition)event).getDirection() == Direction.LOCAL) {
+				error("Local declarations are not allowed in interface scope.",
+						SGraphPackage.Literals.SCOPE__EVENTS);
+			}
+		}
 	}
 
-//	@Check(CheckType.FAST)
-//	public void checkInternalScope(InternalScope internalScope) {
-//		for (Event event : internalScope.getEvents()) {
-//			if (event instanceof EventDefinition && ((EventDefinition)event).getDirection() != Direction.LOCAL) {
-//				error("In/Out declarations are not allowed in internal scope.",
-//						SGraphPackage.Literals.SCOPE__EVENTS);
-//			}
-//		}
-//	}
+	@Check(CheckType.FAST)
+	public void checkInternalScope(InternalScope internalScope) {
+		for (Event event : internalScope.getEvents()) {
+			if (event instanceof EventDefinition && ((EventDefinition)event).getDirection() != Direction.LOCAL) {
+				error("In/Out declarations are not allowed in internal scope.",
+						SGraphPackage.Literals.SCOPE__EVENTS);
+			}
+		}
+	}
 
 	private boolean isStatechartDefinitionChild(EObject element) {
 		while (element.eContainer() != null) {