giving up processing all CUs looking for a type

javaparser · Jul 15, 2018 · 300534a · 300534a
1 parent 98b30cb
commit 300534a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 22 deletions.
diff --git a/.../java/com/github/javaparser/symbolsolver/resolution/typesolvers/JavaParserTypeSolver.java b/.../java/com/github/javaparser/symbolsolver/resolution/typesolvers/JavaParserTypeSolver.java
@@ -213,8 +213,7 @@ private SymbolReference<ResolvedReferenceTypeDeclaration> tryToSolveTypeUncached
             }
 
             // If this is not possible we parse all files
-            // First we try just in the same package, for classes defined in a file not named as the class itself
-            // later we move to top directories until we get the root
+            // We try just in the same package, for classes defined in a file not named as the class itself
             {
                 List<CompilationUnit> compilationUnits = parseDirectory(srcFile.getParent());
                 for (CompilationUnit compilationUnit : compilationUnits) {
@@ -224,22 +223,6 @@ private SymbolReference<ResolvedReferenceTypeDeclaration> tryToSolveTypeUncached
                     }
                 }
             }
-
-            {
-                List<CompilationUnit> compilationUnits = parseDirectoryRecursively(srcDir);
-                for (CompilationUnit compilationUnit : compilationUnits) {
-                    if (compilationUnit.getPackageDeclaration().isPresent()) {
-                        String packageName = compilationUnit.getPackageDeclaration().get().getNameAsString();
-                        if (name.startsWith(packageName)) {
-                            String remainingName = name.substring(packageName.length() + 1);
-                            Optional<com.github.javaparser.ast.body.TypeDeclaration<?>> astTypeDeclaration = Navigator.findType(compilationUnit, remainingName);
-                            if (astTypeDeclaration.isPresent()) {
-                                return SymbolReference.solved(JavaParserFacade.get(this).getTypeDeclaration(astTypeDeclaration.get()));
-                            }
-                        }
-                    }
-                }
-            }
         }
 
         return SymbolReference.unsolved(ResolvedReferenceTypeDeclaration.class);

diff --git a/...test/java/com/github/javaparser/symbolsolver/resolution/InternalClassInInterfaceTest.java b/...test/java/com/github/javaparser/symbolsolver/resolution/InternalClassInInterfaceTest.java
@@ -26,7 +26,8 @@ public class InternalClassInInterfaceTest {
     @Test
     public void resolveFieldOfEnumAsInternalClassOfInterfaceUnqualifiedSamePackage() throws FileNotFoundException {
         File src = new File("src/test/resources/internalClassInInterface");
-        File aClass = new File(src.getPath() + File.separator + "AClass.java");
+        File aClass = new File(src.getPath() + File.separator + "foo" + File.separator+ "bar"
+                + File.separator + "AClass.java");
 
         CombinedTypeSolver localCts = new CombinedTypeSolver();
         localCts.add(new ReflectionTypeSolver());
@@ -47,7 +48,8 @@ public void resolveFieldOfEnumAsInternalClassOfInterfaceUnqualifiedSamePackage()
     @Test
     public void resolveFieldOfEnumAsInternalClassOfInterfaceQualifiedSamePackage() throws FileNotFoundException {
         File src = new File("src/test/resources/internalClassInInterface");
-        File aClass = new File(src.getPath() + File.separator + "AClass.java");
+        File aClass = new File(src.getPath() + File.separator + "foo" + File.separator+ "bar"
+                + File.separator + "AClass.java");
 
         CombinedTypeSolver localCts = new CombinedTypeSolver();
         localCts.add(new ReflectionTypeSolver());
@@ -68,7 +70,8 @@ public void resolveFieldOfEnumAsInternalClassOfInterfaceQualifiedSamePackage() t
     @Test
     public void resolveFieldOfEnumAsInternalClassOfInterfaceUnqualifiedDifferentPackage() throws FileNotFoundException {
         File src = new File("src/test/resources/internalClassInInterface");
-        File aClass = new File(src.getPath() + File.separator + "AClass2.java");
+        File aClass = new File(src.getPath() + File.separator + "foo" + File.separator+ "bar"
+                + File.separator + "differentpackage" + File.separator + "AClass2.java");
 
         CombinedTypeSolver localCts = new CombinedTypeSolver();
         localCts.add(new ReflectionTypeSolver());
@@ -89,7 +92,8 @@ public void resolveFieldOfEnumAsInternalClassOfInterfaceUnqualifiedDifferentPack
     @Test
     public void resolveFieldOfEnumAsInternalClassOfInterfaceQualifiedDifferentPackage() throws FileNotFoundException {
         File src = new File("src/test/resources/internalClassInInterface");
-        File aClass = new File(src.getPath() + File.separator + "AClass2.java");
+        File aClass = new File(src.getPath() + File.separator + "foo" + File.separator+ "bar"
+                + File.separator + "differentpackage" + File.separator + "AClass2.java");
 
         CombinedTypeSolver localCts = new CombinedTypeSolver();
         localCts.add(new ReflectionTypeSolver());

diff --git a/...rces/internalClassInInterface/AClass.java → ...ernalClassInInterface/foo/bar/AClass.java b/...rces/internalClassInInterface/AClass.java → ...ernalClassInInterface/foo/bar/AClass.java
diff --git a/...internalClassInInterface/AnInterface.java → ...ClassInInterface/foo/bar/AnInterface.java b/...internalClassInInterface/AnInterface.java → ...ClassInInterface/foo/bar/AnInterface.java
diff --git a/...ces/internalClassInInterface/AClass2.java → ...ace/foo/bar/differentpackage/AClass2.java b/...ces/internalClassInInterface/AClass2.java → ...ace/foo/bar/differentpackage/AClass2.java