Add one more field and method parsing cases

- Added 'field1.field2' where field2 is parsed also
- Added '::method' calls

Author: Bl3nd

src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/visitors/FieldAccessParser.java

@@ -4,7 +4,10 @@
 import com.github.javaparser.ast.body.CallableDeclaration;
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.resolution.UnsolvedSymbolException;
+import com.github.javaparser.resolution.types.ResolvedType;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.ClassFileContainer;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassFieldLocation;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassReferenceLocation;
 
 import java.util.Objects;
 
@@ -81,6 +84,36 @@ else if (scope instanceof EnclosedExpr)
                 printException(expr, e);
             }
         }
+        else
+        {
+            try
+            {
+                // If the scope is something like 'this.field1' and similar
+                ResolvedType resolvedType = expr.getScope().calculateResolvedType();
+                if (!resolvedType.isReferenceType())
+                    return;
+
+                String qualifiedName = resolvedType.asReferenceType().getQualifiedName();
+                String className = qualifiedName.substring(qualifiedName.lastIndexOf('.') + 1);
+                // If the class is not registered as a reference yet
+                if (container.getClassReferenceLocationsFor(className) == null)
+                {
+                    String packageName = "";
+                    if (qualifiedName.contains("."))
+                        packageName = qualifiedName.substring(0, qualifiedName.lastIndexOf('.')).replace('.', '/');
+
+                    // For this purpose, we do not care about its line, columnStart or columnEnd
+                    container.putClassReference(className, new ClassReferenceLocation(getOwner(container), packageName,
+                        fieldValue.name, "reference", -1, -1, -1));
+                }
+
+                container.putField(fieldValue.name, new ClassFieldLocation(className, "reference", fieldValue.line, fieldValue.columnStart, fieldValue.columnEnd + 1));
+            }
+            catch (Exception e)
+            {
+                printException(expr, e);
+            }
+        }
     }
 
     static void parseStatic(ClassFileContainer container, FieldAccessExpr expr)

src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/visitors/MyVoidVisitor.java

@@ -294,8 +294,8 @@ public void visit(ClassOrInterfaceDeclaration n, Object arg)
 
             ResolvedReferenceTypeDeclaration resolve = n.resolve();
             this.classFileContainer.putClassReference(resolve.getName(),
-                    new ClassReferenceLocation(getOwner(classFileContainer),
-                            resolve.getPackageName(), "", "declaration", value.line, value.columnStart, value.columnEnd + 1));
+                new ClassReferenceLocation(getOwner(classFileContainer),
+                    resolve.getPackageName(), "", "declaration", value.line, value.columnStart, value.columnEnd + 1));
         }
         catch (Exception e)
         {
@@ -344,8 +344,8 @@ public void visit(ClassOrInterfaceType n, Object arg)
                 packagePath = qualifiedName.substring(0, qualifiedName.lastIndexOf('.')).replace('.', '/');
 
             this.classFileContainer.putClassReference(classValue.name,
-                    new ClassReferenceLocation(getOwner(classFileContainer),
-                            packagePath, "", "reference", classValue.line, classValue.columnStart, classValue.columnEnd + 1));
+                new ClassReferenceLocation(getOwner(classFileContainer),
+                    packagePath, "", "reference", classValue.line, classValue.columnStart, classValue.columnEnd + 1));
         }
         catch (Exception e)
         {
@@ -470,7 +470,8 @@ public void visit(EnumDeclaration n, Object arg)
             int line = range.begin.line;
             int columnStart = range.begin.column;
             int columnEnd = range.end.column;
-            this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(classFileContainer), "declaration", line, columnStart, columnEnd + 1));
+            this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(classFileContainer), "declaration"
+                , line, columnStart, columnEnd + 1));
         });
     }
 
@@ -899,7 +900,29 @@ public void visit(MethodDeclaration n, Object arg)
     public void visit(MethodReferenceExpr n, Object arg)
     {
         super.visit(n, arg);
-        if (DEBUG) System.err.println("MethodReferenceExpr");
+        try
+        {
+            ResolvedMethodDeclaration resolve = n.resolve();
+            String signature = resolve.getQualifiedSignature();
+            String parameters = "";
+            if (resolve.getNumberOfParams() != 0)
+                parameters = signature.substring(signature.indexOf('(') + 1, signature.lastIndexOf(')'));
+
+            Range methodRange =
+                Objects.requireNonNull(n.getTokenRange().orElse(null)).getEnd().getRange().orElse(null);
+            if (methodRange == null)
+                return;
+
+            String methodName = n.getIdentifier();
+
+            String className = resolve.getClassName();
+            classFileContainer.putMethod(methodName, new ClassMethodLocation(className, signature, parameters,
+                "reference", methodRange.begin.line, methodRange.begin.column, methodRange.end.column + 1));
+        }
+        catch (Exception e)
+        {
+            printException(n, e);
+        }
     }