GROOVY-11387: STC: entry before field for outside map property reference

apache · Jun 24, 2024 · febdbdd · febdbdd
1 parent 7d01a83
commit febdbdd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -1814,7 +1814,8 @@ private boolean isMapProperty(final PropertyExpression pexp, final ClassNode rec
                 && Arrays.asList(getTypeCheckingAnnotations()).contains(COMPILESTATIC_CLASSNODE))) {
             return false;
         }
-        return isOrImplements(receiverType, MAP_TYPE) && !getType(objectExpression).equals(CLASS_Type);
+        return isOrImplements(receiverType, MAP_TYPE) && (!getType(objectExpression).equals(CLASS_Type)
+            || (pexp.isImplicitThis() && isThisExpression(objectExpression) && typeCheckingContext.getEnclosingClosure() != null));
     }
 
     /**

diff --git a/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy b/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy
@@ -1010,6 +1010,18 @@ class FieldsAndPropertiesSTCTest extends StaticTypeCheckingTestCase {
             assert xxx == null
             assert yyy == null
         '''
+        assertScript '''
+            static void test() {
+                def map = new HashMap<String,String>()
+                map.with{
+                    @ASTTest(phase=INSTRUCTION_SELECTION, value={
+                        assert node.getNodeMetaData(INFERRED_TYPE) == STRING_TYPE
+                    })
+                    def xxx = table
+                }
+            }
+            test()
+        '''
         assertScript '''
             class HttpHeaders extends HashMap<String,List<String>> {
                 public static final String ACCEPT = 'Accept'