Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue #3728 ParseProblemException #3743

Merged
merged 2 commits into from
Nov 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,20 @@

package com.github.javaparser.version;

import static com.github.javaparser.ParseStart.STATEMENT;
import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_10;
import static com.github.javaparser.Providers.provider;
import static org.junit.jupiter.api.Assertions.assertEquals;

import java.util.List;

import org.junit.jupiter.api.Test;

import com.github.javaparser.JavaParser;
import com.github.javaparser.ParseResult;
import com.github.javaparser.ParserConfiguration;
import com.github.javaparser.ast.stmt.Statement;
import com.github.javaparser.ast.type.VarType;
import org.junit.jupiter.api.Test;

import java.util.List;

import static com.github.javaparser.ParseStart.STATEMENT;
import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_10;
import static com.github.javaparser.Providers.provider;
import static org.junit.jupiter.api.Assertions.assertEquals;

class Java10PostProcessorTest {
public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_10));
Expand All @@ -46,4 +47,13 @@ void varIsAType() {

assertEquals(1, allVarTypes.size());
}

@Test
void expressionThatShouldNotBeInterpretedAsAVarType() {
ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("var.class.getName();"));

List<VarType> allVarTypes = result.getResult().get().findAll(VarType.class);

assertEquals(0, allVarTypes.size());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,51 @@
*/
package com.github.javaparser.ast.validator.postprocessors;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import com.github.javaparser.ParseResult;
import com.github.javaparser.ParserConfiguration;
import com.github.javaparser.Processor;
import com.github.javaparser.ast.Node;
import com.github.javaparser.ast.expr.ClassExpr;
import com.github.javaparser.ast.type.ClassOrInterfaceType;
import com.github.javaparser.ast.type.VarType;

/**
* Processes the generic AST into a Java 10 AST and validates it.
*/
public class Java10PostProcessor extends PostProcessors {

// List of parent contexts in which a var type must not be detected.
// for example: in this statement var.class.getCanonicalName(), var must not be considered as a VarType
private static List<Class> FORBIDEN_PARENT_CONTEXT_TO_DETECT_POTENTIAL_VAR_TYPE = new ArrayList<>();
static {
FORBIDEN_PARENT_CONTEXT_TO_DETECT_POTENTIAL_VAR_TYPE.addAll(Arrays.asList(ClassExpr.class));
}

protected final Processor varNodeCreator = new Processor() {

@Override
public void postProcess(ParseResult<? extends Node> result, ParserConfiguration configuration) {
result.getResult().ifPresent(node -> {
node.findAll(ClassOrInterfaceType.class).forEach(n -> {
if (n.getNameAsString().equals("var")) {
n.replace(new VarType(n.getTokenRange().orElse(null)));
}
node.findAll(ClassOrInterfaceType.class)
.forEach(n -> {
if (n.getNameAsString().equals("var")
&& !matchForbiddenContext(n)) {
n.replace(new VarType(n.getTokenRange().orElse(null)));
}
});
});
}

private boolean matchForbiddenContext(ClassOrInterfaceType cit) {
return cit.getParentNode().isPresent()
&& FORBIDEN_PARENT_CONTEXT_TO_DETECT_POTENTIAL_VAR_TYPE.stream().anyMatch(cl -> cl.isInstance(cit.getParentNode().get()));
}
};


public Java10PostProcessor() {
add(varNodeCreator);
Expand Down