introduce JavaParserVariableDeclaration #1668

javaparser · Aug 9, 2018 · 45733b0 · 45733b0
1 parent e40dd3e
commit 45733b0
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 6 deletions.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java
@@ -48,6 +48,7 @@
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.resolution.Resolvable;
 import com.github.javaparser.resolution.declarations.ResolvedFieldDeclaration;
+import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
 
 /**
  * The declaration of a variable.<br/>In <code>int x = 14, y = 3;</code> "int x = 14"  and "int y = 3"  are
@@ -56,7 +57,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public final class VariableDeclarator extends Node implements NodeWithType<VariableDeclarator, Type>, NodeWithSimpleName<VariableDeclarator>, Resolvable<ResolvedFieldDeclaration> {
+public final class VariableDeclarator extends Node implements NodeWithType<VariableDeclarator, Type>, NodeWithSimpleName<VariableDeclarator>, Resolvable<ResolvedValueDeclaration> {
 
     private SimpleName name;
 
@@ -275,7 +276,7 @@ public boolean replace(Node node, Node replacementNode) {
     }
 
     @Override
-    public ResolvedFieldDeclaration resolve() {
-        return getSymbolResolver().resolveDeclaration(this, ResolvedFieldDeclaration.class);
+    public ResolvedValueDeclaration resolve() {
+        return getSymbolResolver().resolveDeclaration(this, ResolvedValueDeclaration.class);
     }
 }
diff --git a/...core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedDeclaration.java b/...core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedDeclaration.java
@@ -47,6 +47,13 @@ default boolean isField() {
         return false;
     }
 
+    /**
+     * Does this declaration represents a variable?
+     */
+    default boolean isVariable() {
+        return false;
+    }
+
     default boolean isEnumConstant() {
         return false;
     }

diff --git a/...symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/JavaSymbolSolver.java b/...symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/JavaSymbolSolver.java
@@ -120,7 +120,14 @@ public <T> T resolveDeclaration(Node node, Class<T> resultClass) {
             }
         }
         if (node instanceof VariableDeclarator) {
-            ResolvedFieldDeclaration resolved = new JavaParserFieldDeclaration((VariableDeclarator) node, typeSolver);
+            ResolvedValueDeclaration resolved;
+            if (node.getParentNode().isPresent() && node.getParentNode().get() instanceof FieldDeclaration) {
+                resolved = new JavaParserFieldDeclaration((VariableDeclarator) node, typeSolver);
+            } else if (node.getParentNode().isPresent() && node.getParentNode().get() instanceof VariableDeclarationExpr) {
+                resolved = new JavaParserVariableDeclaration((VariableDeclarator) node, typeSolver);
+            } else {
+                throw new UnsupportedOperationException("Parent of VariableDeclarator is: " + node.getParentNode());
+            }
             if (resultClass.isInstance(resolved)) {
                 return resultClass.cast(resolved);
             }

diff --git a/...thub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java b/...thub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java
@@ -55,6 +55,10 @@ public JavaParserFieldDeclaration(VariableDeclarator variableDeclarator, TypeSol
         this.wrappedNode = (com.github.javaparser.ast.body.FieldDeclaration) requireParentNode(variableDeclarator);
     }
 
+    /**
+     * @deprecated Use JavaParserEnumConstantDeclaration instead.
+     */
+    @Deprecated
     public JavaParserFieldDeclaration(EnumConstantDeclaration enumConstantDeclaration, TypeSolver typeSolver) {
         if (typeSolver == null) {
             throw new IllegalArgumentException("typeSolver should not be null");

diff --git a/...b/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserVariableDeclaration.java b/...b/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserVariableDeclaration.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2016 Federico Tomassetti
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.github.javaparser.symbolsolver.javaparsermodel.declarations;
+
+import com.github.javaparser.ast.body.VariableDeclarator;
+import com.github.javaparser.ast.expr.VariableDeclarationExpr;
+import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
+import com.github.javaparser.resolution.types.ResolvedType;
+import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
+import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
+
+import static com.github.javaparser.symbolsolver.javaparser.Navigator.requireParentNode;
+
+/**
+ * @author Federico Tomassetti
+ */
+public class JavaParserVariableDeclaration implements ResolvedValueDeclaration {
+
+    private VariableDeclarator variableDeclarator;
+    private VariableDeclarationExpr wrappedNode;
+    private TypeSolver typeSolver;
+
+    public JavaParserVariableDeclaration(VariableDeclarator variableDeclarator, TypeSolver typeSolver) {
+        if (typeSolver == null) {
+            throw new IllegalArgumentException("typeSolver should not be null");
+        }
+        this.variableDeclarator = variableDeclarator;
+        this.typeSolver = typeSolver;
+        if (!(requireParentNode(variableDeclarator) instanceof VariableDeclarationExpr)) {
+            throw new IllegalStateException(requireParentNode(variableDeclarator).getClass().getCanonicalName());
+        }
+        this.wrappedNode = (VariableDeclarationExpr) requireParentNode(variableDeclarator);
+    }
+
+    @Override
+    public ResolvedType getType() {
+        return JavaParserFacade.get(typeSolver).convert(variableDeclarator.getType(), wrappedNode);
+    }
+
+    @Override
+    public String getName() {
+        return variableDeclarator.getName().getId();
+    }
+
+    @Override
+    public boolean isVariable() {
+        return true;
+    }
+
+    /**
+     * Returns the JavaParser node associated with this JavaParserFieldDeclaration.
+     *
+     * @return A visitable JavaParser node wrapped by this object.
+     */
+    public VariableDeclarationExpr getWrappedNode() {
+        return wrappedNode;
+    }
+
+    public VariableDeclarator getVariableDeclarator() {
+        return variableDeclarator;
+    }
+
+    @Override
+    public String toString() {
+        return "JavaParserVariableDeclaration{" + getName() + "}";
+    }
+
+}
diff --git a/...ser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1668.java b/...ser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1668.java
@@ -5,6 +5,7 @@
 import com.github.javaparser.ast.body.VariableDeclarator;
 import com.github.javaparser.ast.expr.VariableDeclarationExpr;
 import com.github.javaparser.resolution.declarations.ResolvedFieldDeclaration;
+import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
 import com.github.javaparser.resolution.types.ResolvedType;
 import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
 import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
@@ -49,7 +50,7 @@ public void testResolveArrayDeclaration() {
         VariableDeclarationExpr variableDeclarationExpr = (VariableDeclarationExpr) variableDeclarator.getParentNode().get();
         ResolvedType resolvedType = variableDeclarationExpr.calculateResolvedType();
         assertEquals("java.lang.String[]", resolvedType.describe());
-        ResolvedFieldDeclaration resolve = variableDeclarator.resolve();
-        assertEquals("java.lang.String[]", resolve.declaringType().getQualifiedName());
+        ResolvedValueDeclaration resolve = variableDeclarator.resolve();
+        assertEquals("java.lang.String[]", resolve.getType().describe());
     }
 }