Merge pull request #2782 from jlerbsc/master

javaparser · Aug 13, 2020 · a2dd1ea · a2dd1ea
2 parents 69a2e0e + e94aac7
commit a2dd1ea
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 1 deletion.
diff --git a/...java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForStatementContext.java b/...java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForStatementContext.java
@@ -26,6 +26,7 @@
 import com.github.javaparser.ast.expr.AssignExpr;
 import com.github.javaparser.ast.expr.Expression;
 import com.github.javaparser.ast.expr.MethodCallExpr;
+import com.github.javaparser.ast.expr.UnaryExpr;
 import com.github.javaparser.ast.expr.VariableDeclarationExpr;
 import com.github.javaparser.ast.nodeTypes.NodeWithStatements;
 import com.github.javaparser.ast.stmt.ForStmt;
@@ -57,7 +58,7 @@ public SymbolReference<? extends ResolvedValueDeclaration> solveSymbol(String na
                         return SymbolReference.solved(JavaParserSymbolDeclaration.localVar(variableDeclarator, typeSolver));
                     }
                 }
-            } else if (!(expression instanceof AssignExpr || expression instanceof MethodCallExpr)) {
+            } else if (!(expression instanceof AssignExpr || expression instanceof MethodCallExpr || expression instanceof UnaryExpr)) {
                 throw new UnsupportedOperationException(expression.getClass().getCanonicalName());
             }
         }

diff --git a/...symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2764Test.java b/...symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2764Test.java
@@ -0,0 +1,59 @@
+package com.github.javaparser.symbolsolver;
+
+import com.github.javaparser.JavaParser;
+import com.github.javaparser.ParseResult;
+import com.github.javaparser.ParseStart;
+import com.github.javaparser.ParserConfiguration;
+import com.github.javaparser.Providers;
+import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.expr.NameExpr;
+import com.github.javaparser.ast.expr.UnaryExpr;
+import com.github.javaparser.ast.stmt.Statement;
+import com.github.javaparser.printer.PrettyPrinter;
+import com.github.javaparser.printer.PrettyPrinterConfiguration;
+import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
+import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
+import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
+
+import org.junit.jupiter.api.Test;
+
+import static com.github.javaparser.StaticJavaParser.parseStatement;
+import static com.github.javaparser.utils.Utils.EOL;
+import static com.github.javaparser.utils.Utils.normalizeEolInTextBlock;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+
+public class Issue2764Test {
+    private JavaParser javaParser;
+
+    @BeforeEach
+    void setUp() {
+        TypeSolver typeSolver = new ReflectionTypeSolver();
+        ParserConfiguration config = new ParserConfiguration();
+        config.setSymbolResolver(new JavaSymbolSolver(typeSolver));
+        javaParser = new JavaParser(config);
+    }
+
+    @Test
+    void resolveUnaryExpr() {
+        String code = 
+                "class A {" +
+                "  void a() {" +
+                "    int e;" + 
+                "    for(e++;;){}" +
+                "  }" +
+                "}";
+
+        ParseResult<CompilationUnit> parseResult = javaParser.parse(ParseStart.COMPILATION_UNIT, Providers.provider(code));
+        assertTrue(parseResult.isSuccessful());
+        assertTrue(parseResult.getResult().isPresent());
+
+        CompilationUnit cu = parseResult.getResult().get();
+        NameExpr name = (NameExpr) cu.findFirst(UnaryExpr.class).get().getExpression();
+        ResolvedValueDeclaration resolve = name.resolve();
+
+        assertTrue("int".contentEquals(resolve.getType().describe()));
+    }
+}