GROOVY-11641: index trait field under original name (#2206)

* refactor compile mode inputs

* GROOVY-11641: index trait field under original name

Author: eric-milles

src/main/java/groovy/lang/MetaClassImpl.java

@@ -110,6 +110,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.function.BiConsumer;
+import java.util.regex.Pattern;
 
 import static groovy.lang.Tuple.tuple;
 import static java.lang.Character.isUpperCase;
@@ -144,6 +145,11 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
     private static final MetaMethod AMBIGUOUS_LISTENER_METHOD = new DummyMetaMethod();
     private static final Comparator<CachedClass> CACHED_CLASS_NAME_COMPARATOR = Comparator.comparing(CachedClass::getName);
     private static final boolean PERMISSIVE_PROPERTY_ACCESS = SystemUtil.getBooleanSafe("groovy.permissive.property.access");
+    private static final Pattern TRAIT_FIELD;
+    static {
+        final var identifier = "[\\p{javaJavaIdentifierStart}&&[^_$]][\\p{javaJavaIdentifierPart}&&[^_$]]*"; // _ and $ are special
+        TRAIT_FIELD = Pattern.compile("(?:" + identifier + "_)*" + identifier + "(?:\\$" + identifier + ")*__(" + identifier + ")");
+    }
     private static final VMPlugin VM_PLUGIN = VMPluginFactory.getPlugin();
 
     protected final Class theClass;
@@ -2358,8 +2364,15 @@ private void fillStaticPropertyIndex() {
             } else {
                 prop = null; // ignore all other types
             }
-
-            if (prop != null) staticPropertyIndex.put(name, prop);
+            if (prop != null) {
+                staticPropertyIndex.put(name, prop);
+                if (!name.startsWith("$") && name.contains("__")) {
+                    var matcher = TRAIT_FIELD.matcher(name);
+                    if (matcher.matches()) { // GROOVY-11641
+                        staticPropertyIndex.putIfAbsent(matcher.group(1), prop);
+                    }
+                }
+            }
         };
 
         classPropertyIndex.computeIfAbsent(theCachedClass, x -> new LinkedHashMap<>()).forEach(indexStaticProperty);

src/main/java/org/codehaus/groovy/transform/trait/TraitReceiverTransformer.java

@@ -55,6 +55,7 @@
 import static org.codehaus.groovy.ast.tools.GeneralUtils.propX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.ternaryX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.varX;
+import static org.codehaus.groovy.transform.stc.StaticTypesMarker.DYNAMIC_RESOLUTION;
 
 /**
  * This expression transformer is used internally by the {@link org.codehaus.groovy.transform.trait.TraitASTTransformation
@@ -123,6 +124,7 @@ public Expression transform(final Expression exp) {
                 }
             } else if (accessedVariable instanceof DynamicVariable && !inClosure) { // GROOVY-9386
                 PropertyExpression propertyExpression = propX(varX(weaved), vexp.getName());
+                propertyExpression.putNodeMetaData(DYNAMIC_RESOLUTION, Boolean.TRUE);
                 propertyExpression.getProperty().setSourcePosition(exp);
                 return propertyExpression;
             }

src/main/java/org/codehaus/groovy/transform/trait/Traits.java

@@ -244,7 +244,6 @@ public static Method getBridgeMethodTarget(Method someMethod) {
         return null;
     }
 
-
     /**
      * Converts a class implementing some trait into a target class. If the trait is a dynamic proxy and
      * that the target class is assignable to the target object of the proxy, then the target object is

src/main/java/org/codehaus/groovy/vmplugin/v8/Selector.java

@@ -285,8 +285,8 @@ private void handleBoolean() {
     private static class PropertySelector extends MethodSelector {
         private boolean insertName;
 
-        public PropertySelector(CacheableCallSite callSite, Class<?> sender, String methodName, CallType callType, boolean safeNavigation, boolean thisCall, boolean spreadCall, Object[] arguments) {
-            super(callSite, sender, methodName, callType, safeNavigation, thisCall, spreadCall, arguments);
+        public PropertySelector(CacheableCallSite callSite, Class<?> sender, String propertyName, CallType callType, boolean safeNavigation, boolean thisCall, boolean spreadCall, Object[] arguments) {
+            super(callSite, sender, propertyName, callType, safeNavigation, thisCall, spreadCall, arguments);
         }
 
         /**