Fix setting parameter on MagikCheck

StevenLooman · Sep 17, 2023 · c4c9f25 · c4c9f25
1 parent 2226216
commit c4c9f25
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 2 deletions.
diff --git a/magik-checks/src/main/java/nl/ramsolutions/sw/magik/checks/MagikCheck.java b/magik-checks/src/main/java/nl/ramsolutions/sw/magik/checks/MagikCheck.java
@@ -49,8 +49,10 @@ public void setParameter(final String name, final @Nullable Object value) throws
                 continue;
             }
 
-            final String key = ruleProperty.key().replace(" ", "-");
-            if (key.equals(name)) {
+            final String checkKey = this.getHolder().getCheckKeyKebabCase();
+            final String parameterKey = ruleProperty.key().replace(" ", "-");
+            final String fullKey = checkKey + "." + parameterKey;
+            if (fullKey.equals(name)) {
                 field.set(this, value);
                 found = true;
             }

diff --git a/...k-squid/src/test/java/nl/ramsolutions/sw/magik/analysis/typing/LocalTypeReasonerTest.java b/...k-squid/src/test/java/nl/ramsolutions/sw/magik/analysis/typing/LocalTypeReasonerTest.java
@@ -21,6 +21,7 @@
 import nl.ramsolutions.sw.magik.analysis.typing.types.TypeString;
 import nl.ramsolutions.sw.magik.analysis.typing.types.UndefinedType;
 import nl.ramsolutions.sw.magik.api.MagikGrammar;
+import nl.ramsolutions.sw.magik.parser.TypeStringParser;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -1520,4 +1521,48 @@ void testGenericIterMethodInvocation() {
             .isEqualTo(integerType);
     }
 
+    @Test
+    void testGenericSlot() {
+        final String code = ""
+            + "_method exemplar.m\n"
+            + "  _return .stack.pop()\n"
+            + "_endmethod\n";
+
+        // Set up TypeKeeper/TypeReasoner.
+        final TypeKeeper typeKeeper = new TypeKeeper();
+
+        final TypeString stackRef = TypeString.ofIdentifier("stack", "sw");
+        final MagikType stackType = new MagikType(typeKeeper, Sort.SLOTTED, stackRef);
+        stackType.addGeneric(null, "E");
+        stackType.addMethod(
+            null,
+            EnumSet.noneOf(Method.Modifier.class),
+            "pop()",
+            Collections.emptyList(),
+            null,
+            null,
+            new ExpressionResultString(
+                TypeString.ofGeneric("E")),
+            new ExpressionResultString());
+
+        final TypeString exemplarRef = TypeString.ofIdentifier("exemplar", "sw");
+        final MagikType exemplarType = new MagikType(typeKeeper, Sort.SLOTTED, exemplarRef);
+        final TypeString slotTypeRef = TypeStringParser.parseTypeString("sw:stack<sw:integer>", "sw");
+        exemplarType.addSlot(null, "stack", slotTypeRef);
+
+        // Do analysis.
+        final MagikTypedFile magikFile = this.createMagikFile(code, typeKeeper);
+        final LocalTypeReasoner reasoner = magikFile.getTypeReasoner();
+
+        final AstNode topNode = magikFile.getTopNode();
+        final AstNode methodDefinitionNode = topNode.getFirstDescendant(MagikGrammar.METHOD_DEFINITION);
+        final ExpressionResult result = reasoner.getNodeType(methodDefinitionNode);
+        final TypeString integerRef = TypeString.ofIdentifier("integer", "sw");
+        final AbstractType integerType = typeKeeper.getType(integerRef);
+        final AbstractType actualType = result.get(0, null);
+        assertThat(actualType)
+            .isNotNull()
+            .isEqualTo(integerType);
+    }
+
 }