Merge branch 'develop' into next

.github/workflows/publish-checks-wiki.yml

@@ -0,0 +1,33 @@
+name: Publish checks to wiki
+on:
+  push:
+    branches: [develop]
+    paths:
+      - .github/workflows/publish-checks-wiki.yml
+      - magik-checks/src/main/resources/nl/ramsolutions/sw/sonar/l10n/magik/rules
+concurrency:
+  group: publish-checks-wiki
+  cancel-in-progress: true
+permissions:
+  contents: write
+jobs:
+  publish-wiki:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          python3 -m pip install --upgrade pip
+          python3 -m pip install html2text==2024.2.25
+      - run: |
+          mkdir -p wiki/checks
+          for f in magik-checks/src/main/resources/nl/ramsolutions/sw/sonar/l10n/magik/rules/*.html
+          do
+            name=$(basename $f .html)
+            echo Generating wiki/checks/Check-$name.md
+            html2text -b 0 $f > wiki/checks/Check-$name.md
+          done
+      - uses: Andrew-Chen-Wang/github-wiki-action@86138cbd6328b21d759e89ab6e6dd6a139b22270
+        with:
+          path: wiki
+          #dry-run: true
+        if: ${{ github.repository_owner == 'StevenLooman' }}

CHANGES.md

@@ -4,7 +4,7 @@
 
 - Add base functionality to apply fixes from magik-lint.
 
-0.9.0 (unreleased)
+0.9.0 (2024-02-26)
 
 - Support configurable libs dirs.
 - Read and register in which module a definition lives.

magik-checks/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>nl.ramsolutions</groupId>
     <artifactId>magik-tools</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>magik-checks</artifactId>

magik-debug-adapter/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>nl.ramsolutions</groupId>
     <artifactId>magik-tools</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>magik-debug-adapter</artifactId>

magik-language-server/client-vscode/client/package.json

@@ -3,7 +3,7 @@
 	"description": "Magik Language Server and Debug Adapter client for VSCode",
 	"author": "Steven Looman",
 	"license": "GPL-3.0-only",
-	"version": "0.9.0-SNAPSHOT",
+	"version": "0.9.1-SNAPSHOT",
 	"publisher": "StevenLooman",
 	"repository": {
 		"type": "git",

magik-language-server/client-vscode/client/src/const.ts

@@ -1 +1 @@
-export const MAGIK_TOOLS_VERSION = '0.9.0-SNAPSHOT';
+export const MAGIK_TOOLS_VERSION = '0.9.1-SNAPSHOT';

magik-language-server/client-vscode/package.json

@@ -3,7 +3,7 @@
 	"description": "Magik Language Server",
 	"author": "Steven Looman",
 	"license": "GPL-3.0-only",
-	"version": "0.9.0-SNAPSHOT",
+	"version": "0.9.1-SNAPSHOT",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/StevenLooman/magik-tools"

magik-language-server/client-vscode/server/magik-debug-adapter-0.9.1-SNAPSHOT.jar

@@ -0,0 +1 @@
+../../../magik-debug-adapter/target/magik-debug-adapter-0.9.1-SNAPSHOT.jar

magik-language-server/client-vscode/server/magik-language-server-0.9.1-SNAPSHOT.jar

@@ -0,0 +1 @@
+../../../magik-language-server/target/magik-language-server-0.9.1-SNAPSHOT.jar

magik-language-server/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>nl.ramsolutions</groupId>
     <artifactId>magik-tools</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>magik-language-server</artifactId>

magik-lint/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>nl.ramsolutions</groupId>
     <artifactId>magik-tools</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>magik-lint</artifactId>

magik-squid/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>nl.ramsolutions</groupId>
     <artifactId>magik-tools</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>magik-squid</artifactId>

magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/typing/reasoner/ConditionalBodyHandler.java

@@ -125,6 +125,11 @@ private void handleUpperBody(final AstNode ifNode) {
     // be `_unset`.
     final AstNode ifStatementNode = ifNode.getFirstAncestor(MagikGrammar.STATEMENT);
     final AstNode nextSiblingNode = ifStatementNode.getNextSibling();
+    if (nextSiblingNode == null) {
+      // No next sibling node, nothing to do.
+      return;
+    }
+
     final AstNode upperBodyNode = ifStatementNode.getFirstAncestor(MagikGrammar.BODY);
     final AstNode elseNode = ifNode.getFirstChild(MagikGrammar.ELSE);
     final List<AstNode> conditionalExpressionNodes =

magik-typed-checks/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>nl.ramsolutions</groupId>
     <artifactId>magik-tools</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>magik-typed-checks</artifactId>

magik-typed-checks/src/main/java/nl/ramsolutions/sw/magik/typedchecks/checks/UndefinedMethodCallResultTypedCheck.java

@@ -7,6 +7,7 @@
 import nl.ramsolutions.sw.magik.analysis.typing.types.AbstractType;
 import nl.ramsolutions.sw.magik.analysis.typing.types.ExpressionResult;
 import nl.ramsolutions.sw.magik.analysis.typing.types.Method;
+import nl.ramsolutions.sw.magik.analysis.typing.types.UndefinedType;
 import nl.ramsolutions.sw.magik.api.MagikGrammar;
 import nl.ramsolutions.sw.magik.typedchecks.MagikTypedCheck;
 import org.sonar.check.Rule;
@@ -23,24 +24,27 @@ public class UndefinedMethodCallResultTypedCheck extends MagikTypedCheck {
   @Override
   @SuppressWarnings("checkstyle:NestedIfDepth")
   protected void walkPostMethodInvocation(final AstNode node) {
+    final MethodInvocationNodeHelper helper = new MethodInvocationNodeHelper(node);
     final LocalTypeReasonerState reasonerState = this.getTypeReasonerState();
+    final AbstractType receiverType = this.getTypeInvokedOn(node);
+    if (receiverType == UndefinedType.INSTANCE) {
+      // Don't bother with method invocations on UNDEFINED.
+      return;
+    }
+
     final ExpressionResult result = reasonerState.getNodeType(node);
     if (result.containsUndefined()) {
       final AstNode firstIdentifierNode = node.getFirstChild(MagikGrammar.IDENTIFIER);
       final AstNode issueNode = firstIdentifierNode != null ? firstIdentifierNode : node;
 
-      final MethodInvocationNodeHelper helper = new MethodInvocationNodeHelper(node);
       final String methodName = helper.getMethodName();
 
-      AbstractType calledType = this.getTypeInvokedOn(node);
-      final Collection<Method> methods = calledType.getMethods(methodName);
-      if (!methods.isEmpty()) {
-        // Set real called type.
-        // TODO: Only first method, or should we test all methods?
-        final Method method = methods.iterator().next();
-        calledType = method.getOwner();
-      }
-      final String fullMethodName = calledType.getFullName() + "." + methodName;
+      final Collection<Method> methods = receiverType.getMethods(methodName);
+      final String receiverFullName =
+          !methods.isEmpty()
+              ? methods.iterator().next().getOwner().getFullName()
+              : receiverType.getFullName();
+      final String fullMethodName = receiverFullName + "." + methodName;
 
       final String message = String.format(MESSAGE, fullMethodName);
       this.addIssue(issueNode, message);

magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/UndefinedMethodCallResultTypedCheckTest.java

@@ -48,4 +48,13 @@ void testMethodInvocationDefined() {
     final List<MagikIssue> issues = this.runCheck(code, definitionKeeper, check);
     assertThat(issues).isEmpty();
   }
+
+  @Test
+  void testMethodInvocationOnUndefined() {
+    final String code = "" + "_block\n" + "  undefined.m()\n" + "_endblock";
+    final IDefinitionKeeper definitionKeeper = new DefinitionKeeper();
+    final MagikTypedCheck check = new UndefinedMethodCallResultTypedCheck();
+    final List<MagikIssue> issues = this.runCheck(code, definitionKeeper, check);
+    assertThat(issues).isEmpty();
+  }
 }

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>nl.ramsolutions</groupId>
   <artifactId>magik-tools</artifactId>
-  <version>0.9.0-SNAPSHOT</version>
+  <version>0.9.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Magik Tools</name>

sonar-magik-plugin/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>nl.ramsolutions</groupId>
     <artifactId>magik-tools</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>sonar-magik-plugin</artifactId>

sslr-magik-toolkit/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>nl.ramsolutions</groupId>
     <artifactId>magik-tools</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>sslr-magik-toolkit</artifactId>