Commit dd09570a authored by Martti Käärik's avatar Martti Käärik
Browse files

Avoid "Cyclic resolution of lazy links"

parent defa960a

plugins/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/scoping/TDLScopeProvider.java

+6 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import org.eclipse.emf.common.util.BasicEList; 
import org.eclipse.emf.common.util.EList;

import org.eclipse.emf.ecore.EObject;

import org.eclipse.emf.ecore.EReference;

import org.eclipse.emf.ecore.InternalEObject;

import org.eclipse.xtext.EcoreUtil2;

import org.eclipse.xtext.naming.IQualifiedNameConverter;

import org.eclipse.xtext.naming.QualifiedName;
@@ -556,10 +557,12 @@ public class TDLScopeProvider extends AbstractDeclarativeScopeProvider { 
			elements.addAll(getContainerParameters((Element) context));

			//TODO: filter enums

//			if 

			if (!((InternalEObject) context).eIsSet(tdlPackage.DATA_ELEMENT_USE__DATA_ELEMENT)) {

				DataType dataType = ((DataElementUse) context).resolveDataType();

				if (dataType instanceof EnumDataType) {

					elements.removeIf(e->(e instanceof SimpleDataInstance) && ((SimpleDataInstance)e).getDataType() != dataType);

				}

			}

//			elements.addAll(getScopedElementsOfType(context, FormalParameter.class));

//			elements.addAll(getScopedElementsOfType(context, StructuredDataType.class));

			return Scopes.scopeFor(elements);