@@ -127,8 +127,7 @@ static void putLocalVariable(ClassFileContainer container, Value variable, Strin
127127 * @param scopeValue The scope value
128128 * @param fieldValue The field value
129129 */
130- static void putClassResolvedValues (ClassFileContainer container , Expression visitedExpr ,
131- Expression resolveExpr ,
130+ static void putClassResolvedValues (ClassFileContainer container , Expression visitedExpr , Expression resolveExpr ,
132131 Value scopeValue , Value fieldValue )
133132 {
134133 ResolvedType resolvedType = visitedExpr .getSymbolResolver ().calculateType (resolveExpr );
@@ -137,10 +136,12 @@ static void putClassResolvedValues(ClassFileContainer container, Expression visi
137136
138137 String qualifiedName = resolvedType .asReferenceType ().getQualifiedName ();
139138 String className = qualifiedName .substring (qualifiedName .lastIndexOf ('.' ) + 1 );
140- String packageName = qualifiedName .substring (0 , qualifiedName .lastIndexOf ('.' ));
141- container .putClassReference (className , new ClassReferenceLocation (ParserUtil .getOwner (container ),
142- packageName .replace ('.' , '/' ), fieldValue .name , "reference" , scopeValue .line , scopeValue .columnStart ,
143- scopeValue .columnEnd + 1 ));
139+ String packageName = "" ;
140+ if (qualifiedName .contains ("." ))
141+ packageName = qualifiedName .substring (0 , qualifiedName .lastIndexOf ('.' )).replace ('.' , '/' );
142+
143+ container .putClassReference (className , new ClassReferenceLocation (ParserUtil .getOwner (container ), packageName
144+ , fieldValue .name , "reference" , scopeValue .line , scopeValue .columnStart , scopeValue .columnEnd + 1 ));
144145 container .putField (fieldValue .name , new ClassFieldLocation (scopeValue .name , "reference" , fieldValue .line ,
145146 fieldValue .columnStart , fieldValue .columnEnd + 1 ));
146147 }
@@ -166,10 +167,12 @@ static void putClassResolvedValues(ClassFileContainer container, Expression visi
166167
167168 String qualifiedName = referenceType .getQualifiedName ();
168169 String className = qualifiedName .substring (qualifiedName .lastIndexOf ('.' ) + 1 );
169- String packageName = qualifiedName .substring (0 , qualifiedName .lastIndexOf ('.' ));
170- container .putClassReference (className , new ClassReferenceLocation (ParserUtil .getOwner (container ),
171- packageName .replace ('.' , '/' ), "" , "reference" , scopeValue .line , scopeValue .columnStart ,
172- scopeValue .columnEnd + 1 ));
170+ String packageName = "" ;
171+ if (qualifiedName .contains ("." ))
172+ packageName = qualifiedName .substring (0 , qualifiedName .lastIndexOf ('.' )).replace ('.' , '/' );
173+
174+ container .putClassReference (className , new ClassReferenceLocation (ParserUtil .getOwner (container ), packageName
175+ , "" , "reference" , scopeValue .line , scopeValue .columnStart , scopeValue .columnEnd + 1 ));
173176 }
174177
175178 /**
0 commit comments