AbstractClassMirror.findMember(EObject, String) fails when inner class is used in signature of member before

[cdietrich]

AbstractClassMirror.findMember(EObject, String) fails when inner class is used in signature of member before
e.g. native boolean closeScope0(Scope scope, Scope.ScopedAccessError exception);
in ScopedMemoryAccess in Java 16

(happens e.g when running org.eclipse.xtext.xbase.tests.serializer.SerializerTest with Java 16

[cdietrich]

possible solution

	protected EObject findMember(EObject container, String fragment) {
		if (container instanceof JvmDeclaredType) {
			EList<JvmMember> members = ((JvmDeclaredType) container).getMembers();
			boolean isOp = fragment.indexOf('(') >= 0; // maybe we also have to check the position of $ relative to ()
			for (JvmMember member : members) {
				if (!isOp) {
					if (member instanceof JvmOperation) {
						continue;
					}
				}
				String name = member.getIdentifier();
				if (equal(fragment, name)) {
					return member;
				}
			}
			for (JvmMember member : members) {
				if (!isOp) {
					if (member instanceof JvmOperation) {
						continue;
					}
				}
				String name = member.getIdentifier();
				if (fragment.startsWith(name)) {
					EObject match = findMember(member, fragment);
					if (match != null)
						return match;
				}
			}
		}
		return null;
	}

[cdietrich]

can be reproduced with Java 8/11 and

public class CachingReflectionTypeProviderTest extends ReflectionTypeProviderTest {
	
	@Test
	public void testCreateMirror_01a() {
		URI uri = URI.createURI("java:/Objects/testdata.ClientFor");
		IMirror mirror = getTypeProvider().createMirror(uri);
		TypeResource resource = (TypeResource) resourceSet.getResource(uri, true);
		assertNotNull(resource);
		assertTrue(resource.isLoaded());
		assertEquals(1, resource.getContents().size());
		for (JvmMember m : ((JvmDeclaredType)resource.getContents().get(0)).getMembers()) {
			if (m instanceof JvmField) {
				((JvmField) m).getType().getSimpleName();
			}
		}
	}

package testdata;

/**
 * @author cdietrich - Initial contribution and API
 */
public class ClientFor {
	
	
	public testdata.ScopedMemoryAccess.Scope.ScopedAccessError e;

}

package testdata;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

/**
 * @author cdietrich - Initial contribution and API
 */
public class ScopedMemoryAccess {
	
	 private static String UNSAFE = "";

	    private static native Scope registerNatives();
	
	private ScopedMemoryAccess() {}

    private static final ScopedMemoryAccess theScopedMemoryAccess = new ScopedMemoryAccess();

    public static ScopedMemoryAccess getScopedMemoryAccess() {
        return theScopedMemoryAccess;
    }

	public boolean closeScope(Scope scope) {
		return closeScope0(scope, Scope.ScopedAccessError.INSTANCE);
	}

	native boolean closeScope0(Scope scope, Scope.ScopedAccessError exception);

	public interface Scope {
		final class ScopedAccessError {
			public static ScopedAccessError INSTANCE = new ScopedAccessError();
		}
	}
	
	@Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
    @Retention(RetentionPolicy.RUNTIME)
    @interface Scoped { }
	
}

[cdietrich]

org.eclipse.xtext.common.types.access.reflect.CachingReflectionTypeFactory.createType(Class<?>) org.eclipse.xtext.common.types.access.impl.CachingDeclaredTypeFactory and others call
EcoreUtil2.cloneWithProxies(cachedResult);

which wont copy identifier as it is derived.
maybe

EcoreUtil.Copier copier = new EcoreUtil.Copier(false) {
	 @Override
	public EObject copy(EObject eObject) {
		 EObject copy = super.copy(eObject);
		 if (copy instanceof JvmMember) {
			 copyAttribute(TypesPackage.Literals.JVM_MEMBER__IDENTIFIER, eObject, copy);
		 }
		 return copy;
	}
};
JvmDeclaredType copy = (JvmDeclaredType) copier.copy(cachedResult);
copier.copyReferences();
return copy;

[cdietrich]

alternative would be to change something in the metamodel.
(Make JvmMember.identifier non derived and changeable)
am not sure if this would have side effects
(first experiments with xtext-extras only look promising)

am not sure about serialization/transientvalueservice

[cdietrich]

https://github.com/eclipse/xtext-extras/compare/cd_jvmTypesTest

[cdietrich]

Fixed in 2.26