Skip to content

Commit f6e05d1

Browse files
committed
Fix issue javaparser#3614 UnsolvedSymbolException when package declaration contains comment
1 parent 14e64c1 commit f6e05d1

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323

2424

2525

26-
import static com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext.isQualifiedName;
27-
2826
import java.util.LinkedList;
2927
import java.util.List;
3028
import java.util.Optional;
@@ -60,6 +58,8 @@
6058
* @author Federico Tomassetti
6159
*/
6260
public class CompilationUnitContext extends AbstractJavaParserContext<CompilationUnit> {
61+
62+
private static final String DEFAULT_PACKAGE = "java.lang";
6363

6464
///
6565
/// Static methods
@@ -199,7 +199,7 @@ public SymbolReference<ResolvedTypeDeclaration> solveType(String name) {
199199

200200
// Look in current package
201201
if (this.wrappedNode.getPackageDeclaration().isPresent()) {
202-
String qName = this.wrappedNode.getPackageDeclaration().get().getName().toString() + "." + name;
202+
String qName = this.wrappedNode.getPackageDeclaration().get().getNameAsString() + "." + name;
203203
SymbolReference<ResolvedReferenceTypeDeclaration> ref = typeSolver.tryToSolveType(qName);
204204
if (ref != null && ref.isSolved()) {
205205
return SymbolReference.adapt(ref, ResolvedTypeDeclaration.class);
@@ -225,7 +225,7 @@ public SymbolReference<ResolvedTypeDeclaration> solveType(String name) {
225225
}
226226

227227
// Look in the java.lang package
228-
SymbolReference<ResolvedReferenceTypeDeclaration> ref = typeSolver.tryToSolveType("java.lang." + name);
228+
SymbolReference<ResolvedReferenceTypeDeclaration> ref = typeSolver.tryToSolveType(DEFAULT_PACKAGE+ "." + name);
229229
if (ref != null && ref.isSolved()) {
230230
return SymbolReference.adapt(ref, ResolvedTypeDeclaration.class);
231231
}

0 commit comments

Comments
 (0)