GROOVY-11387: STC: class field or property of map-based type

apache · May 30, 2024 · 7260b06 · 7260b06
1 parent 3624b9b
commit 7260b06
Show file tree

Hide file tree

Showing 2 changed files with 11 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
@@ -1809,7 +1809,7 @@ private boolean isMapProperty(final PropertyExpression pexp, final ClassNode rec
                 && Arrays.asList(getTypeCheckingAnnotations()).contains(COMPILESTATIC_CLASSNODE))) {
             return false;
         }
-        return isOrImplements(receiverType, MAP_TYPE);
+        return isOrImplements(receiverType, MAP_TYPE) && !getType(objectExpression).equals(CLASS_Type);
     }
 
     /**

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