Fix for visit(PatternInstanceofExpression node) in NaiveASTFlattener

[twasik81]

What it does

The change resolves an issue with the "MISSING" string printed that is a result of parsing PatternInstanceofExpression.

How to test

Author checklist

• I have thoroughly tested my changes
• The change is following the coding conventions
• I have signed the Eclipse Contributor Agreement (ECA)

[gayanper]

@twasik81 do you have issue describing where we can observe this behavior ?

[twasik81]

Here is the result of debugging:

on code snippet:

static boolean checkCollisionIfs(Object p1, Object p2) {
if (p1 instanceof Point(int x1, int y1) && p2 instanceof Point(int x2, int y2)) {
return x1 == x2 && y1 == y2;
}
if (p1 instanceof Point(int x1, int y1) && p2 instanceof ColoredPoint(Point(int x2, int y2), Color c)) {
return x1 == x2 && y1 == y2;
}
if (p1 instanceof ColoredPoint(Point(int x1, int y1), Color c) && p2 instanceof Point(int x2, int y2)) {
return x1 == x2 && y1 == y2;
}
if (p1 instanceof ColoredPoint(Point(int x1, int y1), Color c1)
&& p2 instanceof ColoredPoint(Point(int x2, int y2), Color c2)) {
return x1 == x2 && y1 == y2;
}
throw new IllegalArgumentException("Invalid type");
}

[iloveeclipse]

@twasik81 : please sign ECA, see this https://api.eclipse.org/git/eca/status/gh/eclipse-jdt/eclipse.jdt.core/2285

[twasik81]

@iloveeclipse : The ECA is already signed, but I'm not a committer to run the ECA validation tool again.

[iloveeclipse]

The ECA is already signed, but I'm not a committer to run the ECA validation tool again.

I did it and it still failing.

Please make sure the mail used in the commit matches the mail used for your Eclipse account.
See hints in https://api.eclipse.org/git/eca/status/gh/eclipse-jdt/eclipse.jdt.core/2285

[twasik81]

@iloveeclipse here is eclipse account view:

here is git command execution:

[twasik81]

@iloveeclipse: So if there is a problem with ECA validation of my account can someone else create the pull request with the same content? From my point of view is irrelevant who will be a contributor to this fix.

[iloveeclipse]

From my point of view is irrelevant who will be a contributor to this fix.

But not from IP point of view, as long as commit is not identified to be from a person that signed ECA we cannot accept patches. I've created https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/4542 ticket, let see what IT guys say.

[iloveeclipse]

I've created https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/4542 ticket, let see what IT guys say.

@twasik81 : see https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/4542#note_2086634.
Please check if you have linked your github account at Eclipse.org profile page.

[twasik81]

@iloveeclipse : I've added this:

[iloveeclipse]

@twasik81 : while the ECA check seem to be fixed now (see ticket), could you please add a test case or at least provide a simple snippet that shows the issue?

[twasik81]

Here is the code of test:

import org.eclipse.jdt.core.dom.AST;
import org.eclipse.jdt.core.dom.ASTParser;
import org.eclipse.jdt.core.dom.ASTVisitor;
import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jdt.core.dom.PatternInstanceofExpression;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertFalse;

public class PatternInstanceOfExpressionTest {
    @Test
    public void testPatternInstanceOfExpression() {

        String content = "public class Foo {" +
                "static boolean checkCollisionIfs(Object p1, Object p2) {" +
                "if (p1 instanceof Point(int x1, int y1)) {" +
                "return x1 == x2 && y1 == y2;" +
                "}}" +
                "record Point(int x, int y) {}" +
                "record ColoredPoint(Point T, String color) {}" +
                "record Decorator(Object obj) {}" +
                "}";


        ASTParser parser = ASTParser.newParser(AST.JLS21);
        parser.setSource(content.toCharArray());
        CompilationUnit cunit = (CompilationUnit) parser.createAST(null);
        NodeFinder astVisitor = new NodeFinder();
        cunit.accept(astVisitor);
        assertFalse(astVisitor.patternInstanceofExpression.toString().contains("MISSING"));
    }
    class NodeFinder extends ASTVisitor {
        PatternInstanceofExpression patternInstanceofExpression;
        public boolean visit(PatternInstanceofExpression node) {
            patternInstanceofExpression = node;
            return super.visit(node);
        }
    }

}

[iloveeclipse]

Here is the code of test:

Could you please add it in org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom - either as single test or to some of the already existing tests? If it will be a dedicated new class, it should be also added to the test suite org.eclipse.jdt.core.tests.dom.RunAllTests.

While doing so, please amend existing commit, rebase it on latest master state & force push to github.
This should also solve the problem with the ECA check.

[twasik81]

I've tried but I've failed to run a test under the specified package.
Could you please create a test based on the data that we already provided?