fix bug in import types check

Feuermagier · Apr 13, 2024 · b230987 · b230987
1 parent 4781fc4
commit b230987
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/autograder-core/src/main/java/de/firemage/autograder/core/check/general/ImportTypes.java b/autograder-core/src/main/java/de/firemage/autograder/core/check/general/ImportTypes.java
@@ -62,8 +62,12 @@ private static List<CtTypeReference<?>> findQualifiedTypes(CtTypeReference<?> ct
         }
 
         List<CtTypeReference<?>> result = new ArrayList<>();
-        // the right condition is a workaround for https://github.com/INRIA/spoon/issues/5428
-        if (!isSimplyQualified(type) && (type.getPosition().isValidPosition() || type.getParent(CtArrayTypeReference.class) != null)) {
+        // The not simplified type check does not always work, especially when spoon is buggy.
+        // See forEach test, where the type is not implicit, but its parent is.
+        //
+        // I can not think of a case where the parent is implicit and the child is not, so I added
+        // this as a workaround to avoid making a spoon PR.
+        if (!isSimplyQualified(type) && !type.getParent().isImplicit()) {
             result.add(type);
         }
 

diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestImportTypes.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestImportTypes.java
@@ -169,4 +169,23 @@ public static String[] makeCopy(String[] array) {
 
         problems.assertExhausted();
     }
+
+    @Test
+    void testForEach() throws IOException, LinterException {
+        ProblemIterator problems = this.checkIterator(StringSourceInfo.fromSourceString(
+            JavaVersion.JAVA_17,
+            "Test",
+            """
+                import java.util.Map;
+
+                class Test {
+                    public static void takesMap(Map<Integer, String[][]> input, Map<Integer, Boolean> output) {
+                        input.forEach((key, strings) -> output.put(key, false));
+                    }
+                }
+                """
+        ), PROBLEM_TYPES);
+
+        problems.assertExhausted();
+    }
 }