From db26cd275838b0891118a949d5311983dcc63b56 Mon Sep 17 00:00:00 2001
From: Cody <6558800+Bl3nd@users.noreply.github.com>
Date: Thu, 5 Sep 2024 17:51:09 -0600
Subject: [PATCH 01/11] Start of token parsing.

---
 pom.xml                                       |   10 +
 .../gui/components/MyErrorStripe.java         |  359 ++++
 .../RSyntaxTextAreaHighlighterEx.java         |  132 ++
 .../resourceviewer/viewer/ClassViewer.java    |    3 +
 .../gui/util/BytecodeViewPanelUpdater.java    |  776 +++++----
 .../classcontainer/ClassFileContainer.java    |   92 +
 .../locations/ClassFieldLocation.java         |   29 +
 .../locations/ClassLocalVariableLocation.java |   25 +
 .../locations/ClassMethodLocation.java        |   25 +
 .../locations/ClassParameterLocation.java     |   25 +
 .../classcontainer/parser/MyVoidVisitor.java  | 1541 +++++++++++++++++
 .../classcontainer/parser/TokenUtil.java      |   28 +
 12 files changed, 2718 insertions(+), 327 deletions(-)
 create mode 100644 src/main/java/the/bytecode/club/bytecodeviewer/gui/components/MyErrorStripe.java
 create mode 100644 src/main/java/the/bytecode/club/bytecodeviewer/gui/components/RSyntaxTextAreaHighlighterEx.java
 create mode 100644 src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
 create mode 100644 src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassFieldLocation.java
 create mode 100644 src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassLocalVariableLocation.java
 create mode 100644 src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassMethodLocation.java
 create mode 100644 src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassParameterLocation.java
 create mode 100644 src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
 create mode 100644 src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/TokenUtil.java

diff --git a/pom.xml b/pom.xml
index 0a2add242..7e14e4201 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,6 +372,16 @@
             <artifactId>org.abego.treelayout.core</artifactId>
             <version>${treelayout.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.javaparser</groupId>
+            <artifactId>javaparser-core</artifactId>
+            <version>3.26.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.javaparser</groupId>
+            <artifactId>javaparser-symbol-solver-core</artifactId>
+            <version>3.26.1</version>
+        </dependency>
 
         <!-- TODO Re-add for Graal.JS support -->
         <!--<dependency>
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/MyErrorStripe.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/MyErrorStripe.java
new file mode 100644
index 000000000..ca5c6c872
--- /dev/null
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/MyErrorStripe.java
@@ -0,0 +1,359 @@
+/*
+ * BSD 3-Clause "New" or "Revised" License
+ *
+ * Copyright (c) 2021, Robert Futrell All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+ * following conditions are met:
+ * 		Redistributions of source code must retain the above copyright notice, this list of conditions and the
+ * following disclaimer.
+ *		Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+ * following disclaimer in the documentation and/or other materials provided with the distribution.
+ *		Neither the name of the author nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package the.bytecode.club.bytecodeviewer.gui.components;
+
+import org.fife.ui.rsyntaxtextarea.DocumentRange;
+import org.fife.ui.rsyntaxtextarea.ErrorStrip;
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+import org.fife.ui.rsyntaxtextarea.RSyntaxUtilities;
+import org.fife.ui.rsyntaxtextarea.parser.Parser;
+import org.fife.ui.rsyntaxtextarea.parser.ParserNotice;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.*;
+import javax.swing.text.BadLocationException;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * This is based on {@link ErrorStrip}, but with our own implementations to work with how occurrences are marked on
+ * the text area.
+ * <p>
+ * Created by Bl3nd.
+ * Date: 8/26/2024
+ */
+public class MyErrorStripe extends JPanel {
+	private final RSyntaxTextArea textArea;
+	private final transient Listener listener;
+
+	public MyErrorStripe(RSyntaxTextArea textArea) {
+		this.textArea = textArea;
+		setLayout(null);
+		listener = new Listener();
+		addMouseListener(listener);
+	}
+
+	private int lineToY(int line, Rectangle r) {
+		if (r == null)
+			r = new Rectangle();
+
+		textArea.computeVisibleRect(r);
+		int h = r.height;
+		float lineCount = textArea.getLineCount();
+		int lineHeight = textArea.getLineHeight();
+		int linesPerVisibleRect = h / lineHeight;
+		return Math.round((h - 1) * line / Math.max(lineCount, linesPerVisibleRect));
+	}
+
+	private int yToLine(int y) {
+		int line = -1;
+		int h = textArea.getVisibleRect().height;
+		int lineHeight = textArea.getLineHeight();
+		int linesPerVisibleRect = h / lineHeight;
+		int lineCount = textArea.getLineCount();
+		if (y < h) {
+			float at = y / (float) h;
+			line = Math.round((Math.max(lineCount, linesPerVisibleRect) - 1) * at);
+		}
+
+		return line;
+	}
+
+	private void paintParserNoticeMarker(Graphics2D g, ParserNotice notice, int width, int height) {
+		Color borderColor = notice.getColor();
+		if (borderColor == null)
+			borderColor = Color.BLACK;
+
+		Color fillColor = borderColor.brighter();
+		g.setColor(fillColor);
+		g.fillRect(0, 0, width, height);
+
+		g.setColor(borderColor);
+		g.drawRect(0, 0, width - 1, height - 1);
+	}
+
+	public void refreshMarkers() {
+		removeAll();
+		Map<Integer, Marker> markerMap = new HashMap<>();
+		List<DocumentRange> occurrences = textArea.getMarkedOccurrences();
+		addMarkersForRanges(occurrences, markerMap, textArea.getMarkOccurrencesColor());
+		revalidate();
+		repaint();
+	}
+
+	private void addMarkersForRanges(List<DocumentRange> occurrences, Map<Integer, Marker> markerMap, Color color) {
+		for (DocumentRange range : occurrences) {
+			int line;
+			try {
+				line = textArea.getLineOfOffset(range.getStartOffset());
+			} catch (BadLocationException e) {
+				continue;
+			}
+
+			ParserNotice notice = new MarkedOccurrenceNotice(range, color);
+			Integer key = line;
+			Marker m = markerMap.get(key);
+			if (m == null) {
+				m = new Marker(notice);
+				m.addMouseListener(listener);
+				markerMap.put(key, m);
+				add(m);
+			} else {
+				if (!m.containsMarkedOccurrence())
+					m.addNotice(notice);
+			}
+		}
+	}
+
+	@Override
+	public void updateUI() {
+		super.updateUI();
+	}
+
+	@Override
+	protected void paintComponent(Graphics g) {
+		super.paintComponent(g);
+	}
+
+	@Override
+	protected void paintChildren(Graphics g) {
+		super.paintChildren(g);
+	}
+
+	@Override
+	public Dimension getPreferredSize() {
+		return new Dimension(14, textArea.getPreferredScrollableViewportSize().height);
+	}
+
+	@Override
+	public void doLayout() {
+		for (int i = 0; i < getComponentCount(); i++) {
+			Marker m = (Marker) getComponent(i);
+			m.updateLocation();
+		}
+	}
+
+	@Override
+	public void addNotify() {
+		super.addNotify();
+		refreshMarkers();
+	}
+
+	@Override
+	public void removeNotify() {
+		super.removeNotify();
+	}
+
+	private class Listener extends MouseAdapter {
+		private final Rectangle r = new Rectangle();
+
+		@Override
+		public void mouseClicked(@NotNull MouseEvent e) {
+			Component source = (Component) e.getSource();
+			if (source instanceof MyErrorStripe.Marker) {
+				Marker m = (Marker) source;
+				m.mouseClicked(e);
+				return;
+			}
+
+			int line = yToLine(e.getY());
+			if (line > -1) {
+				try {
+					int offset = textArea.getLineOfOffset(line);
+					textArea.setCaretPosition(offset);
+					RSyntaxUtilities.selectAndPossiblyCenter(textArea, new DocumentRange(offset, offset), false);
+				} catch (BadLocationException exception) {
+					UIManager.getLookAndFeel().provideErrorFeedback(textArea);
+				}
+			}
+		}
+	}
+
+	private class MarkedOccurrenceNotice implements ParserNotice {
+		private final DocumentRange range;
+		private final Color color;
+
+		MarkedOccurrenceNotice(DocumentRange range, Color color) {
+			this.range = range;
+			this.color = color;
+		}
+
+		@Override
+		public boolean containsPosition(int pos) {
+			return pos >= range.getStartOffset() && pos < range.getEndOffset();
+		}
+
+		@Override
+		public Color getColor() {
+			return color;
+		}
+
+		@Override
+		public int getLength() {
+			return range.getEndOffset() - range.getStartOffset();
+		}
+
+		@Override
+		public Level getLevel() {
+			return Level.INFO;
+		}
+
+		@Override
+		public int getLine() {
+			try {
+				return textArea.getLineOfOffset(range.getStartOffset()) + 1;
+			} catch (BadLocationException e) {
+				return 0;
+			}
+		}
+
+		@Override
+		public boolean getKnowsOffsetAndLength() {
+			return false;
+		}
+
+		@Contract(pure = true)
+		@Override
+		public @NotNull String getMessage() {
+			return "";
+		}
+
+		@Override
+		public int getOffset() {
+			return range.getStartOffset();
+		}
+
+		@Override
+		public Parser getParser() {
+			return null;
+		}
+
+		@Override
+		public boolean getShowInEditor() {
+			return false;
+		}
+
+		@Override
+		public String getToolTipText() {
+			return null;
+		}
+
+		@Override
+		public int compareTo(@NotNull ParserNotice o) {
+			return 0;
+		}
+
+		@Override
+		public int hashCode() {
+			return 0;
+		}
+	}
+
+	private static final int MARKER_HEIGHT = 3;
+
+	private class Marker extends JComponent {
+		private final java.util.List<ParserNotice> notices;
+
+		Marker(ParserNotice notice) {
+			notices = new ArrayList<>();
+			addNotice(notice);
+			setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+			setSize(getPreferredSize());
+		}
+
+		private void addNotice(ParserNotice notice) {
+			notices.add(notice);
+		}
+
+		@Contract(value = " -> new", pure = true)
+		@Override
+		public @NotNull Dimension getPreferredSize() {
+			return new Dimension(12, MARKER_HEIGHT);
+		}
+
+		@Override
+		protected void paintComponent(Graphics g) {
+			final ParserNotice notice = getHighestPriorityNotice();
+			if (notice != null)
+				paintParserNoticeMarker((Graphics2D) g, notice, getWidth(), getHeight());
+		}
+
+		protected void mouseClicked(MouseEvent e) {
+			ParserNotice pn = notices.get(0);
+			int offs = pn.getOffset();
+			int len = pn.getLength();
+			if (offs > -1 && len > -1) // These values are optional
+			{
+				DocumentRange range = new DocumentRange(offs, offs + len);
+				RSyntaxUtilities.selectAndPossiblyCenter(textArea, range, true);
+			} else {
+				int line = pn.getLine();
+				try {
+					offs = textArea.getLineStartOffset(line);
+					textArea.getFoldManager().ensureOffsetNotInClosedFold(offs);
+					textArea.setCaretPosition(offs);
+				} catch (BadLocationException ble) // Never happens
+				{
+					UIManager.getLookAndFeel().provideErrorFeedback(textArea);
+				}
+			}
+		}
+
+		public boolean containsMarkedOccurrence() {
+			boolean result = false;
+			for (ParserNotice notice : notices) {
+				if (notice instanceof MarkedOccurrenceNotice) {
+					result = true;
+					break;
+				}
+			}
+
+			return result;
+		}
+
+		public ParserNotice getHighestPriorityNotice() {
+			ParserNotice selectedNotice = null;
+			int lowestLevel = Integer.MAX_VALUE;
+			for (ParserNotice notice : notices) {
+				if (notice.getLevel().getNumericValue() < lowestLevel) {
+					lowestLevel = notice.getLevel().getNumericValue();
+					selectedNotice = notice;
+				}
+			}
+
+			return selectedNotice;
+		}
+
+		public void updateLocation() {
+			int line = notices.get(0).getLine();
+			int y = lineToY(line - 1, null);
+			setLocation(2, y);
+		}
+	}
+}
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/RSyntaxTextAreaHighlighterEx.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/RSyntaxTextAreaHighlighterEx.java
new file mode 100644
index 000000000..55e21faf0
--- /dev/null
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/RSyntaxTextAreaHighlighterEx.java
@@ -0,0 +1,132 @@
+/*
+ * BSD 3-Clause "New" or "Revised" License
+ *
+ * Copyright (c) 2021, Robert Futrell All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+ * following conditions are met:
+ * 		Redistributions of source code must retain the above copyright notice, this list of conditions and the
+ * following disclaimer.
+ *		Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+ * following disclaimer in the documentation and/or other materials provided with the distribution.
+ *		Neither the name of the author nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package the.bytecode.club.bytecodeviewer.gui.components;
+
+import org.fife.ui.rsyntaxtextarea.DocumentRange;
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
+import org.fife.ui.rsyntaxtextarea.parser.ParserNotice;
+import org.fife.ui.rtextarea.SmartHighlightPainter;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.*;
+import javax.swing.plaf.TextUI;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
+import javax.swing.text.JTextComponent;
+import javax.swing.text.View;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Extension from RSyntaxTextArea
+ */
+public class RSyntaxTextAreaHighlighterEx extends RSyntaxTextAreaHighlighter
+{
+	private final List<SyntaxLayeredHighlightInfoImpl> markedOccurrences = new ArrayList<>();
+	private static final Color DEFAULT_PARSER_NOTICE_COLOR = Color.RED;
+
+	public Object addMarkedOccurrenceHighlight(int start, int end, @NotNull SmartHighlightPainter p) throws BadLocationException
+	{
+		Document doc = textArea.getDocument();
+		TextUI mapper = textArea.getUI();
+		// Always layered highlights for marked occurrences.
+		SyntaxLayeredHighlightInfoImpl i = new SyntaxLayeredHighlightInfoImpl();
+		p.setPaint(UIManager.getColor("ScrollBar.thumb"));
+		i.setPainter(p);
+		i.setStartOffset(doc.createPosition(start));
+		// HACK: Use "end-1" to prevent chars the user types at the "end" of
+		// the highlight to be absorbed into the highlight (default Highlight
+		// behavior).
+		i.setEndOffset(doc.createPosition(end - 1));
+		markedOccurrences.add(i);
+		mapper.damageRange(textArea, start, end);
+		return i;
+	}
+
+	@Override
+	public List<DocumentRange> getMarkedOccurrences()
+	{
+		List<DocumentRange> list = new ArrayList<>(markedOccurrences.size());
+		for (HighlightInfo info : markedOccurrences)
+		{
+			int start = info.getStartOffset();
+			int end = info.getEndOffset() + 1; // HACK
+			if (start <= end)
+			{
+				// Occasionally a Marked Occurrence can have a lost end offset
+				// but not start offset (replacing entire text content with
+				// new content, and a marked occurrence is on the last token
+				// in the document).
+				DocumentRange range = new DocumentRange(start, end);
+				list.add(range);
+			}
+		}
+
+		return list;
+	}
+
+	public void clearMarkOccurrencesHighlights()
+	{
+		// Don't remove via an iterator; since our List is an ArrayList, this
+		// implies tons of System.arrayCopy()s
+		for (HighlightInfo info : markedOccurrences)
+		{
+			repaintListHighlight(info);
+		}
+
+		markedOccurrences.clear();
+	}
+
+	@Override
+	public void paintLayeredHighlights(Graphics g, int lineStart, int lineEnd, Shape viewBounds, JTextComponent editor, View view)
+	{
+		paintListLayered(g, lineStart, lineEnd, viewBounds, editor, view, markedOccurrences);
+		super.paintLayeredHighlights(g, lineStart, lineEnd, viewBounds, editor, view);
+	}
+
+	private static class SyntaxLayeredHighlightInfoImpl extends LayeredHighlightInfoImpl
+	{
+		private ParserNotice notice;
+
+		@Override
+		public Color getColor()
+		{
+			Color color = null;
+			if (notice != null)
+			{
+				color = notice.getColor();
+				if (color == null)
+					color = DEFAULT_PARSER_NOTICE_COLOR;
+			}
+
+			return color;
+		}
+
+		@Override
+		public String toString()
+		{
+			return "[SyntaxLayeredHighlightInfoImpl: startOffs=" + getStartOffset() + ", endOffs=" + getEndOffset() + ", color=" + getColor() + "]";
+		}
+	}
+}
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/viewer/ClassViewer.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/viewer/ClassViewer.java
index 5da208514..23c467d7d 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/viewer/ClassViewer.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/viewer/ClassViewer.java
@@ -27,6 +27,7 @@
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.BytecodeViewPanel;
 import the.bytecode.club.bytecodeviewer.resources.Resource;
 import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.ClassFileContainer;
 import the.bytecode.club.bytecodeviewer.util.MethodParser;
 
 import javax.swing.*;
@@ -37,6 +38,7 @@
 import java.awt.event.HierarchyEvent;
 import java.awt.event.HierarchyListener;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 import static the.bytecode.club.bytecodeviewer.util.MethodParser.Method;
@@ -57,6 +59,7 @@ public class ClassViewer extends ResourceViewer
 	public BytecodeViewPanel bytecodeViewPanel2 = new BytecodeViewPanel(1, this);
 	public BytecodeViewPanel bytecodeViewPanel3 = new BytecodeViewPanel(2, this);
 	public List<MethodParser> methods = Arrays.asList(new MethodParser(), new MethodParser(), new MethodParser());
+	public HashMap<String, ClassFileContainer> classFiles = new HashMap<>();
 	
 	public ClassViewer(ResourceContainer container, String name)
 	{
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
index ac447fbc4..48922c622 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
@@ -18,7 +18,7 @@
 
 package the.bytecode.club.bytecodeviewer.gui.util;
 
-import java.awt.BorderLayout;
+import java.awt.*;
 import java.util.Objects;
 import java.util.regex.Matcher;
 import javax.swing.JButton;
@@ -30,21 +30,26 @@
 import javax.swing.event.CaretListener;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Element;
 
-import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
-import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
-import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
-import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
+import org.fife.ui.rsyntaxtextarea.*;
+import org.fife.ui.rtextarea.SmartHighlightPainter;
 import org.objectweb.asm.ClassWriter;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Configuration;
 import the.bytecode.club.bytecodeviewer.compilers.Compiler;
 import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
 import the.bytecode.club.bytecodeviewer.gui.components.MethodsRenderer;
+import the.bytecode.club.bytecodeviewer.gui.components.MyErrorStripe;
+import the.bytecode.club.bytecodeviewer.gui.components.RSyntaxTextAreaHighlighterEx;
 import the.bytecode.club.bytecodeviewer.gui.components.SearchableRSyntaxTextArea;
 import the.bytecode.club.bytecodeviewer.gui.hexviewer.HexViewer;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.BytecodeViewPanel;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ClassViewer;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.ClassFileContainer;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassFieldLocation;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.parser.TokenUtil;
 import the.bytecode.club.bytecodeviewer.util.MethodParser;
 
 import static the.bytecode.club.bytecodeviewer.gui.resourceviewer.TabbedPane.BLANK_COLOR;
@@ -61,326 +66,443 @@
 
 public class BytecodeViewPanelUpdater implements Runnable
 {
-    public final ClassViewer viewer;
-    public final BytecodeViewPanel bytecodeViewPanel;
-    private final JButton button;
-    private final byte[] classBytes;
-    
-    
-    public SearchableRSyntaxTextArea updateUpdaterTextArea;
-    public JComboBox<Integer> methodsList;
-    public boolean isPanelEditable;
-    public boolean waitingFor;
-    private Thread thread;
-    
-    public BytecodeViewPanelUpdater(BytecodeViewPanel bytecodeViewPanel, ClassViewer cv, byte[] classBytes, boolean isPanelEditable, JButton button)
-    {
-        this.viewer = cv;
-        this.bytecodeViewPanel = bytecodeViewPanel;
-        this.classBytes = classBytes;
-        this.isPanelEditable = isPanelEditable;
-        this.button = button;
-        waitingFor = true;
-    }
-    
-    public void processDisplay()
-    {
-        try
-        {
-            BytecodeViewer.updateBusyStatus(true);
-        
-            if (bytecodeViewPanel.decompiler != Decompiler.NONE)
-            {
-                //hex viewer
-                if (bytecodeViewPanel.decompiler == Decompiler.HEXCODE_VIEWER)
-                {
-                    final ClassWriter cw = new ClassWriter(0);
-                    viewer.resource.getResourceClassNode().accept(cw);
-                
-                    SwingUtilities.invokeLater(() ->
-                    {
-                        final HexViewer hex = new HexViewer(cw.toByteArray());
-                        bytecodeViewPanel.add(hex);
-                    });
-                }
-                else
-                {
-                    final Decompiler decompiler = bytecodeViewPanel.decompiler;
-                
-                    //perform decompiling inside of this thread
-                    final String decompiledSource = decompiler.getDecompiler().decompileClassNode(viewer.resource.getResourceClassNode(), classBytes);
-                
-                    //set the swing components on the swing thread
-                    SwingUtilities.invokeLater(() ->
-                    {
-                        buildTextArea(decompiler, decompiledSource);
-                        waitingFor = false;
-                    });
-                
-                    //hold this thread until the swing thread has finished attaching the components
-                    while (waitingFor)
-                    {
-                        try {
-                            Thread.sleep(1);
-                        } catch (Exception ignored) {}
-                    }
-                }
-            }
-        }
-        catch (IndexOutOfBoundsException | NullPointerException e)
-        {
-            //ignore
-        }
-        catch (Exception e)
-        {
-            BytecodeViewer.handleException(e);
-        }
-        finally
-        {
-            viewer.resetDivider();
-            BytecodeViewer.updateBusyStatus(false);
-            SwingUtilities.invokeLater(() ->
-            {
-                if (button != null)
-                    button.setEnabled(true);
-            });
-        }
-    }
-    
-    public void startNewThread()
-    {
-        thread = new Thread(this, "Pane Update");
-        thread.start();
-    }
-
-    @Override
-    public void run()
-    {
-        if(bytecodeViewPanel.decompiler == Decompiler.NONE)
-            return;
-        
-        processDisplay();
-    
-        if(bytecodeViewPanel.decompiler == Decompiler.HEXCODE_VIEWER)
-            return;
-        
-        //nullcheck broken pane
-        if(updateUpdaterTextArea == null || updateUpdaterTextArea.getScrollPane() == null
-                || updateUpdaterTextArea.getScrollPane().getViewport() == null)
-        {
-            //build an error message
-            SwingUtilities.invokeLater(() ->
-                    buildTextArea(bytecodeViewPanel.decompiler, "Critical BCV Error"));
-            return;
-        }
-        
-        //this still freezes the swing UI
-        synchronizePane();
-    }
-
-    public final CaretListener caretListener = new CaretListener()
-    {
-        @Override
-        public void caretUpdate(CaretEvent e)
-        {
-            MethodParser methods = viewer.methods.get(bytecodeViewPanel.panelIndex);
-            if (methods != null)
-            {
-                int methodLine = methods.findActiveMethod(updateUpdaterTextArea.getCaretLineNumber());
-                
-                if (methodLine != -1) {
-                    if (BytecodeViewer.viewer.showClassMethods.isSelected()) {
-                        if (methodsList != null) {
-                            if (methodLine != (int) Objects.requireNonNull(methodsList.getSelectedItem())) {
-                                methodsList.setSelectedItem(methodLine);
-                            }
-                        }
-                    }
-                    if (BytecodeViewer.viewer.synchronizedViewing.isSelected()) {
-                        int panes = 2;
-                        if (viewer.bytecodeViewPanel3 != null)
-                            panes = 3;
-
-                        for (int i = 0; i < panes; i++) {
-                            if (i != bytecodeViewPanel.panelIndex) {
-                                ClassViewer.selectMethod(viewer, i, methods.getMethod(methodLine));
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    };
-
-    public final ChangeListener viewportListener = new ChangeListener() {
-        @Override
-        public void stateChanged(ChangeEvent e) {
-            int panes = 2;
-            if (viewer.bytecodeViewPanel3 != null)
-                panes = 3;
-
-            if (BytecodeViewer.viewer.synchronizedViewing.isSelected()) {
-                if (updateUpdaterTextArea.isShowing() && (updateUpdaterTextArea.hasFocus() || updateUpdaterTextArea.getMousePosition() != null)) {
-                    int caretLine = updateUpdaterTextArea.getCaretLineNumber();
-                    int maxViewLine = ClassViewer.getMaxViewLine(updateUpdaterTextArea);
-                    int activeViewLine = ClassViewer.getViewLine(updateUpdaterTextArea);
-                    int activeLine = (activeViewLine == maxViewLine && caretLine > maxViewLine) ? caretLine :
-                            activeViewLine;
-                    int activeLineDelta = -1;
-                    MethodParser.Method activeMethod = null;
-                    MethodParser activeMethods = viewer.methods.get(bytecodeViewPanel.panelIndex);
-                    if (activeMethods != null) {
-                        int activeMethodLine = activeMethods.findActiveMethod(activeLine);
-                        if (activeMethodLine != -1) {
-                            activeLineDelta = activeLine - activeMethodLine;
-                            activeMethod = activeMethods.getMethod(activeMethodLine);
-                            ClassViewer.selectMethod(updateUpdaterTextArea, activeMethodLine);
-                        }
-                    }
-                    for (int i = 0; i < panes; i++) {
-                        if (i != bytecodeViewPanel.panelIndex) {
-                            int setLine = -1;
-
-                            RSyntaxTextArea area = null;
-                            switch (i) {
-                            case 0:
-                                area = viewer.bytecodeViewPanel1.updateThread.updateUpdaterTextArea;
-                                break;
-                            case 1:
-                                area = viewer.bytecodeViewPanel2.updateThread.updateUpdaterTextArea;
-                                break;
-                            case 2:
-                                area = viewer.bytecodeViewPanel3.updateThread.updateUpdaterTextArea;
-                                break;
-                            }
-
-                            if (area != null) {
-                                if (activeMethod != null && activeLineDelta >= 0) {
-                                    MethodParser methods = viewer.methods.get(i);
-                                    if (methods != null) {
-                                        int methodLine = methods.findMethod(activeMethod);
-                                        if (methodLine != -1) {
-                                            int viewLine = ClassViewer.getViewLine(area);
-                                            if (activeLineDelta != viewLine - methodLine) {
-                                                setLine = methodLine + activeLineDelta;
-                                            }
-                                        }
-                                    }
-                                } else if (activeLine != ClassViewer.getViewLine(area)) {
-                                    setLine = activeLine;
-                                }
-                                if (setLine >= 0) {
-                                    ClassViewer.setViewLine(area, setLine);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    };
-    
-    public void synchronizePane()
-    {
-        if(bytecodeViewPanel.decompiler == Decompiler.HEXCODE_VIEWER
-                || bytecodeViewPanel.decompiler == Decompiler.NONE)
-            return;
-        
-        SwingUtilities.invokeLater(()->
-        {
-            JViewport viewport = updateUpdaterTextArea.getScrollPane().getViewport();
-            viewport.addChangeListener(viewportListener);
-            updateUpdaterTextArea.addCaretListener(caretListener);
-        });
-        
-        final MethodParser methods = viewer.methods.get(bytecodeViewPanel.panelIndex);
-        for (int i = 0; i < updateUpdaterTextArea.getLineCount(); i++)
-        {
-            String lineText = updateUpdaterTextArea.getLineText(i);
-            Matcher regexMatcher = MethodParser.regex.matcher(lineText);
-            if (regexMatcher.find())
-            {
-                String methodName = regexMatcher.group("name");
-                String methodParams = regexMatcher.group("params");
-                methods.addMethod(i, methodName, methodParams);
-            }
-        }
-
-        //TODO fix this
-        if (BytecodeViewer.viewer.showClassMethods.isSelected())
-        {
-            if (!methods.isEmpty())
-            {
-                methodsList = new JComboBox<>();
-                
-                for (Integer line : methods.getMethodsLines())
-                    methodsList.addItem(line);
-                
-                methodsList.setRenderer(new MethodsRenderer(this));
-                methodsList.addActionListener(e ->
-                {
-                    int line = (int) Objects.requireNonNull(methodsList.getSelectedItem());
-
-                    RSyntaxTextArea area = null;
-                    switch (bytecodeViewPanel.panelIndex)
-                    {
-                        case 0:
-                            area = viewer.bytecodeViewPanel1.updateThread.updateUpdaterTextArea;
-                            break;
-                        case 1:
-                            area = viewer.bytecodeViewPanel2.updateThread.updateUpdaterTextArea;
-                            break;
-                        case 2:
-                            area = viewer.bytecodeViewPanel3.updateThread.updateUpdaterTextArea;
-                            break;
-                    }
-
-                    if (area != null)
-                        ClassViewer.selectMethod(area, line);
-                });
-
-                JPanel panel = new JPanel(new BorderLayout());
-                panel.add(updateUpdaterTextArea.getScrollPane().getColumnHeader().getComponent(0), BorderLayout.NORTH);
-                panel.add(methodsList, BorderLayout.SOUTH);
-                methodsList.setBackground(BLANK_COLOR);
-    
-                SwingUtilities.invokeLater(()->
-                {
-                    updateUpdaterTextArea.getScrollPane().getColumnHeader().removeAll();
-                    updateUpdaterTextArea.getScrollPane().getColumnHeader().add(panel);
-                });
-            }
-        }
-    }
-    
-    public void buildTextArea(Decompiler decompiler, String decompiledSource)
-    {
-        updateUpdaterTextArea = new SearchableRSyntaxTextArea();
-        
-        Configuration.rstaTheme.apply(updateUpdaterTextArea);
-        bytecodeViewPanel.add(updateUpdaterTextArea.getScrollPane());
-        bytecodeViewPanel.add(updateUpdaterTextArea.getTitleHeader(), BorderLayout.NORTH);
-        
-        bytecodeViewPanel.textArea = updateUpdaterTextArea;
-        if (bytecodeViewPanel.decompiler != Decompiler.BYTECODE_DISASSEMBLER) {
-            bytecodeViewPanel.textArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
-        } else {
-            AbstractTokenMakerFactory tokenMakerFactory = (AbstractTokenMakerFactory) TokenMakerFactory.getDefaultInstance();
-            tokenMakerFactory.putMapping("text/javaBytecode", "the.bytecode.club.bytecodeviewer.decompilers.bytecode.JavaBytecodeTokenMaker");
-            bytecodeViewPanel.textArea.setSyntaxEditingStyle("text/javaBytecode");
-        }
-        bytecodeViewPanel.textArea.setCodeFoldingEnabled(true);
-        bytecodeViewPanel.textArea.setAntiAliasingEnabled(true);
-        bytecodeViewPanel.textArea.setText(decompiledSource);
-        bytecodeViewPanel.textArea.setCaretPosition(0);
-        bytecodeViewPanel.textArea.setEditable(isPanelEditable);
-        
-        if(isPanelEditable && decompiler == Decompiler.SMALI_DISASSEMBLER)
-            bytecodeViewPanel.compiler = Compiler.SMALI_ASSEMBLER;
-        else if(isPanelEditable && decompiler == Decompiler.KRAKATAU_DISASSEMBLER)
-            bytecodeViewPanel.compiler = Compiler.KRAKATAU_ASSEMBLER;
-        
-        String editable = isPanelEditable ? " - " + EDITABLE : "";
-        bytecodeViewPanel.textArea.getTitleHeader().setText(decompiler.getDecompilerName() + editable);
-    }
+	public final ClassViewer viewer;
+	public final BytecodeViewPanel bytecodeViewPanel;
+	private final JButton button;
+	private final byte[] classBytes;
+
+	public SearchableRSyntaxTextArea updateUpdaterTextArea;
+	public JComboBox<Integer> methodsList;
+	public boolean isPanelEditable;
+	public boolean waitingFor;
+	private Thread thread;
+
+	public BytecodeViewPanelUpdater(BytecodeViewPanel bytecodeViewPanel, ClassViewer cv, byte[] classBytes, boolean isPanelEditable, JButton button)
+	{
+		this.viewer = cv;
+		this.bytecodeViewPanel = bytecodeViewPanel;
+		this.classBytes = classBytes;
+		this.isPanelEditable = isPanelEditable;
+		this.button = button;
+		waitingFor = true;
+	}
+
+	public void processDisplay()
+	{
+		try
+		{
+			BytecodeViewer.updateBusyStatus(true);
+
+			if (bytecodeViewPanel.decompiler != Decompiler.NONE)
+			{
+				//hex viewer
+				if (bytecodeViewPanel.decompiler == Decompiler.HEXCODE_VIEWER)
+				{
+					final ClassWriter cw = new ClassWriter(0);
+					viewer.resource.getResourceClassNode().accept(cw);
+
+					SwingUtilities.invokeLater(() ->
+					{
+						final HexViewer hex = new HexViewer(cw.toByteArray());
+						bytecodeViewPanel.add(hex);
+					});
+				} else
+				{
+					final Decompiler decompiler = bytecodeViewPanel.decompiler;
+
+					//perform decompiling inside of this thread
+					final String decompiledSource = decompiler.getDecompiler().decompileClassNode(viewer.resource.getResourceClassNode(), classBytes);
+
+					ClassFileContainer container = new ClassFileContainer(viewer.resource.workingName + "-" + decompiler.getDecompilerName(), decompiledSource);
+					if (!container.hasBeenParsed)
+					{
+						container.parse();
+						viewer.classFiles.put(viewer.resource.workingName + "-" + decompiler.getDecompilerName(), container);
+					}
+
+					//set the swing components on the swing thread
+					SwingUtilities.invokeLater(() ->
+					{
+						buildTextArea(decompiler, decompiledSource);
+						waitingFor = false;
+					});
+
+					//hold this thread until the swing thread has finished attaching the components
+					while (waitingFor)
+					{
+						try
+						{
+							Thread.sleep(1);
+						} catch (Exception ignored)
+						{
+						}
+					}
+				}
+			}
+		} catch (IndexOutOfBoundsException | NullPointerException e)
+		{
+			//ignore
+		} catch (Exception e)
+		{
+			BytecodeViewer.handleException(e);
+		} finally
+		{
+			viewer.resetDivider();
+			BytecodeViewer.updateBusyStatus(false);
+			SwingUtilities.invokeLater(() ->
+			{
+				if (button != null)
+					button.setEnabled(true);
+			});
+		}
+	}
+
+	public void startNewThread()
+	{
+		thread = new Thread(this, "Pane Update");
+		thread.start();
+	}
+
+	@Override
+	public void run()
+	{
+		if (bytecodeViewPanel.decompiler == Decompiler.NONE)
+			return;
+
+		processDisplay();
+
+		if (bytecodeViewPanel.decompiler == Decompiler.HEXCODE_VIEWER)
+			return;
+
+		//nullcheck broken pane
+		if (updateUpdaterTextArea == null || updateUpdaterTextArea.getScrollPane() == null
+				|| updateUpdaterTextArea.getScrollPane().getViewport() == null)
+		{
+			//build an error message
+			SwingUtilities.invokeLater(() ->
+					buildTextArea(bytecodeViewPanel.decompiler, "Critical BCV Error"));
+			return;
+		}
+
+		//this still freezes the swing UI
+		synchronizePane();
+	}
+
+	public final CaretListener caretListener = new CaretListener()
+	{
+		@Override
+		public void caretUpdate(CaretEvent e)
+		{
+			MethodParser methods = viewer.methods.get(bytecodeViewPanel.panelIndex);
+			if (methods != null)
+			{
+				int methodLine = methods.findActiveMethod(updateUpdaterTextArea.getCaretLineNumber());
+
+				if (methodLine != -1)
+				{
+					if (BytecodeViewer.viewer.showClassMethods.isSelected())
+					{
+						if (methodsList != null)
+						{
+							if (methodLine != (int) Objects.requireNonNull(methodsList.getSelectedItem()))
+							{
+								methodsList.setSelectedItem(methodLine);
+							}
+						}
+					}
+					if (BytecodeViewer.viewer.synchronizedViewing.isSelected())
+					{
+						int panes = 2;
+						if (viewer.bytecodeViewPanel3 != null)
+							panes = 3;
+
+						for (int i = 0; i < panes; i++)
+						{
+							if (i != bytecodeViewPanel.panelIndex)
+							{
+								ClassViewer.selectMethod(viewer, i, methods.getMethod(methodLine));
+							}
+						}
+					}
+				}
+			}
+		}
+	};
+
+	public final ChangeListener viewportListener = new ChangeListener()
+	{
+		@Override
+		public void stateChanged(ChangeEvent e)
+		{
+			int panes = 2;
+			if (viewer.bytecodeViewPanel3 != null)
+				panes = 3;
+
+			if (BytecodeViewer.viewer.synchronizedViewing.isSelected())
+			{
+				if (updateUpdaterTextArea.isShowing() && (updateUpdaterTextArea.hasFocus() || updateUpdaterTextArea.getMousePosition() != null))
+				{
+					int caretLine = updateUpdaterTextArea.getCaretLineNumber();
+					int maxViewLine = ClassViewer.getMaxViewLine(updateUpdaterTextArea);
+					int activeViewLine = ClassViewer.getViewLine(updateUpdaterTextArea);
+					int activeLine = (activeViewLine == maxViewLine && caretLine > maxViewLine) ? caretLine :
+							activeViewLine;
+					int activeLineDelta = -1;
+					MethodParser.Method activeMethod = null;
+					MethodParser activeMethods = viewer.methods.get(bytecodeViewPanel.panelIndex);
+					if (activeMethods != null)
+					{
+						int activeMethodLine = activeMethods.findActiveMethod(activeLine);
+						if (activeMethodLine != -1)
+						{
+							activeLineDelta = activeLine - activeMethodLine;
+							activeMethod = activeMethods.getMethod(activeMethodLine);
+							ClassViewer.selectMethod(updateUpdaterTextArea, activeMethodLine);
+						}
+					}
+					for (int i = 0; i < panes; i++)
+					{
+						if (i != bytecodeViewPanel.panelIndex)
+						{
+							int setLine = -1;
+
+							RSyntaxTextArea area = null;
+							switch (i)
+							{
+								case 0:
+									area = viewer.bytecodeViewPanel1.updateThread.updateUpdaterTextArea;
+									break;
+								case 1:
+									area = viewer.bytecodeViewPanel2.updateThread.updateUpdaterTextArea;
+									break;
+								case 2:
+									area = viewer.bytecodeViewPanel3.updateThread.updateUpdaterTextArea;
+									break;
+							}
+
+							if (area != null)
+							{
+								if (activeMethod != null && activeLineDelta >= 0)
+								{
+									MethodParser methods = viewer.methods.get(i);
+									if (methods != null)
+									{
+										int methodLine = methods.findMethod(activeMethod);
+										if (methodLine != -1)
+										{
+											int viewLine = ClassViewer.getViewLine(area);
+											if (activeLineDelta != viewLine - methodLine)
+											{
+												setLine = methodLine + activeLineDelta;
+											}
+										}
+									}
+								} else if (activeLine != ClassViewer.getViewLine(area))
+								{
+									setLine = activeLine;
+								}
+								if (setLine >= 0)
+								{
+									ClassViewer.setViewLine(area, setLine);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	};
+
+	public void synchronizePane()
+	{
+		if (bytecodeViewPanel.decompiler == Decompiler.HEXCODE_VIEWER
+				|| bytecodeViewPanel.decompiler == Decompiler.NONE)
+			return;
+
+		SwingUtilities.invokeLater(() ->
+		{
+			JViewport viewport = updateUpdaterTextArea.getScrollPane().getViewport();
+			viewport.addChangeListener(viewportListener);
+			updateUpdaterTextArea.addCaretListener(caretListener);
+		});
+
+		final MethodParser methods = viewer.methods.get(bytecodeViewPanel.panelIndex);
+		for (int i = 0; i < updateUpdaterTextArea.getLineCount(); i++)
+		{
+			String lineText = updateUpdaterTextArea.getLineText(i);
+			Matcher regexMatcher = MethodParser.regex.matcher(lineText);
+			if (regexMatcher.find())
+			{
+				String methodName = regexMatcher.group("name");
+				String methodParams = regexMatcher.group("params");
+				methods.addMethod(i, methodName, methodParams);
+			}
+		}
+
+		//TODO fix this
+		if (BytecodeViewer.viewer.showClassMethods.isSelected())
+		{
+			if (!methods.isEmpty())
+			{
+				methodsList = new JComboBox<>();
+
+				for (Integer line : methods.getMethodsLines())
+					methodsList.addItem(line);
+
+				methodsList.setRenderer(new MethodsRenderer(this));
+				methodsList.addActionListener(e ->
+				{
+					int line = (int) Objects.requireNonNull(methodsList.getSelectedItem());
+
+					RSyntaxTextArea area = null;
+					switch (bytecodeViewPanel.panelIndex)
+					{
+						case 0:
+							area = viewer.bytecodeViewPanel1.updateThread.updateUpdaterTextArea;
+							break;
+						case 1:
+							area = viewer.bytecodeViewPanel2.updateThread.updateUpdaterTextArea;
+							break;
+						case 2:
+							area = viewer.bytecodeViewPanel3.updateThread.updateUpdaterTextArea;
+							break;
+					}
+
+					if (area != null)
+						ClassViewer.selectMethod(area, line);
+				});
+
+				JPanel panel = new JPanel(new BorderLayout());
+				panel.add(updateUpdaterTextArea.getScrollPane().getColumnHeader().getComponent(0), BorderLayout.NORTH);
+				panel.add(methodsList, BorderLayout.SOUTH);
+				methodsList.setBackground(BLANK_COLOR);
+
+				SwingUtilities.invokeLater(() ->
+				{
+					updateUpdaterTextArea.getScrollPane().getColumnHeader().removeAll();
+					updateUpdaterTextArea.getScrollPane().getColumnHeader().add(panel);
+				});
+			}
+		}
+	}
+
+	public void buildTextArea(Decompiler decompiler, String decompiledSource)
+	{
+		updateUpdaterTextArea = new SearchableRSyntaxTextArea();
+
+		Configuration.rstaTheme.apply(updateUpdaterTextArea);
+		bytecodeViewPanel.add(updateUpdaterTextArea.getScrollPane());
+		bytecodeViewPanel.add(updateUpdaterTextArea.getTitleHeader(), BorderLayout.NORTH);
+
+		bytecodeViewPanel.textArea = updateUpdaterTextArea;
+
+		bytecodeViewPanel.textArea.setMarkOccurrencesColor(Color.ORANGE);
+		bytecodeViewPanel.textArea.setCursor(new Cursor(Cursor.TEXT_CURSOR));
+		bytecodeViewPanel.textArea.setHighlighter(new RSyntaxTextAreaHighlighterEx());
+
+		if (bytecodeViewPanel.decompiler != Decompiler.BYTECODE_DISASSEMBLER)
+		{
+			bytecodeViewPanel.textArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
+		} else
+		{
+			AbstractTokenMakerFactory tokenMakerFactory = (AbstractTokenMakerFactory) TokenMakerFactory.getDefaultInstance();
+			tokenMakerFactory.putMapping("text/javaBytecode", "the.bytecode.club.bytecodeviewer.decompilers.bytecode.JavaBytecodeTokenMaker");
+			bytecodeViewPanel.textArea.setSyntaxEditingStyle("text/javaBytecode");
+		}
+		bytecodeViewPanel.textArea.setCodeFoldingEnabled(true);
+		bytecodeViewPanel.textArea.setAntiAliasingEnabled(true);
+		bytecodeViewPanel.textArea.setText(decompiledSource);
+		bytecodeViewPanel.textArea.setCaretPosition(0);
+		bytecodeViewPanel.textArea.setEditable(isPanelEditable);
+
+		if (isPanelEditable && decompiler == Decompiler.SMALI_DISASSEMBLER)
+			bytecodeViewPanel.compiler = Compiler.SMALI_ASSEMBLER;
+		else if (isPanelEditable && decompiler == Decompiler.KRAKATAU_DISASSEMBLER)
+			bytecodeViewPanel.compiler = Compiler.KRAKATAU_ASSEMBLER;
+
+		String editable = isPanelEditable ? " - " + EDITABLE : "";
+		bytecodeViewPanel.textArea.getTitleHeader().setText(decompiler.getDecompilerName() + editable);
+
+		// TODO: Whenever you click on a mark, both text areas get scrolled. Also, the error strip isn't laid out correctly.
+		MyErrorStripe errorStripe = new MyErrorStripe(bytecodeViewPanel.textArea);
+		bytecodeViewPanel.add(errorStripe, BorderLayout.LINE_END);
+
+		bytecodeViewPanel.textArea.addCaretListener(e -> {
+			if (bytecodeViewPanel.textArea.isFocusOwner())
+			{
+				RSyntaxTextAreaHighlighterEx highlighterEx = (RSyntaxTextAreaHighlighterEx) bytecodeViewPanel.textArea.getHighlighter();
+				highlighterEx.clearMarkOccurrencesHighlights();
+				RSyntaxTextArea textArea = (RSyntaxTextArea) e.getSource();
+				String workingName = viewer.resource.workingName + "-" + decompiler.getDecompilerName();
+				markOccurrences(textArea, viewer.classFiles.get(workingName), errorStripe);
+			}
+		});
+	}
+
+	private void markOccurrences(RSyntaxTextArea textArea, ClassFileContainer classFileContainer, MyErrorStripe errorStripe)
+	{
+		RSyntaxTextAreaHighlighterEx highlighterEx = (RSyntaxTextAreaHighlighterEx) textArea.getHighlighter();
+		Token token = textArea.modelToToken(textArea.getCaretPosition() - 1);
+		if (token == null || token.getLexeme().equals(";"))
+		{
+			highlighterEx.clearMarkOccurrencesHighlights();
+			errorStripe.refreshMarkers();
+			return;
+		}
+
+		token = TokenUtil.getToken(textArea, token);
+		if (token == null)
+		{
+			highlighterEx.clearMarkOccurrencesHighlights();
+			errorStripe.refreshMarkers();
+			return;
+		}
+
+		int line = textArea.getCaretLineNumber() + 1;
+		int column = textArea.getCaretOffsetFromLineStart();
+		Token finalToken = token;
+
+		/*
+		Fields
+		 */
+		markField(textArea, classFileContainer, line, column, finalToken, highlighterEx);
+
+		errorStripe.refreshMarkers();
+	}
+
+	private void markField(RSyntaxTextArea textArea, ClassFileContainer classFileContainer, int line, int column, Token finalToken, RSyntaxTextAreaHighlighterEx highlighterEx)
+	{
+		classFileContainer.fieldMembers.values().forEach(fields -> fields.forEach(field -> {
+			String owner;
+			if (field.line == line && field.columnStart - 1 <= column && field.columnEnd >= column)
+			{
+				owner = field.owner;
+				try
+				{
+					Element root = textArea.getDocument().getDefaultRootElement();
+					for (
+							ClassFieldLocation location :
+							classFileContainer.getFieldLocationsFor(finalToken.getLexeme())
+					)
+					{
+						if (Objects.equals(owner, location.owner))
+						{
+							int startOffset = root
+									.getElement(location.line - 1)
+									.getStartOffset() + (location.columnStart - 1);
+							int endOffset = root
+									.getElement(location.line - 1)
+									.getStartOffset() + (location.columnEnd - 1);
+							highlighterEx.addMarkedOccurrenceHighlight(
+									startOffset, endOffset, new SmartHighlightPainter()
+							);
+						}
+					}
+				} catch (BadLocationException ex)
+				{
+					throw new RuntimeException(ex);
+				}
+			}
+		}));
+	}
 }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
new file mode 100644
index 000000000..93d7a2115
--- /dev/null
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
@@ -0,0 +1,92 @@
+package the.bytecode.club.bytecodeviewer.resources.classcontainer;
+
+import com.github.javaparser.ParseProblemException;
+import com.github.javaparser.StaticJavaParser;
+import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.symbolsolver.JavaSymbolSolver;
+import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassFieldLocation;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassLocalVariableLocation;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassMethodLocation;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassParameterLocation;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.parser.MyVoidVisitor;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+/**
+ * Created by Bl3nd.
+ * Date: 8/26/2024
+ */
+public class ClassFileContainer
+{
+	public transient NavigableMap<String, ArrayList<ClassFieldLocation>> fieldMembers = new TreeMap<>();
+	public transient NavigableMap<String, ArrayList<ClassParameterLocation>> methodParameterMembers = new TreeMap<>();
+	public transient NavigableMap<String, ArrayList<ClassLocalVariableLocation>> methodLocalMembers = new TreeMap<>();
+	public transient NavigableMap<String, ArrayList<ClassMethodLocation>> methodMembers = new TreeMap<>();
+
+	public boolean hasBeenParsed = false;
+	public final String className;
+	private final String content;
+
+	public ClassFileContainer(String className, String content)
+	{
+		this.className = className;
+		this.content = content;
+	}
+
+	public void parse()
+	{
+		try
+		{
+			StaticJavaParser.getParserConfiguration().setSymbolResolver(new JavaSymbolSolver(new ReflectionTypeSolver()));
+			CompilationUnit compilationUnit = StaticJavaParser.parse(this.content);
+			compilationUnit.accept(new MyVoidVisitor(this, compilationUnit), null);
+		} catch (ParseProblemException e)
+		{
+			System.err.println("Parsing error!");
+		}
+	}
+
+	public void putField(String key, ClassFieldLocation value)
+	{
+		this.fieldMembers.computeIfAbsent(key, v -> new ArrayList<>()).add(value);
+	}
+
+	public List<ClassFieldLocation> getFieldLocationsFor(String fieldName)
+	{
+		return fieldMembers.getOrDefault(fieldName, new ArrayList<>());
+	}
+
+	public void putParameter(String key, ClassParameterLocation value)
+	{
+		this.methodParameterMembers.computeIfAbsent(key, v -> new ArrayList<>()).add(value);
+	}
+
+	public List<ClassParameterLocation> getParameterLocationsFor(String key)
+	{
+		return methodParameterMembers.getOrDefault(key, new ArrayList<>());
+	}
+
+	public void putLocalVariable(String key, ClassLocalVariableLocation value)
+	{
+		this.methodLocalMembers.computeIfAbsent(key, v -> new ArrayList<>()).add(value);
+	}
+
+	public List<ClassLocalVariableLocation> getLocalLocationsFor(String key)
+	{
+		return methodLocalMembers.getOrDefault(key, new ArrayList<>());
+	}
+
+	public void putMethod(String key, ClassMethodLocation value)
+	{
+		this.methodMembers.computeIfAbsent(key, v -> new ArrayList<>()).add(value);
+	}
+
+	public List<ClassMethodLocation> getMethodLocationsFor(String key)
+	{
+		return methodMembers.getOrDefault(key, new ArrayList<>());
+	}
+}
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassFieldLocation.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassFieldLocation.java
new file mode 100644
index 000000000..c3df1aa07
--- /dev/null
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassFieldLocation.java
@@ -0,0 +1,29 @@
+package the.bytecode.club.bytecodeviewer.resources.classcontainer.locations;
+
+/**
+ * Created by Bl3nd.
+ * Date: 8/26/2024
+ */
+public class ClassFieldLocation
+{
+	public final String owner;
+	public final String type;
+	public final int line;
+	public final int columnStart;
+	public final int columnEnd;
+
+	public ClassFieldLocation(final String owner, final String type, final int line, final int columnStart, final int columnEnd)
+	{
+		this.owner = owner;
+		this.type = type;
+		this.line = line;
+		this.columnStart = columnStart;
+		this.columnEnd = columnEnd;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "ClassFieldLocation{" + "owner='" + owner + '\'' + ", type='" + type + '\'' + ", line=" + line + ", columnStart=" + columnStart + ", columnEnd=" + columnEnd + '}';
+	}
+}
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassLocalVariableLocation.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassLocalVariableLocation.java
new file mode 100644
index 000000000..18680aed3
--- /dev/null
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassLocalVariableLocation.java
@@ -0,0 +1,25 @@
+package the.bytecode.club.bytecodeviewer.resources.classcontainer.locations;
+
+/**
+ * Created by Bl3nd.
+ * Date: 9/5/2024
+ */
+public class ClassLocalVariableLocation
+{
+	public final String owner;
+	public final String method;
+	public final String decRef;
+	public final int line;
+	public final int columnStart;
+	public final int columnEnd;
+
+	public ClassLocalVariableLocation(String owner, String method, String decRef, int line, int columnStart, int columnEnd)
+	{
+		this.owner = owner;
+		this.method = method;
+		this.decRef = decRef;
+		this.line = line;
+		this.columnStart = columnStart;
+		this.columnEnd = columnEnd;
+	}
+}
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassMethodLocation.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassMethodLocation.java
new file mode 100644
index 000000000..34b821d44
--- /dev/null
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassMethodLocation.java
@@ -0,0 +1,25 @@
+package the.bytecode.club.bytecodeviewer.resources.classcontainer.locations;
+
+/**
+ * Created by Bl3nd.
+ * Date: 9/5/2024
+ */
+public class ClassMethodLocation
+{
+	public final String owner;
+	public final String methodParameterTypes;
+	public final String decRef;
+	public final int line;
+	public final int columnStart;
+	public final int columnEnd;
+
+	public ClassMethodLocation(String owner, String methodParameterTypes, String decRef, int line, int columnStart, int columnEnd)
+	{
+		this.owner = owner;
+		this.methodParameterTypes = methodParameterTypes;
+		this.decRef = decRef;
+		this.line = line;
+		this.columnStart = columnStart;
+		this.columnEnd = columnEnd;
+	}
+}
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassParameterLocation.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassParameterLocation.java
new file mode 100644
index 000000000..d576f5d9f
--- /dev/null
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassParameterLocation.java
@@ -0,0 +1,25 @@
+package the.bytecode.club.bytecodeviewer.resources.classcontainer.locations;
+
+/**
+ * Created by Bl3nd.
+ * Date: 9/5/2024
+ */
+public class ClassParameterLocation
+{
+	public final String owner;
+	public final String method;
+	public final String decRef;
+	public final int line;
+	public final int columnStart;
+	public final int columnEnd;
+
+	public ClassParameterLocation(String owner, String method, String decRef, int line, int columnStart, int columnEnd)
+	{
+		this.owner = owner;
+		this.method = method;
+		this.decRef = decRef;
+		this.line = line;
+		this.columnStart = columnStart;
+		this.columnEnd = columnEnd;
+	}
+}
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
new file mode 100644
index 000000000..fc739480f
--- /dev/null
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
@@ -0,0 +1,1541 @@
+package the.bytecode.club.bytecodeviewer.resources.classcontainer.parser;
+
+import com.github.javaparser.Range;
+import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.body.*;
+import com.github.javaparser.ast.expr.*;
+import com.github.javaparser.ast.stmt.*;
+import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
+import com.github.javaparser.resolution.UnsolvedSymbolException;
+import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
+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.ClassLocalVariableLocation;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassMethodLocation;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassParameterLocation;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Created by Bl3nd.
+ * Date: 9/5/2024
+ */
+@SuppressWarnings("OptionalGetWithoutIsPresent")
+public class MyVoidVisitor extends VoidVisitorAdapter<Object>
+{
+	private final ClassFileContainer classFileContainer;
+	private final CompilationUnit compilationUnit;
+
+	public MyVoidVisitor(ClassFileContainer container, CompilationUnit compilationUnit)
+	{
+		this.classFileContainer = container;
+		this.compilationUnit = compilationUnit;
+	}
+
+	private String getOwner()
+	{
+		return this.classFileContainer.className.substring(this.classFileContainer.className.lastIndexOf('.') + 1);
+	}
+
+	private String getMethod(CallableDeclaration<?> method)
+	{
+		return method.getDeclarationAsString(false, false);
+	}
+
+	/**
+	 * Visit all {@link FieldDeclaration}s.
+	 * <p>
+	 * This only worries about the field that is being declared.
+	 * </p>
+	 *
+	 * @param n   The current {@code FieldDeclaration}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(FieldDeclaration n, Object arg)
+	{
+		super.visit(n, arg);
+		n.getVariables().forEach(variableDeclarator -> {
+			SimpleName name = variableDeclarator.getName();
+			String fieldName = name.getIdentifier();
+			Range range = name.getRange().get();
+			int line = range.begin.line;
+			int columnStart = range.begin.column;
+			int columnEnd = range.end.column;
+			this.classFileContainer.putField(fieldName, new ClassFieldLocation(getOwner(), "declaration", line, columnStart, columnEnd + 1));
+		});
+	}
+
+	/**
+	 * Visit all {@link FieldAccessExpr}s.
+	 * <p>
+	 * This finds the field accesses.
+	 * </p>
+	 *
+	 * @param n   The current {@code FieldAccessExpr}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(FieldAccessExpr n, Object arg)
+	{
+		super.visit(n, arg);
+		SimpleName simpleName = n.getName();
+		String fieldName = simpleName.getIdentifier();
+		Range range = n.getTokenRange().get().getEnd().getRange().get();
+		int line = range.begin.line;
+		int columnStart = range.begin.column;
+		int columnEnd = range.end.column;
+		this.classFileContainer.putField(fieldName, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+
+		if (n.hasScope())
+		{
+			CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+			if (method == null)
+			{
+				method = findConstructorForExpression(n, this.compilationUnit);
+			}
+
+			if (method != null)
+			{
+				Expression scope = n.getScope();
+				if (scope instanceof NameExpr)
+				{
+					NameExpr nameExpr = (NameExpr) scope;
+					try
+					{
+						ResolvedValueDeclaration vd = nameExpr.resolve();
+						SimpleName simpleName1 = nameExpr.getName();
+						String name1 = simpleName1.getIdentifier();
+						Range range1 = nameExpr.getRange().get();
+						int line1 = range1.begin.line;
+						int columnStart1 = range1.begin.column;
+						int columnEnd1 = range1.end.column;
+						if (vd.isField())
+						{
+							this.classFileContainer.putField(name1, new ClassFieldLocation(getOwner(), "reference", line1, columnStart1, columnEnd1 + 1));
+						} else if (vd.isVariable())
+						{
+						this.classFileContainer.putLocalVariable(name1, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line1, columnStart1, columnEnd1 + 1));
+						} else if (vd.isParameter())
+						{
+							this.classFileContainer.putParameter(name1, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line1, columnStart1, columnEnd1 + 1));
+						}
+					} catch (UnsolvedSymbolException ignore)
+					{
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Visit all {@link ConstructorDeclaration}s.
+	 * <p>
+	 * This deals with the parameters and the constructor. Not the body of the constructor.
+	 * </p>
+	 *
+	 * @param n   The current {@code ConstructorDeclaration}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(ConstructorDeclaration n, Object arg)
+	{
+		super.visit(n, arg);
+		StringBuilder parameterTypes = new StringBuilder();
+		AtomicInteger count = new AtomicInteger();
+		n.getParameters().forEach(parameter -> {
+			SimpleName name = parameter.getName();
+			String parameterName = name.getIdentifier();
+			Range range = name.getRange().get();
+			int line = range.begin.line;
+			int columnStart = range.begin.column;
+			int columnEnd = range.end.column;
+			this.classFileContainer.putParameter(parameterName, new ClassParameterLocation(getOwner(), n.getDeclarationAsString(false, false),
+					"declaration", line, columnStart, columnEnd + 1));
+			count.getAndIncrement();
+			parameterTypes.append(parameter.getTypeAsString());
+			if (n.getParameters().size() > 1 && count.get() != n.getParameters().size())
+			{
+				parameterTypes.append(", ");
+			}
+		});
+
+		SimpleName simpleName = n.getName();
+		String constructorName = simpleName.getIdentifier();
+		Range range = simpleName.getRange().get();
+		int line = range.begin.line;
+		int columnStart = range.begin.column;
+		int columnEnd = range.end.column;
+		this.classFileContainer.putMethod(constructorName, new ClassMethodLocation(getOwner(), parameterTypes.toString(), "declaration", line,
+				columnStart,
+				columnEnd + 1));
+	}
+
+	/**
+	 * Find all {@link ExplicitConstructorInvocationStmt}s.
+	 * <p>
+	 * E.g. {@code this()} or {@code this(param, ...)} and {@code super()} or {@code super(param, ...)}.
+	 * </p>
+	 *
+	 * @param n   The current {@code ExplicitConstructorInvocationStmt}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(ExplicitConstructorInvocationStmt n, Object arg)
+	{
+		super.visit(n, arg);
+		ConstructorDeclaration constructor = findConstructorForStatement(n, this.compilationUnit);
+		if (constructor != null)
+		{
+			n.getArguments().forEach(argument -> {
+				if (argument instanceof NameExpr)
+				{
+					NameExpr nameExpr = (NameExpr) argument;
+					ResolvedValueDeclaration vd = nameExpr.resolve();
+					SimpleName simpleName = nameExpr.getName();
+					String name = simpleName.getIdentifier();
+					Range range = simpleName.getRange().get();
+					int line = range.begin.line;
+					int columnStart = range.begin.column;
+					int columnEnd = range.end.column;
+					if (vd.isField())
+					{
+						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+					} else if (vd.isVariable())
+					{
+						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), constructor.getDeclarationAsString(false, false), "reference", line, columnStart,
+								columnEnd + 1));
+					} else if (vd.isParameter())
+					{
+						this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(),
+								constructor.getDeclarationAsString(false, false),
+								"reference", line, columnStart, columnEnd + 1));
+					}
+				} else
+				{
+					if ((argument instanceof LongLiteralExpr) || (argument instanceof StringLiteralExpr) || (argument instanceof CharLiteralExpr) || argument instanceof BooleanLiteralExpr || argument instanceof NullLiteralExpr || argument instanceof IntegerLiteralExpr)
+					{
+						return;
+					}
+
+					System.err.println(argument.getClass().getSimpleName());
+				}
+			});
+		}
+	}
+
+	/**
+	 * Visit all {@link MethodDeclaration}s.
+	 * <p>
+	 * This deals with the parameters and the method name.
+	 * </p>
+	 *
+	 * @param n   The current {@code MethodDeclaration}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(MethodDeclaration n, Object arg)
+	{
+		super.visit(n, arg);
+		StringBuilder parameterTypes = new StringBuilder();
+		AtomicInteger count = new AtomicInteger();
+		n.getParameters().forEach(parameter -> {
+			SimpleName name = parameter.getName();
+			String parameterName = name.getIdentifier();
+			Range range = name.getRange().get();
+			int line = range.begin.line;
+			int columnStart = range.begin.column;
+			int columnEnd = range.end.column;
+			this.classFileContainer.putParameter(parameterName, new ClassParameterLocation(getOwner(), n.getDeclarationAsString(false, false),
+					"declaration", line, columnStart, columnEnd + 1));
+			count.getAndIncrement();
+			parameterTypes.append(parameter.getTypeAsString());
+			if (n.getParameters().size() > 1 && count.get() != n.getParameters().size())
+			{
+				parameterTypes.append(", ");
+			}
+		});
+
+		SimpleName methodSimpleName = n.getName();
+		String methodName = methodSimpleName.getIdentifier();
+		Range range = methodSimpleName.getRange().get();
+		int line = range.begin.line;
+		int columnStart = range.begin.column;
+		int columnEnd = range.end.column;
+		this.classFileContainer.putMethod(methodName, new ClassMethodLocation(getOwner(), parameterTypes.toString(), "declaration", line, columnStart,
+				columnEnd + 1));
+	}
+
+	/**
+	 * Visit all {@link MethodCallExpr}s.
+	 *
+	 * @param n   The current {@code MethodCallExpr}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(MethodCallExpr n, Object arg)
+	{
+		super.visit(n, arg);
+		CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+		InitializerDeclaration staticInitializer = null;
+		if (method == null)
+		{
+			method = findConstructorForExpression(n, this.compilationUnit);
+			if (method == null)
+			{
+				staticInitializer = findInitializerForExpression(n, this.compilationUnit);
+			}
+		}
+
+		if (method != null)
+		{
+			if (n.hasScope())
+			{
+				Expression scope = n.getScope().get();
+				if (scope instanceof NameExpr)
+				{
+					NameExpr nameExpr = (NameExpr) scope;
+					try
+					{
+						ResolvedValueDeclaration vd = nameExpr.resolve();
+						SimpleName simpleName = nameExpr.getName();
+						String name = simpleName.getIdentifier();
+						Range range = simpleName.getRange().get();
+						int line = range.begin.line;
+						int columnStart = range.begin.column;
+						int columnEnd = range.end.column;
+						if (vd.isField())
+						{
+							this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+						} else if (vd.isVariable())
+						{
+							this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+						} else if (vd.isParameter())
+						{
+							this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+						}
+					} catch (UnsolvedSymbolException ignored)
+					{
+
+					}
+				}
+			}
+
+			CallableDeclaration<?> finalMethod = method;
+			n.getArguments().forEach(argument -> {
+				if (argument instanceof NameExpr)
+				{
+					NameExpr nameExpr = (NameExpr) argument;
+					ResolvedValueDeclaration vd = nameExpr.resolve();
+					SimpleName simpleName = nameExpr.getName();
+					String name = simpleName.getIdentifier();
+					Range range = simpleName.getRange().get();
+					int line = range.begin.line;
+					int columnStart = range.begin.column;
+					int columnEnd = range.end.column;
+					if (vd.isField())
+					{
+						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+					} else if (vd.isVariable())
+					{
+						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(finalMethod), "reference", line, columnStart, columnEnd + 1));
+					} else if (vd.isParameter())
+					{
+						this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(finalMethod), "reference", line, columnStart, columnEnd + 1));
+					}
+				}
+			});
+		} else if (staticInitializer != null)
+		{
+			if (n.hasScope())
+			{
+				Expression scope = n.getScope().get();
+				if (scope instanceof NameExpr)
+				{
+					NameExpr nameExpr = (NameExpr) scope;
+					try
+					{
+						ResolvedValueDeclaration vd = nameExpr.resolve();
+						SimpleName simpleName = nameExpr.getName();
+						String name = simpleName.getIdentifier();
+						Range range = simpleName.getRange().get();
+						int line = range.begin.line;
+						int columnStart = range.begin.column;
+						int columnEnd = range.end.column;
+						if (vd.isField())
+						{
+							this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+						} else if (vd.isVariable())
+						{
+							this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+						} else if (vd.isParameter())
+						{
+							this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+						}
+					} catch (UnsolvedSymbolException ignored)
+					{
+
+					}
+				}
+			}
+
+			n.getArguments().forEach(argument -> {
+				if (argument instanceof NameExpr)
+				{
+					NameExpr nameExpr = (NameExpr) argument;
+					ResolvedValueDeclaration vd = nameExpr.resolve();
+					SimpleName simpleName = nameExpr.getName();
+					String name = simpleName.getIdentifier();
+					Range range = simpleName.getRange().get();
+					int line = range.begin.line;
+					int columnStart = range.begin.column;
+					int columnEnd = range.end.column;
+					if (vd.isField())
+					{
+						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+					} else if (vd.isVariable())
+					{
+						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+					} else if (vd.isParameter())
+					{
+						this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+					}
+				}
+			});
+		}
+	}
+
+	/**
+	 * Visit all {@link ObjectCreationExpr}s.
+	 *
+	 * @param n   The current {@code ObjectCreationExpr}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(ObjectCreationExpr n, Object arg)
+	{
+		super.visit(n, arg);
+		CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+		if (method == null)
+		{
+			method = findConstructorForExpression(n, this.compilationUnit);
+		}
+
+		if (method != null)
+		{
+			CallableDeclaration<?> finalMethod = method;
+			n.getArguments().forEach(argument -> {
+				if (argument instanceof NameExpr)
+				{
+					NameExpr nameExpr = (NameExpr) argument;
+					ResolvedValueDeclaration vd = nameExpr.resolve();
+					SimpleName simpleName = nameExpr.getName();
+					String name = simpleName.getIdentifier();
+					Range range = simpleName.getRange().get();
+					int line = range.begin.line;
+					int columnStart = range.begin.column;
+					int columnEnd = range.end.column;
+					if (vd.isField())
+					{
+						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+					} else if (vd.isVariable())
+					{
+						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(finalMethod), "reference", line, columnStart, columnEnd + 1));
+					} else if (vd.isParameter())
+					{
+						this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(finalMethod), "reference", line, columnStart, columnEnd + 1));
+					}
+				}
+			});
+		}
+	}
+
+	/**
+	 * Visit all {@link VariableDeclarationExpr}s.
+	 *
+	 * @param n   The current {@code VariableDeclarationExpr}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(VariableDeclarationExpr n, Object arg)
+	{
+		super.visit(n, arg);
+		CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+		InitializerDeclaration staticInitializer = null;
+		if (method == null)
+		{
+			method = findConstructorForExpression(n, this.compilationUnit);
+			if (method == null)
+			{
+				staticInitializer = findInitializerForExpression(n, this.compilationUnit);
+			}
+		}
+
+		if (method != null)
+		{
+			CallableDeclaration<?> finalMethod = method;
+			n.getVariables().forEach(variable -> {
+				ResolvedValueDeclaration vd = variable.resolve();
+				SimpleName simpleName = variable.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(finalMethod), "declaration", line, columnStart, columnEnd + 1));
+			});
+		} else if (staticInitializer != null)
+		{
+			n.getVariables().forEach(variable -> {
+				ResolvedValueDeclaration vd = variable.resolve();
+				SimpleName simpleName = variable.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "declaration", line, columnStart, columnEnd + 1));
+			});
+		}
+	}
+
+	/**
+	 * Visit all {@link AssignExpr}s.
+	 *
+	 * @param n   The current {@code AssignExpr}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(AssignExpr n, Object arg)
+	{
+		super.visit(n, arg);
+		CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+		InitializerDeclaration staticInitializer = null;
+		if (method == null)
+		{
+			method = findConstructorForExpression(n, this.compilationUnit);
+			if (method == null)
+			{
+				staticInitializer = findInitializerForExpression(n, this.compilationUnit);
+			}
+		}
+
+		if (method != null)
+		{
+			Expression value = n.getValue();
+			if (value instanceof NameExpr)
+			{
+				NameExpr nameExpr = (NameExpr) value;
+				ResolvedValueDeclaration vd = nameExpr.resolve();
+				SimpleName simpleName = nameExpr.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				if (vd.isField())
+				{
+					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isVariable())
+				{
+					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isParameter())
+				{
+					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				}
+			}
+
+			Expression target = n.getTarget();
+			if (target instanceof NameExpr)
+			{
+				NameExpr nameExpr = (NameExpr) target;
+				try
+				{
+					ResolvedValueDeclaration vd = nameExpr.resolve();
+					SimpleName simpleName = nameExpr.getName();
+					String name = simpleName.getIdentifier();
+					Range range = simpleName.getRange().get();
+					int line = range.begin.line;
+					int columnStart = range.begin.column;
+					int columnEnd = range.end.column;
+					if (vd.isField())
+					{
+						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+					} else if (vd.isVariable())
+					{
+						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+					} else if (vd.isParameter())
+					{
+						this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+					}
+				} catch (UnsolvedSymbolException e)
+				{
+					System.err.println(nameExpr.getName().getIdentifier() + " not resolved. " + e.getMessage());
+				}
+			}
+		} else if (staticInitializer != null)
+		{
+			Expression value = n.getValue();
+			if (value instanceof NameExpr)
+			{
+				NameExpr nameExpr = (NameExpr) value;
+				ResolvedValueDeclaration vd = nameExpr.resolve();
+				SimpleName simpleName = nameExpr.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				if (vd.isField())
+				{
+					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isVariable())
+				{
+					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+				}/* else if (vd.isParameter()) {
+					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+				}*/
+			}
+
+			Expression target = n.getTarget();
+			if (target instanceof NameExpr)
+			{
+				NameExpr nameExpr = (NameExpr) target;
+				try
+				{
+					ResolvedValueDeclaration vd = nameExpr.resolve();
+					SimpleName simpleName = nameExpr.getName();
+					String name = simpleName.getIdentifier();
+					Range range = simpleName.getRange().get();
+					int line = range.begin.line;
+					int columnStart = range.begin.column;
+					int columnEnd = range.end.column;
+					if (vd.isField())
+					{
+						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+					} else if (vd.isVariable())
+					{
+						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+					}/* else if (vd.isParameter()) {
+						System.err.println("AssignExpr - parameter2");
+					}*/
+				} catch (UnsolvedSymbolException e)
+				{
+					System.err.println(nameExpr.getName().getIdentifier() + " not resolved. " + e.getMessage());
+				}
+			}
+		}
+	}
+
+	/**
+	 * Visit all {@link CatchClause}s.
+	 *
+	 * @param n   The current {@code CatchClause}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(CatchClause n, Object arg)
+	{
+		super.visit(n, arg);
+		TryStmt parentNode = (TryStmt) n.getParentNode().get();
+		CallableDeclaration<?> method = findMethodForStatement(parentNode, this.compilationUnit);
+		if (method == null)
+		{
+			method = findConstructorForStatement(parentNode, this.compilationUnit);
+		}
+
+		if (method != null)
+		{
+			SimpleName simpleName = n.getParameter().getName();
+			String name = simpleName.getIdentifier();
+			Range range = simpleName.getRange().get();
+			int line = range.begin.line;
+			int columnStart = range.begin.column;
+			int columnEnd = range.end.column;
+			this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "declaration", line, columnStart, columnEnd + 1));
+		}
+	}
+
+	/**
+	 * Visit all {@link ThrowStmt}s.
+	 *
+	 * @param n   The current {@code ThrowStmt}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(ThrowStmt n, Object arg)
+	{
+		super.visit(n, arg);
+		Expression expression = n.getExpression();
+		if (expression instanceof NameExpr)
+		{
+			NameExpr nameExpr = (NameExpr) expression;
+			CallableDeclaration<?> method = findMethodForStatement(n, this.compilationUnit);
+			if (method == null)
+			{
+				method = findConstructorForStatement(n, this.compilationUnit);
+			}
+
+			if (method != null)
+			{
+				ResolvedValueDeclaration vd = nameExpr.resolve();
+				SimpleName simpleName = nameExpr.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				if (vd.isField())
+				{
+					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isVariable())
+				{
+					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isParameter())
+				{
+					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Visit all {@link InstanceOfExpr}s.
+	 *
+	 * @param n   The current {@code InstanceOfExpr}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(InstanceOfExpr n, Object arg)
+	{
+		super.visit(n, arg);
+		CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+		if (method == null)
+		{
+			method = findConstructorForExpression(n, this.compilationUnit);
+		}
+
+		if (method != null)
+		{
+			Expression expression = n.getExpression();
+			if (expression instanceof NameExpr)
+			{
+				NameExpr nameExpr = (NameExpr) expression;
+				ResolvedValueDeclaration vd = nameExpr.resolve();
+				SimpleName simpleName = nameExpr.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				if (vd.isField())
+				{
+					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isVariable())
+				{
+					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isParameter())
+				{
+					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Visit all {@link BinaryExpr}s.
+	 *
+	 * @param n   The current {@code BinaryExpr}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(BinaryExpr n, Object arg)
+	{
+		super.visit(n, arg);
+		CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+		if (method == null)
+		{
+			method = findConstructorForExpression(n, this.compilationUnit);
+		}
+
+		if (method != null)
+		{
+			Expression left = n.getLeft();
+			if (left instanceof NameExpr)
+			{
+				NameExpr nameExpr = (NameExpr) left;
+				ResolvedValueDeclaration vd = nameExpr.resolve();
+				SimpleName simpleName = nameExpr.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				if (vd.isField())
+				{
+					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isVariable())
+				{
+					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isParameter())
+				{
+					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				}
+			}
+
+			Expression right = n.getRight();
+			if (right instanceof NameExpr)
+			{
+				NameExpr nameExpr = (NameExpr) right;
+				ResolvedValueDeclaration vd = nameExpr.resolve();
+				SimpleName simpleName = nameExpr.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				if (vd.isField())
+				{
+					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isVariable())
+				{
+					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isParameter())
+				{
+					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Visit all {@link CastExpr}s.
+	 *
+	 * @param n   The current {@code CastExpr}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(CastExpr n, Object arg)
+	{
+		super.visit(n, arg);
+		CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+		if (method == null)
+		{
+			method = findConstructorForExpression(n, this.compilationUnit);
+		}
+
+		if (method != null)
+		{
+			Expression expression = n.getExpression();
+			if (expression instanceof NameExpr)
+			{
+				NameExpr nameExpr = (NameExpr) expression;
+				ResolvedValueDeclaration vd = nameExpr.resolve();
+				SimpleName simpleName = nameExpr.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				if (vd.isField())
+				{
+					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isVariable())
+				{
+					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isParameter())
+				{
+					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Visit all {@link IfStmt}s.
+	 *
+	 * @param n   The current {@code IfStmt}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(IfStmt n, Object arg)
+	{
+		super.visit(n, arg);
+		Expression condition = n.getCondition();
+		if (condition instanceof NameExpr)
+		{
+			NameExpr nameExpr = (NameExpr) condition;
+			CallableDeclaration<?> method = findMethodForStatement(n, this.compilationUnit);
+			InitializerDeclaration staticInitializer = null;
+			if (method == null)
+			{
+				method = findConstructorForStatement(n, this.compilationUnit);
+				if (method == null)
+				{
+					staticInitializer = findInitializerForStatement(n, this.compilationUnit);
+				}
+			}
+
+			if (method != null)
+			{
+				ResolvedValueDeclaration vd = nameExpr.resolve();
+				SimpleName simpleName = nameExpr.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				if (vd.isField())
+				{
+					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isVariable())
+				{
+					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isParameter())
+				{
+					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				}
+			} else if (staticInitializer != null)
+			{
+				ResolvedValueDeclaration vd = nameExpr.resolve();
+				SimpleName simpleName = nameExpr.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				if (vd.isField())
+				{
+					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isVariable())
+				{
+					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isParameter())
+				{
+					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Visit all {@link ArrayInitializerExpr}s.
+	 *
+	 * @param n   The current {@code ArrayInitializerExpr}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(ArrayInitializerExpr n, Object arg)
+	{
+		super.visit(n, arg);
+		n.getValues().forEach(value -> {
+			if (value instanceof NameExpr)
+			{
+				NameExpr nameExpr = (NameExpr) value;
+				CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+				if (method == null)
+				{
+					method = findConstructorForExpression(n, this.compilationUnit);
+				}
+
+				if (method != null)
+				{
+					ResolvedValueDeclaration vd = nameExpr.resolve();
+					SimpleName simpleName = nameExpr.getName();
+					String name = simpleName.getIdentifier();
+					Range range = simpleName.getRange().get();
+					int line = range.begin.line;
+					int columnStart = range.begin.column;
+					int columnEnd = range.end.column;
+					if (vd.isField())
+					{
+						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+					} else if (vd.isVariable())
+					{
+						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+					} else if (vd.isParameter())
+					{
+						this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+					}
+				}
+			}
+		});
+	}
+
+	/**
+	 * Visit all {@link ArrayCreationExpr}s.
+	 *
+	 * @param n   The current {@code ArrayCreationExpr}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(ArrayCreationExpr n, Object arg)
+	{
+		super.visit(n, arg);
+		n.getLevels().forEach(level -> {
+			Expression dimension = level.getDimension().orElse(null);
+			if (dimension instanceof NameExpr)
+			{
+				NameExpr nameExpr = (NameExpr) dimension;
+				CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+				if (method == null)
+				{
+					method = findConstructorForExpression(n, this.compilationUnit);
+				}
+
+				if (method != null)
+				{
+					ResolvedValueDeclaration vd = nameExpr.resolve();
+					SimpleName simpleName = nameExpr.getName();
+					String name = simpleName.getIdentifier();
+					Range range = simpleName.getRange().get();
+					int line = range.begin.line;
+					int columnStart = range.begin.column;
+					int columnEnd = range.end.column;
+					if (vd.isField())
+					{
+						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+					} else if (vd.isVariable())
+					{
+						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+					} else if (vd.isParameter())
+					{
+						this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+					}
+				}
+			}
+		});
+	}
+
+	/**
+	 * Visit all {@link ArrayAccessExpr}s.
+	 *
+	 * @param n   The current {@code ArrayAccessExpr}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(ArrayAccessExpr n, Object arg)
+	{
+		super.visit(n, arg);
+		Expression expression = n.getName();
+		if (expression instanceof NameExpr)
+		{
+			NameExpr nameExpr = (NameExpr) expression;
+			CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+			if (method == null)
+			{
+				method = findConstructorForExpression(n, this.compilationUnit);
+			}
+
+			if (method != null)
+			{
+				ResolvedValueDeclaration vd = nameExpr.resolve();
+				SimpleName simpleName = nameExpr.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				if (vd.isField())
+				{
+					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isVariable())
+				{
+					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isParameter())
+				{
+					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				}
+			}
+		}
+
+		Expression index = n.getIndex();
+		if (index instanceof NameExpr)
+		{
+			NameExpr nameExpr = (NameExpr) index;
+			CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+			if (method == null)
+			{
+				method = findConstructorForExpression(n, this.compilationUnit);
+			}
+
+			if (method != null)
+			{
+				ResolvedValueDeclaration vd = nameExpr.resolve();
+				SimpleName simpleName = nameExpr.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				if (vd.isField())
+				{
+					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isVariable())
+				{
+					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isParameter())
+				{
+					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Visit all {@link ForEachStmt}s.
+	 *
+	 * @param n   The current {@code ForEachStmt}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(ForEachStmt n, Object arg)
+	{
+		super.visit(n, arg);
+		Expression iterable = n.getIterable();
+		if (iterable instanceof NameExpr)
+		{
+			NameExpr nameExpr = (NameExpr) iterable;
+			CallableDeclaration<?> method = findMethodForStatement(n, this.compilationUnit);
+			if (method == null)
+			{
+				method = findConstructorForStatement(n, this.compilationUnit);
+			}
+
+			if (method != null)
+			{
+				ResolvedValueDeclaration vd = nameExpr.resolve();
+				SimpleName simpleName = nameExpr.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				if (vd.isField())
+				{
+					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isVariable())
+				{
+					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isParameter())
+				{
+					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Visit all {@link ReturnStmt}s.
+	 *
+	 * @param n   The current {@code ReturnStmt}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(ReturnStmt n, Object arg)
+	{
+		super.visit(n, arg);
+		Expression expression = n.getExpression().orElse(null);
+		if (expression instanceof NameExpr)
+		{
+			NameExpr nameExpr = (NameExpr) expression;
+			CallableDeclaration<?> method = findMethodForStatement(n, this.compilationUnit);
+			if (method == null)
+			{
+				method = findConstructorForStatement(n, this.compilationUnit);
+			}
+
+			if (method != null)
+			{
+				ResolvedValueDeclaration vd = nameExpr.resolve();
+				SimpleName simpleName = nameExpr.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				if (vd.isField())
+				{
+					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isVariable())
+				{
+					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isParameter())
+				{
+					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Visit all {@link UnaryExpr}s.
+	 *
+	 * @param n   The current {@code UnaryExpr}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(UnaryExpr n, Object arg)
+	{
+		super.visit(n, arg);
+		Expression expression = n.getExpression();
+		if (expression instanceof NameExpr)
+		{
+			NameExpr nameExpr = (NameExpr) expression;
+			CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+			if (method == null)
+			{
+				method = findConstructorForExpression(n, this.compilationUnit);
+			}
+
+			if (method != null)
+			{
+				try
+				{
+					ResolvedValueDeclaration vd = nameExpr.resolve();
+					SimpleName simpleName = nameExpr.getName();
+					String name = simpleName.getIdentifier();
+					Range range = simpleName.getRange().get();
+					int line = range.begin.line;
+					int columnStart = range.begin.column;
+					int columnEnd = range.end.column;
+					if (vd.isField())
+					{
+						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+					} else if (vd.isVariable())
+					{
+						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+					} else if (vd.isParameter())
+					{
+						this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+					}
+				} catch (UnsolvedSymbolException ignored)
+				{
+				}
+			}
+		}
+	}
+
+	/**
+	 * Visit all {@link ConditionalExpr}s.
+	 *
+	 * @param n   The current {@code ConditionalExpr}
+	 * @param arg Don't worry about it
+	 */
+	@Override
+	public void visit(ConditionalExpr n, Object arg)
+	{
+		super.visit(n, arg);
+		Expression elseExpr = n.getElseExpr();
+		if (elseExpr instanceof NameExpr)
+		{
+			NameExpr nameExpr = (NameExpr) elseExpr;
+			CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+			if (method == null)
+			{
+				method = findConstructorForExpression(n, this.compilationUnit);
+			}
+
+			if (method != null)
+			{
+				ResolvedValueDeclaration vd = nameExpr.resolve();
+				SimpleName simpleName = nameExpr.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				if (vd.isField())
+				{
+					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isVariable())
+				{
+					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isParameter())
+				{
+					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				}
+			}
+		}
+
+		Expression thenExpr = n.getThenExpr();
+		if (thenExpr instanceof NameExpr)
+		{
+			NameExpr nameExpr = (NameExpr) thenExpr;
+			CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+			if (method == null)
+			{
+				method = findConstructorForExpression(n, this.compilationUnit);
+			}
+
+			if (method != null)
+			{
+				ResolvedValueDeclaration vd = nameExpr.resolve();
+				SimpleName simpleName = nameExpr.getName();
+				String name = simpleName.getIdentifier();
+				Range range = simpleName.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				if (vd.isField())
+				{
+					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isVariable())
+				{
+					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+				} else if (vd.isParameter())
+				{
+					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd));
+				}
+			}
+		}
+	}
+
+	@Override
+	public void visit(LambdaExpr n, Object arg)
+	{
+		super.visit(n, arg);
+		CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+		if (method == null)
+		{
+			method = findConstructorForExpression(n, this.compilationUnit);
+		}
+
+		if (method != null)
+		{
+			CallableDeclaration<?> finalMethod = method;
+			n.getParameters().forEach(parameter -> {
+				SimpleName simpleName = parameter.getName();
+				String name = simpleName.getIdentifier();
+				Range range = parameter.getRange().get();
+				int line = range.begin.line;
+				int columnStart = range.begin.column;
+				int columnEnd = range.end.column;
+				this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(finalMethod), "declaration", line, columnStart, columnEnd + 1));
+			});
+		}
+	}
+
+	/**
+	 * Look through the {@link CompilationUnit} for the specific statement within its methods.
+	 *
+	 * @param statement The {@code statement} we are looking for
+	 * @param cu        The {@code CompilationUnit}
+	 * @return the method that contains the {@code statement}.
+	 */
+	private MethodDeclaration findMethodForStatement(Statement statement, CompilationUnit cu)
+	{
+		final boolean[] contains = {false};
+		final MethodDeclaration[] methodDeclaration = {null};
+		cu.accept(new VoidVisitorAdapter<Void>()
+		{
+			@Override
+			public void visit(MethodDeclaration n, Void arg)
+			{
+				super.visit(n, arg);
+				if (!n.isAbstract())
+				{
+					for (Statement statement1 : n.getBody().get().getStatements())
+					{
+						if (statement1.containsWithinRange(statement))
+						{
+							contains[0] = true;
+							methodDeclaration[0] = n;
+						}
+					}
+				}
+			}
+		}, null);
+
+		if (contains[0])
+		{
+			return methodDeclaration[0];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Look through the {@link CompilationUnit} for the specific statement within its methods.
+	 *
+	 * @param expression The {@code expression} we are looking for
+	 * @param cu         The {@code CompilationUnit}
+	 * @return the method that contains the {@code expression}.
+	 */
+	private MethodDeclaration findMethodForExpression(Expression expression, CompilationUnit cu)
+	{
+		final boolean[] contains = {false};
+		final MethodDeclaration[] methodDeclaration = {null};
+		cu.accept(new VoidVisitorAdapter<Void>()
+		{
+			@Override
+			public void visit(MethodDeclaration n, Void arg)
+			{
+				super.visit(n, arg);
+				if (!n.isAbstract())
+				{
+					for (Statement statement : n.getBody().get().getStatements())
+					{
+						if (statement.containsWithinRange(expression))
+						{
+							contains[0] = true;
+							methodDeclaration[0] = n;
+						}
+					}
+				}
+			}
+		}, null);
+
+		if (contains[0])
+		{
+			return methodDeclaration[0];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Look through the {@link CompilationUnit} for the specific statement within its methods.
+	 *
+	 * @param statement The {@code statement} we are looking for
+	 * @param cu        The {@code CompilationUnit}
+	 * @return the constructor that contains the {@code statement}.
+	 */
+	private ConstructorDeclaration findConstructorForStatement(Statement statement, CompilationUnit cu)
+	{
+		final boolean[] contains = {false};
+		final ConstructorDeclaration[] constructorDeclaration = {null};
+		cu.accept(new VoidVisitorAdapter<Void>()
+		{
+			@Override
+			public void visit(ConstructorDeclaration n, Void arg)
+			{
+				super.visit(n, arg);
+				for (Statement statement1 : n.getBody().getStatements())
+				{
+					if (statement1.containsWithinRange(statement))
+					{
+						contains[0] = true;
+						constructorDeclaration[0] = n;
+					}
+				}
+			}
+		}, null);
+
+		if (contains[0])
+		{
+			return constructorDeclaration[0];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Look through the {@link CompilationUnit} for the specific statement within its methods.
+	 *
+	 * @param expression The {@code expression} we are looking for
+	 * @param cu         The {@code CompilationUnit}
+	 * @return the constructor that contains the {@code expression}.
+	 */
+	private ConstructorDeclaration findConstructorForExpression(Expression expression, CompilationUnit cu)
+	{
+		final boolean[] contains = {false};
+		final ConstructorDeclaration[] constructorDeclaration = {null};
+		cu.accept(new VoidVisitorAdapter<Void>()
+		{
+			@Override
+			public void visit(ConstructorDeclaration n, Void arg)
+			{
+				super.visit(n, arg);
+				for (Statement statement1 : n.getBody().getStatements())
+				{
+					if (statement1.containsWithinRange(expression))
+					{
+						contains[0] = true;
+						constructorDeclaration[0] = n;
+					}
+				}
+			}
+		}, null);
+
+		if (contains[0])
+		{
+			return constructorDeclaration[0];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Look through the {@link CompilationUnit} for the specific statement within its methods.
+	 *
+	 * @param statement The {@code statement} we are looking for
+	 * @param cu        The {@code CompilationUnit}
+	 * @return the initializer that contains the {@code statement}.
+	 */
+	private InitializerDeclaration findInitializerForStatement(Statement statement, CompilationUnit cu)
+	{
+		final boolean[] contains = {false};
+		final InitializerDeclaration[] initializerDeclaration = {null};
+		cu.accept(new VoidVisitorAdapter<Void>()
+		{
+			@Override
+			public void visit(InitializerDeclaration n, Void arg)
+			{
+				super.visit(n, arg);
+				for (Statement statement : n.getBody().getStatements())
+				{
+					if (statement.containsWithinRange(statement))
+					{
+						contains[0] = true;
+						initializerDeclaration[0] = n;
+					}
+				}
+			}
+		}, null);
+
+		if (contains[0])
+		{
+			return initializerDeclaration[0];
+		} else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Look through the {@link CompilationUnit} for the specific statement within its methods.
+	 *
+	 * @param expression The {@code expression} we are looking for
+	 * @param cu         The {@code CompilationUnit}
+	 * @return the initializer that contains the {@code expression}.
+	 */
+	private InitializerDeclaration findInitializerForExpression(Expression expression, CompilationUnit cu)
+	{
+		final boolean[] contains = {false};
+		final InitializerDeclaration[] initializerDeclaration = {null};
+		cu.accept(new VoidVisitorAdapter<Void>()
+		{
+			@Override
+			public void visit(InitializerDeclaration n, Void arg)
+			{
+				super.visit(n, arg);
+				for (Statement statement : n.getBody().getStatements())
+				{
+					if (statement.containsWithinRange(expression))
+					{
+						contains[0] = true;
+						initializerDeclaration[0] = n;
+					}
+				}
+			}
+		}, null);
+
+		if (contains[0])
+		{
+			return initializerDeclaration[0];
+		}
+
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/TokenUtil.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/TokenUtil.java
new file mode 100644
index 000000000..b51251d6e
--- /dev/null
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/TokenUtil.java
@@ -0,0 +1,28 @@
+package the.bytecode.club.bytecodeviewer.resources.classcontainer.parser;
+
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+import org.fife.ui.rsyntaxtextarea.Token;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Created by Bl3nd.
+ * Date: 9/5/2024
+ */
+public class TokenUtil
+{
+	public static Token getToken(final RSyntaxTextArea textArea, final @NotNull Token token)
+	{
+		String lexeme = token.getLexeme();
+		return lexeme.isEmpty()
+				|| lexeme.equals(".")
+				|| lexeme.equals("(")
+				|| lexeme.equals(")")
+				|| lexeme.equals("[")
+				|| lexeme.equals("~")
+				|| lexeme.equals("-")
+				|| lexeme.equals("+")
+				|| lexeme.equals(" ")
+				? textArea.modelToToken(textArea.getCaretPosition() + 1)
+				: token;
+	}
+}

From 850da2dc4f45a9818f606b9d4e47839ebfc7e768 Mon Sep 17 00:00:00 2001
From: Cody <6558800+Bl3nd@users.noreply.github.com>
Date: Thu, 5 Sep 2024 18:25:08 -0600
Subject: [PATCH 02/11] Add parameter and local field token markers.

---
 .../gui/util/BytecodeViewPanelUpdater.java    | 115 ++++++++++++++++++
 1 file changed, 115 insertions(+)

diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
index 48922c622..00936124f 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
@@ -35,6 +35,7 @@
 
 import org.fife.ui.rsyntaxtextarea.*;
 import org.fife.ui.rtextarea.SmartHighlightPainter;
+import org.jetbrains.annotations.NotNull;
 import org.objectweb.asm.ClassWriter;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Configuration;
@@ -49,6 +50,8 @@
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ClassViewer;
 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.ClassLocalVariableLocation;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassParameterLocation;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.parser.TokenUtil;
 import the.bytecode.club.bytecodeviewer.util.MethodParser;
 
@@ -467,6 +470,16 @@ private void markOccurrences(RSyntaxTextArea textArea, ClassFileContainer classF
 		 */
 		markField(textArea, classFileContainer, line, column, finalToken, highlighterEx);
 
+		/*
+		Method parameters
+		 */
+		markMethodParameter(textArea, classFileContainer, line, column, finalToken, highlighterEx);
+
+		/*
+		Method local variables
+		 */
+		markMethodLocalVariable(textArea, classFileContainer, line, column, finalToken, highlighterEx);
+
 		errorStripe.refreshMarkers();
 	}
 
@@ -505,4 +518,106 @@ startOffset, endOffset, new SmartHighlightPainter()
 			}
 		}));
 	}
+
+	/**
+	 * Search through the text area and mark all occurrences that match the selected token.
+	 *
+	 * @param textArea           the text area
+	 * @param classFileContainer the container
+	 * @param line               the caret line
+	 * @param column             the caret column
+	 * @param finalToken         the token
+	 * @param highlighterEx      the highlighter
+	 */
+	private static void markMethodParameter(
+			RSyntaxTextArea textArea,
+			ClassFileContainer classFileContainer,
+			int line,
+			int column,
+			Token finalToken,
+			RSyntaxTextAreaHighlighterEx highlighterEx
+	)
+	{
+		classFileContainer.methodParameterMembers.values().forEach(parameters -> parameters.forEach(parameter -> {
+			String method;
+			if (parameter.line == line && parameter.columnStart - 1 <= column && parameter.columnEnd >= column)
+			{
+				method = parameter.method;
+				try
+				{
+					Element root = textArea.getDocument().getDefaultRootElement();
+					for (
+							ClassParameterLocation location :
+							classFileContainer.getParameterLocationsFor(finalToken.getLexeme())
+					)
+					{
+						if (Objects.equals(method, location.method))
+						{
+							int startOffset = root
+									.getElement(location.line - 1)
+									.getStartOffset() + (location.columnStart - 1);
+							int endOffset = root
+									.getElement(location.line - 1)
+									.getStartOffset() + (location.columnEnd - 1);
+
+							highlighterEx.addMarkedOccurrenceHighlight(
+									startOffset, endOffset, new SmartHighlightPainter()
+							);
+						}
+					}
+				} catch (BadLocationException ex)
+				{
+					throw new RuntimeException(ex);
+				}
+			}
+		}));
+	}
+
+	/**
+	 * Search through the text area and mark all occurrences that match the selected token.
+	 *
+	 * @param textArea           the text area
+	 * @param classFileContainer the container
+	 * @param line               the caret line
+	 * @param column             the caret column
+	 * @param finalToken         the token
+	 * @param highlighterEx      the highlighter
+	 */
+	private static void markMethodLocalVariable(
+			RSyntaxTextArea textArea,
+			ClassFileContainer classFileContainer,
+			int line,
+			int column,
+			Token finalToken,
+			RSyntaxTextAreaHighlighterEx highlighterEx
+	) {
+		classFileContainer.methodLocalMembers.values().forEach(localVariables -> localVariables.forEach(localVariable -> {
+			String method;
+			if (localVariable.line == line && localVariable.columnStart - 1 <= column && localVariable.columnEnd >= column) {
+				method = localVariable.method;
+				try {
+					Element root = textArea.getDocument().getDefaultRootElement();
+					for (
+							ClassLocalVariableLocation location :
+							classFileContainer.getLocalLocationsFor(finalToken.getLexeme())
+					) {
+						if (Objects.equals(method, location.method)) {
+							int startOffset = root
+									.getElement(location.line - 1)
+									.getStartOffset() + (location.columnStart - 1);
+							int endOffset = root
+									.getElement(location.line - 1)
+									.getStartOffset() + (location.columnEnd - 1);
+
+							highlighterEx.addMarkedOccurrenceHighlight(
+									startOffset, endOffset, new SmartHighlightPainter()
+							);
+						}
+					}
+				} catch (BadLocationException ex) {
+					throw new RuntimeException(ex);
+				}
+			}
+		}));
+	}
 }

From a24c4c0fb653be0d80a803777bb2fc007d0fe4fa Mon Sep 17 00:00:00 2001
From: Cody <6558800+Bl3nd@users.noreply.github.com>
Date: Fri, 6 Sep 2024 21:08:48 -0600
Subject: [PATCH 03/11] Moved the search panel to its own panel. - Fixes search
 panel glitch - Fixes markers mismatching with scrollbar thumb.

---
 .../gui/components/MyErrorStripe.java         |  179 +-
 .../components/SearchableRSyntaxTextArea.java |  330 +-
 .../gui/components/TextAreaSearchPanel.java   |   89 +
 .../gui/util/BytecodeViewPanelUpdater.java    |    8 +-
 .../classcontainer/parser/MyVoidVisitor.java  | 3022 ++++++++---------
 5 files changed, 1876 insertions(+), 1752 deletions(-)
 create mode 100644 src/main/java/the/bytecode/club/bytecodeviewer/gui/components/TextAreaSearchPanel.java

diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/MyErrorStripe.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/MyErrorStripe.java
index ca5c6c872..19b0f9250 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/MyErrorStripe.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/MyErrorStripe.java
@@ -48,18 +48,21 @@
  * Created by Bl3nd.
  * Date: 8/26/2024
  */
-public class MyErrorStripe extends JPanel {
+public class MyErrorStripe extends JPanel
+{
 	private final RSyntaxTextArea textArea;
 	private final transient Listener listener;
 
-	public MyErrorStripe(RSyntaxTextArea textArea) {
+	public MyErrorStripe(RSyntaxTextArea textArea)
+	{
 		this.textArea = textArea;
 		setLayout(null);
 		listener = new Listener();
 		addMouseListener(listener);
 	}
 
-	private int lineToY(int line, Rectangle r) {
+	private int lineToY(int line, Rectangle r)
+	{
 		if (r == null)
 			r = new Rectangle();
 
@@ -71,13 +74,15 @@ private int lineToY(int line, Rectangle r) {
 		return Math.round((h - 1) * line / Math.max(lineCount, linesPerVisibleRect));
 	}
 
-	private int yToLine(int y) {
+	private int yToLine(int y)
+	{
 		int line = -1;
 		int h = textArea.getVisibleRect().height;
 		int lineHeight = textArea.getLineHeight();
 		int linesPerVisibleRect = h / lineHeight;
 		int lineCount = textArea.getLineCount();
-		if (y < h) {
+		if (y < h)
+		{
 			float at = y / (float) h;
 			line = Math.round((Math.max(lineCount, linesPerVisibleRect) - 1) * at);
 		}
@@ -85,7 +90,8 @@ private int yToLine(int y) {
 		return line;
 	}
 
-	private void paintParserNoticeMarker(Graphics2D g, ParserNotice notice, int width, int height) {
+	private void paintParserNoticeMarker(Graphics2D g, ParserNotice notice, int width, int height)
+	{
 		Color borderColor = notice.getColor();
 		if (borderColor == null)
 			borderColor = Color.BLACK;
@@ -98,7 +104,8 @@ private void paintParserNoticeMarker(Graphics2D g, ParserNotice notice, int widt
 		g.drawRect(0, 0, width - 1, height - 1);
 	}
 
-	public void refreshMarkers() {
+	public void refreshMarkers()
+	{
 		removeAll();
 		Map<Integer, Marker> markerMap = new HashMap<>();
 		List<DocumentRange> occurrences = textArea.getMarkedOccurrences();
@@ -107,24 +114,30 @@ public void refreshMarkers() {
 		repaint();
 	}
 
-	private void addMarkersForRanges(List<DocumentRange> occurrences, Map<Integer, Marker> markerMap, Color color) {
-		for (DocumentRange range : occurrences) {
+	private void addMarkersForRanges(List<DocumentRange> occurrences, Map<Integer, Marker> markerMap, Color color)
+	{
+		for (DocumentRange range : occurrences)
+		{
 			int line;
-			try {
+			try
+			{
 				line = textArea.getLineOfOffset(range.getStartOffset());
-			} catch (BadLocationException e) {
+			} catch (BadLocationException e)
+			{
 				continue;
 			}
 
 			ParserNotice notice = new MarkedOccurrenceNotice(range, color);
 			Integer key = line;
 			Marker m = markerMap.get(key);
-			if (m == null) {
+			if (m == null)
+			{
 				m = new Marker(notice);
 				m.addMouseListener(listener);
 				markerMap.put(key, m);
 				add(m);
-			} else {
+			} else
+			{
 				if (!m.containsMarkedOccurrence())
 					m.addNotice(notice);
 			}
@@ -132,179 +145,216 @@ private void addMarkersForRanges(List<DocumentRange> occurrences, Map<Integer, M
 	}
 
 	@Override
-	public void updateUI() {
+	public void updateUI()
+	{
 		super.updateUI();
 	}
 
 	@Override
-	protected void paintComponent(Graphics g) {
+	protected void paintComponent(Graphics g)
+	{
 		super.paintComponent(g);
 	}
 
 	@Override
-	protected void paintChildren(Graphics g) {
+	protected void paintChildren(Graphics g)
+	{
 		super.paintChildren(g);
 	}
 
 	@Override
-	public Dimension getPreferredSize() {
+	public Dimension getPreferredSize()
+	{
 		return new Dimension(14, textArea.getPreferredScrollableViewportSize().height);
 	}
 
 	@Override
-	public void doLayout() {
-		for (int i = 0; i < getComponentCount(); i++) {
+	public void doLayout()
+	{
+		for (int i = 0; i < getComponentCount(); i++)
+		{
 			Marker m = (Marker) getComponent(i);
 			m.updateLocation();
 		}
 	}
 
 	@Override
-	public void addNotify() {
+	public void addNotify()
+	{
 		super.addNotify();
 		refreshMarkers();
 	}
 
 	@Override
-	public void removeNotify() {
+	public void removeNotify()
+	{
 		super.removeNotify();
 	}
 
-	private class Listener extends MouseAdapter {
+	private class Listener extends MouseAdapter
+	{
 		private final Rectangle r = new Rectangle();
 
 		@Override
-		public void mouseClicked(@NotNull MouseEvent e) {
+		public void mouseClicked(@NotNull MouseEvent e)
+		{
 			Component source = (Component) e.getSource();
-			if (source instanceof MyErrorStripe.Marker) {
+			if (source instanceof MyErrorStripe.Marker)
+			{
 				Marker m = (Marker) source;
 				m.mouseClicked(e);
 				return;
 			}
 
 			int line = yToLine(e.getY());
-			if (line > -1) {
-				try {
+			if (line > -1)
+			{
+				try
+				{
 					int offset = textArea.getLineOfOffset(line);
 					textArea.setCaretPosition(offset);
 					RSyntaxUtilities.selectAndPossiblyCenter(textArea, new DocumentRange(offset, offset), false);
-				} catch (BadLocationException exception) {
+				} catch (BadLocationException exception)
+				{
 					UIManager.getLookAndFeel().provideErrorFeedback(textArea);
 				}
 			}
 		}
 	}
 
-	private class MarkedOccurrenceNotice implements ParserNotice {
+	private class MarkedOccurrenceNotice implements ParserNotice
+	{
 		private final DocumentRange range;
 		private final Color color;
 
-		MarkedOccurrenceNotice(DocumentRange range, Color color) {
+		MarkedOccurrenceNotice(DocumentRange range, Color color)
+		{
 			this.range = range;
 			this.color = color;
 		}
 
 		@Override
-		public boolean containsPosition(int pos) {
+		public boolean containsPosition(int pos)
+		{
 			return pos >= range.getStartOffset() && pos < range.getEndOffset();
 		}
 
 		@Override
-		public Color getColor() {
+		public Color getColor()
+		{
 			return color;
 		}
 
 		@Override
-		public int getLength() {
+		public int getLength()
+		{
 			return range.getEndOffset() - range.getStartOffset();
 		}
 
 		@Override
-		public Level getLevel() {
+		public Level getLevel()
+		{
 			return Level.INFO;
 		}
 
 		@Override
-		public int getLine() {
-			try {
+		public int getLine()
+		{
+			try
+			{
 				return textArea.getLineOfOffset(range.getStartOffset()) + 1;
-			} catch (BadLocationException e) {
+			} catch (BadLocationException e)
+			{
 				return 0;
 			}
 		}
 
 		@Override
-		public boolean getKnowsOffsetAndLength() {
-			return false;
+		public boolean getKnowsOffsetAndLength()
+		{
+			return true;
 		}
 
 		@Contract(pure = true)
 		@Override
-		public @NotNull String getMessage() {
+		public @NotNull String getMessage()
+		{
 			return "";
 		}
 
 		@Override
-		public int getOffset() {
+		public int getOffset()
+		{
 			return range.getStartOffset();
 		}
 
 		@Override
-		public Parser getParser() {
+		public Parser getParser()
+		{
 			return null;
 		}
 
 		@Override
-		public boolean getShowInEditor() {
+		public boolean getShowInEditor()
+		{
 			return false;
 		}
 
 		@Override
-		public String getToolTipText() {
+		public String getToolTipText()
+		{
 			return null;
 		}
 
 		@Override
-		public int compareTo(@NotNull ParserNotice o) {
+		public int compareTo(@NotNull ParserNotice o)
+		{
 			return 0;
 		}
 
 		@Override
-		public int hashCode() {
+		public int hashCode()
+		{
 			return 0;
 		}
 	}
 
 	private static final int MARKER_HEIGHT = 3;
 
-	private class Marker extends JComponent {
+	private class Marker extends JComponent
+	{
 		private final java.util.List<ParserNotice> notices;
 
-		Marker(ParserNotice notice) {
+		Marker(ParserNotice notice)
+		{
 			notices = new ArrayList<>();
 			addNotice(notice);
 			setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
 			setSize(getPreferredSize());
 		}
 
-		private void addNotice(ParserNotice notice) {
+		private void addNotice(ParserNotice notice)
+		{
 			notices.add(notice);
 		}
 
 		@Contract(value = " -> new", pure = true)
 		@Override
-		public @NotNull Dimension getPreferredSize() {
+		public @NotNull Dimension getPreferredSize()
+		{
 			return new Dimension(12, MARKER_HEIGHT);
 		}
 
 		@Override
-		protected void paintComponent(Graphics g) {
+		protected void paintComponent(Graphics g)
+		{
 			final ParserNotice notice = getHighestPriorityNotice();
 			if (notice != null)
 				paintParserNoticeMarker((Graphics2D) g, notice, getWidth(), getHeight());
 		}
 
-		protected void mouseClicked(MouseEvent e) {
+		protected void mouseClicked(MouseEvent e)
+		{
 			ParserNotice pn = notices.get(0);
 			int offs = pn.getOffset();
 			int len = pn.getLength();
@@ -312,9 +362,11 @@ protected void mouseClicked(MouseEvent e) {
 			{
 				DocumentRange range = new DocumentRange(offs, offs + len);
 				RSyntaxUtilities.selectAndPossiblyCenter(textArea, range, true);
-			} else {
+			} else
+			{
 				int line = pn.getLine();
-				try {
+				try
+				{
 					offs = textArea.getLineStartOffset(line);
 					textArea.getFoldManager().ensureOffsetNotInClosedFold(offs);
 					textArea.setCaretPosition(offs);
@@ -325,10 +377,13 @@ protected void mouseClicked(MouseEvent e) {
 			}
 		}
 
-		public boolean containsMarkedOccurrence() {
+		public boolean containsMarkedOccurrence()
+		{
 			boolean result = false;
-			for (ParserNotice notice : notices) {
-				if (notice instanceof MarkedOccurrenceNotice) {
+			for (ParserNotice notice : notices)
+			{
+				if (notice instanceof MarkedOccurrenceNotice)
+				{
 					result = true;
 					break;
 				}
@@ -337,11 +392,14 @@ public boolean containsMarkedOccurrence() {
 			return result;
 		}
 
-		public ParserNotice getHighestPriorityNotice() {
+		public ParserNotice getHighestPriorityNotice()
+		{
 			ParserNotice selectedNotice = null;
 			int lowestLevel = Integer.MAX_VALUE;
-			for (ParserNotice notice : notices) {
-				if (notice.getLevel().getNumericValue() < lowestLevel) {
+			for (ParserNotice notice : notices)
+			{
+				if (notice.getLevel().getNumericValue() < lowestLevel)
+				{
 					lowestLevel = notice.getLevel().getNumericValue();
 					selectedNotice = notice;
 				}
@@ -350,7 +408,8 @@ public ParserNotice getHighestPriorityNotice() {
 			return selectedNotice;
 		}
 
-		public void updateLocation() {
+		public void updateLocation()
+		{
 			int line = notices.get(0).getLine();
 			int y = lineToY(line - 1, null);
 			setLocation(2, y);
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java
index fa6f5cc6d..813ffd660 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java
@@ -18,197 +18,171 @@
 
 package the.bytecode.club.bytecodeviewer.gui.components;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseWheelEvent;
-import java.awt.event.MouseWheelListener;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
-import javax.swing.text.BadLocationException;
-
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rtextarea.RTextScrollPane;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Configuration;
 import the.bytecode.club.bytecodeviewer.GlobalHotKeys;
 import the.bytecode.club.bytecodeviewer.gui.components.listeners.PressKeyListener;
-import the.bytecode.club.bytecodeviewer.gui.components.listeners.ReleaseKeyListener;
 import the.bytecode.club.bytecodeviewer.gui.theme.LAFTheme;
-import the.bytecode.club.bytecodeviewer.resources.IconResources;
-import the.bytecode.club.bytecodeviewer.translation.TranslatedComponents;
-import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJCheckBox;
 import the.bytecode.club.bytecodeviewer.util.JTextAreaUtils;
 
+import javax.swing.*;
+import javax.swing.text.BadLocationException;
+import java.awt.*;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseWheelEvent;
+
 /**
  * Searching on an RSyntaxTextArea using swing highlighting
  *
  * @author Konloch
  * @since 6/25/2021
  */
-public class SearchableRSyntaxTextArea extends RSyntaxTextArea {
-
-	private RTextScrollPane scrollPane = new RTextScrollPane(this);
-	private final JPanel searchPanel = new JPanel(new BorderLayout());
-	private final JTextField searchInput = new JTextField();
-	private final JCheckBox caseSensitiveSearch = new TranslatedJCheckBox("Match case", TranslatedComponents.MATCH_CASE);
-	private final JLabel titleHeader = new JLabel("");
-	private final Color darkScrollBackground = new Color(0x3c3f41);
-	private final Color darkScrollForeground = new Color(0x575859);
-	private final Color blackScrollBackground = new Color(0x232323);
-	private final Color blackScrollForeground = new Color(0x575859);
-	private Runnable onCtrlS;
-
-	public SearchableRSyntaxTextArea() {
-		if (Configuration.lafTheme == LAFTheme.HIGH_CONTRAST_DARK) {
-			//this fixes the white border on the jScrollBar panes
-			scrollPane.getHorizontalScrollBar().setBackground(blackScrollBackground);
-			scrollPane.getHorizontalScrollBar().setForeground(blackScrollForeground);
-			scrollPane.getVerticalScrollBar().setBackground(blackScrollBackground);
-			scrollPane.getVerticalScrollBar().setForeground(blackScrollForeground);
-		} else if (Configuration.lafTheme.isDark()) {
-			//this fixes the white border on the jScrollBar panes
-			scrollPane.getHorizontalScrollBar().setBackground(darkScrollBackground);
-			scrollPane.getHorizontalScrollBar().setForeground(darkScrollForeground);
-			scrollPane.getVerticalScrollBar().setBackground(darkScrollBackground);
-			scrollPane.getVerticalScrollBar().setForeground(darkScrollForeground);
-		}
-
-		setAntiAliasingEnabled(true);
-
-		scrollPane.setColumnHeaderView(searchPanel);
-
-		JButton searchNext = new JButton();
-		JButton searchPrev = new JButton();
-		JPanel buttonPane = new JPanel(new BorderLayout());
-		buttonPane.add(searchNext, BorderLayout.WEST);
-		buttonPane.add(searchPrev, BorderLayout.EAST);
-		searchNext.setIcon(IconResources.nextIcon);
-		searchPrev.setIcon(IconResources.prevIcon);
-		searchPanel.add(buttonPane, BorderLayout.WEST);
-		searchPanel.add(searchInput, BorderLayout.CENTER);
-		searchPanel.add(caseSensitiveSearch, BorderLayout.EAST);
-
-		searchNext.addActionListener(arg0 -> search(searchInput.getText(), true, caseSensitiveSearch.isSelected()));
-		searchPrev.addActionListener(arg0 -> search(searchInput.getText(), false, caseSensitiveSearch.isSelected()));
-
-		searchInput.addKeyListener(new ReleaseKeyListener(keyEvent ->
-		{
-			if (keyEvent.getKeyCode() == KeyEvent.VK_ENTER)
-				search(searchInput.getText(), true, caseSensitiveSearch.isSelected());
-		}));
-
-		addKeyListener(new PressKeyListener(keyEvent ->
-		{
-			if ((keyEvent.getKeyCode() == KeyEvent.VK_F) && ((keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))
-				searchInput.requestFocus();
-
-			if (onCtrlS != null && (keyEvent.getKeyCode() == KeyEvent.VK_S) && ((keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0)) {
-				onCtrlS.run();
-				return;
-			}
-
-			GlobalHotKeys.keyPressed(keyEvent);
-		}));
-
-		final Font newFont = getFont().deriveFont((float) BytecodeViewer.viewer.getFontSize());
-
-		//set number-bar font
-		setFont(newFont);
-
-		SwingUtilities.invokeLater(() -> {
-			//attach CTRL + Mouse Wheel Zoom
-			attachCtrlMouseWheelZoom();
-
-			//set text font
-			setFont(newFont);
-		});
-
-	}
-
-	public void search(String search, boolean forwardSearchDirection, boolean caseSensitiveSearch) {
-		JTextAreaUtils.search(this, search, forwardSearchDirection, caseSensitiveSearch);
-	}
-
-	public void highlight(String pattern, boolean caseSensitiveSearch) {
-		JTextAreaUtils.highlight(this, pattern, caseSensitiveSearch);
-	}
-
-	public void attachCtrlMouseWheelZoom() {
-		scrollPane.addMouseWheelListener(e -> {
-			if (getText().isEmpty()) return;
-			if ((e.getModifiersEx() & InputEvent.CTRL_DOWN_MASK) != 0) {
-				Font font = getFont();
-				int size = font.getSize();
-				if (e.getWheelRotation() > 0)
-					setFont(new Font(font.getName(), font.getStyle(), --size >= 2 ? --size : 2));
-				else
-					setFont(new Font(font.getName(), font.getStyle(), ++size));
-
-				e.consume();
-			}
-		});
-
-		scrollPane = new RTextScrollPane() {
-			@Override
-			protected void processMouseWheelEvent(MouseWheelEvent event) {
-				if (!isWheelScrollingEnabled()) {
-					if (getParent() != null) {
-						getParent().dispatchEvent(SwingUtilities.convertMouseEvent(this, event, getParent()));
-						return;
-					}
-				}
-
-				super.processMouseWheelEvent(event);
-			}
-		};
-
-		scrollPane.setWheelScrollingEnabled(false);
-	}
-
-	public String getLineText(int line) {
-		try {
-			if (line < getLineCount()) {
-				int start = getLineStartOffset(line);
-				int end = getLineEndOffset(line);
-				return getText(start, end - start).trim();
-			}
-		} catch (BadLocationException ignored) {
-		}
-		return "";
-	}
-
-	public void setOnCtrlS(Runnable onCtrlS) {
-		this.onCtrlS = onCtrlS;
-	}
-
-	public RTextScrollPane getScrollPane() {
-		return scrollPane;
-	}
-
-	public JPanel getSearchPanel() {
-		return searchPanel;
-	}
-
-	public JTextField getSearchInput() {
-		return searchInput;
-	}
-
-	public JCheckBox getCaseSensitiveSearch() {
-		return caseSensitiveSearch;
-	}
-
-	public JLabel getTitleHeader() {
-		return titleHeader;
-	}
-
-	public Runnable getOnCtrlS() {
-		return onCtrlS;
-	}
+public class SearchableRSyntaxTextArea extends RSyntaxTextArea
+{
+
+    private RTextScrollPane scrollPane = new RTextScrollPane(this);
+    private final TextAreaSearchPanel textAreaSearchPanel;
+    private final Color darkScrollBackground = new Color(0x3c3f41);
+    private final Color darkScrollForeground = new Color(0x575859);
+    private final Color blackScrollBackground = new Color(0x232323);
+    private final Color blackScrollForeground = new Color(0x575859);
+    private Runnable onCtrlS;
+
+    public SearchableRSyntaxTextArea()
+    {
+        if (Configuration.lafTheme == LAFTheme.HIGH_CONTRAST_DARK)
+        {
+            //this fixes the white border on the jScrollBar panes
+            scrollPane.getHorizontalScrollBar().setBackground(blackScrollBackground);
+            scrollPane.getHorizontalScrollBar().setForeground(blackScrollForeground);
+            scrollPane.getVerticalScrollBar().setBackground(blackScrollBackground);
+            scrollPane.getVerticalScrollBar().setForeground(blackScrollForeground);
+        } else if (Configuration.lafTheme.isDark())
+        {
+            //this fixes the white border on the jScrollBar panes
+            scrollPane.getHorizontalScrollBar().setBackground(darkScrollBackground);
+            scrollPane.getHorizontalScrollBar().setForeground(darkScrollForeground);
+            scrollPane.getVerticalScrollBar().setBackground(darkScrollBackground);
+            scrollPane.getVerticalScrollBar().setForeground(darkScrollForeground);
+        }
+
+        this.textAreaSearchPanel = new TextAreaSearchPanel(this);
+
+        setAntiAliasingEnabled(true);
+
+        addKeyListener(new PressKeyListener(keyEvent ->
+        {
+            if ((keyEvent.getKeyCode() == KeyEvent.VK_F) && ((keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))
+                this.textAreaSearchPanel.getSearchInput().requestFocusInWindow();
+
+            if (onCtrlS != null && (keyEvent.getKeyCode() == KeyEvent.VK_S) && ((keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))
+            {
+                onCtrlS.run();
+                return;
+            }
+
+            GlobalHotKeys.keyPressed(keyEvent);
+        }));
+
+        final Font newFont = getFont().deriveFont((float) BytecodeViewer.viewer.getFontSize());
+
+        //set number-bar font
+        setFont(newFont);
+
+        SwingUtilities.invokeLater(() -> {
+            //attach CTRL + Mouse Wheel Zoom
+            attachCtrlMouseWheelZoom();
+
+            //set text font
+            setFont(newFont);
+        });
+
+    }
+
+    public void search(String search, boolean forwardSearchDirection, boolean caseSensitiveSearch)
+    {
+        JTextAreaUtils.search(this, search, forwardSearchDirection, caseSensitiveSearch);
+    }
+
+    public void highlight(String pattern, boolean caseSensitiveSearch)
+    {
+        JTextAreaUtils.highlight(this, pattern, caseSensitiveSearch);
+    }
+
+    public void attachCtrlMouseWheelZoom()
+    {
+        scrollPane.addMouseWheelListener(e -> {
+            if (getText().isEmpty()) return;
+            if ((e.getModifiersEx() & InputEvent.CTRL_DOWN_MASK) != 0)
+            {
+                Font font = getFont();
+                int size = font.getSize();
+                if (e.getWheelRotation() > 0)
+                    setFont(new Font(font.getName(), font.getStyle(), --size >= 2 ? --size : 2));
+                else
+                    setFont(new Font(font.getName(), font.getStyle(), ++size));
+
+                e.consume();
+            }
+        });
+
+        scrollPane = new RTextScrollPane()
+        {
+            @Override
+            protected void processMouseWheelEvent(MouseWheelEvent event)
+            {
+                if (!isWheelScrollingEnabled())
+                {
+                    if (getParent() != null)
+                    {
+                        getParent().dispatchEvent(SwingUtilities.convertMouseEvent(this, event, getParent()));
+                        return;
+                    }
+                }
+
+                super.processMouseWheelEvent(event);
+            }
+        };
+
+        scrollPane.setWheelScrollingEnabled(false);
+    }
+
+    public String getLineText(int line)
+    {
+        try
+        {
+            if (line < getLineCount())
+            {
+                int start = getLineStartOffset(line);
+                int end = getLineEndOffset(line);
+                return getText(start, end - start).trim();
+            }
+        } catch (BadLocationException ignored)
+        {
+        }
+        return "";
+    }
+
+    public void setOnCtrlS(Runnable onCtrlS)
+    {
+        this.onCtrlS = onCtrlS;
+    }
+
+    public RTextScrollPane getScrollPane()
+    {
+        return scrollPane;
+    }
+
+    public TextAreaSearchPanel getTextAreaSearchPanel()
+    {
+        return textAreaSearchPanel;
+    }
+
+    public Runnable getOnCtrlS()
+    {
+        return onCtrlS;
+    }
 }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/TextAreaSearchPanel.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/TextAreaSearchPanel.java
new file mode 100644
index 000000000..fa9a32e04
--- /dev/null
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/TextAreaSearchPanel.java
@@ -0,0 +1,89 @@
+/***************************************************************************
+ * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
+ * Copyright (C) 2014 Konloch - Konloch.com / BytecodeViewer.com           *
+ *                                                                         *
+ * This program is free software: you can redistribute it and/or modify    *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation, either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+package the.bytecode.club.bytecodeviewer.gui.components;
+
+import the.bytecode.club.bytecodeviewer.gui.components.listeners.ReleaseKeyListener;
+import the.bytecode.club.bytecodeviewer.resources.IconResources;
+import the.bytecode.club.bytecodeviewer.translation.TranslatedComponents;
+import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJCheckBox;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.KeyEvent;
+
+/**
+ * This panel represents the decompiler name and search box on the top of every {@link the.bytecode.club.bytecodeviewer.gui.resourceviewer.BytecodeViewPanel}
+ * <p>
+ * Created by Bl3nd.
+ * Date: 9/6/2024
+ */
+public class TextAreaSearchPanel extends JPanel
+{
+    private final JCheckBox caseSensitiveSearch = new TranslatedJCheckBox("Match case", TranslatedComponents.MATCH_CASE);
+    private final JLabel titleHeader = new JLabel("");
+    private final JTextField searchInput = new JTextField();
+    private final JTextArea textArea;
+
+    public TextAreaSearchPanel(JTextArea textArea)
+    {
+        super(new BorderLayout());
+        this.textArea = textArea;
+        setup();
+        setVisible(true);
+    }
+
+    private void setup()
+    {
+        this.add(titleHeader, BorderLayout.NORTH);
+
+        JPanel searchPanel = new JPanel();
+        searchPanel.setLayout(new BoxLayout(searchPanel, BoxLayout.X_AXIS));
+
+        JButton searchNext = new JButton(IconResources.nextIcon);
+        searchPanel.add(searchNext);
+        searchNext.addActionListener(arg0 -> ((SearchableRSyntaxTextArea) textArea).search(searchInput.getText(), true, caseSensitiveSearch.isSelected()));
+
+        JButton searchPrev = new JButton(IconResources.prevIcon);
+        searchPanel.add(searchPrev);
+        searchPrev.addActionListener(arg0 -> ((SearchableRSyntaxTextArea) textArea).search(searchInput.getText(), false, caseSensitiveSearch.isSelected()));
+
+        searchPanel.add(searchInput);
+        searchInput.addKeyListener(new ReleaseKeyListener(keyEvent ->
+        {
+            if (keyEvent.getKeyCode() == KeyEvent.VK_ENTER)
+                ((SearchableRSyntaxTextArea) textArea).search(searchInput.getText(), true, caseSensitiveSearch.isSelected());
+        }));
+
+        searchPanel.add(caseSensitiveSearch);
+
+        // This is needed to add more room to the right of the sensitive search check box
+        searchPanel.add(Box.createHorizontalStrut(2));
+
+        this.add(searchPanel, BorderLayout.SOUTH);
+    }
+
+    public JLabel getTitleHeader()
+    {
+        return titleHeader;
+    }
+
+    public JTextField getSearchInput()
+    {
+        return searchInput;
+    }
+}
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
index 00936124f..88ef24d2a 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
@@ -394,8 +394,8 @@ public void buildTextArea(Decompiler decompiler, String decompiledSource)
 		updateUpdaterTextArea = new SearchableRSyntaxTextArea();
 
 		Configuration.rstaTheme.apply(updateUpdaterTextArea);
+		bytecodeViewPanel.add(updateUpdaterTextArea.getTextAreaSearchPanel(), BorderLayout.NORTH);
 		bytecodeViewPanel.add(updateUpdaterTextArea.getScrollPane());
-		bytecodeViewPanel.add(updateUpdaterTextArea.getTitleHeader(), BorderLayout.NORTH);
 
 		bytecodeViewPanel.textArea = updateUpdaterTextArea;
 
@@ -424,12 +424,14 @@ else if (isPanelEditable && decompiler == Decompiler.KRAKATAU_DISASSEMBLER)
 			bytecodeViewPanel.compiler = Compiler.KRAKATAU_ASSEMBLER;
 
 		String editable = isPanelEditable ? " - " + EDITABLE : "";
-		bytecodeViewPanel.textArea.getTitleHeader().setText(decompiler.getDecompilerName() + editable);
+		bytecodeViewPanel.textArea.getTextAreaSearchPanel().getTitleHeader().setText(decompiler.getDecompilerName() + editable);
 
-		// TODO: Whenever you click on a mark, both text areas get scrolled. Also, the error strip isn't laid out correctly.
 		MyErrorStripe errorStripe = new MyErrorStripe(bytecodeViewPanel.textArea);
 		bytecodeViewPanel.add(errorStripe, BorderLayout.LINE_END);
 
+		bytecodeViewPanel.revalidate();
+		bytecodeViewPanel.repaint();
+
 		bytecodeViewPanel.textArea.addCaretListener(e -> {
 			if (bytecodeViewPanel.textArea.isFocusOwner())
 			{
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
index fc739480f..cee420bec 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
@@ -23,1519 +23,1519 @@
 @SuppressWarnings("OptionalGetWithoutIsPresent")
 public class MyVoidVisitor extends VoidVisitorAdapter<Object>
 {
-	private final ClassFileContainer classFileContainer;
-	private final CompilationUnit compilationUnit;
-
-	public MyVoidVisitor(ClassFileContainer container, CompilationUnit compilationUnit)
-	{
-		this.classFileContainer = container;
-		this.compilationUnit = compilationUnit;
-	}
-
-	private String getOwner()
-	{
-		return this.classFileContainer.className.substring(this.classFileContainer.className.lastIndexOf('.') + 1);
-	}
-
-	private String getMethod(CallableDeclaration<?> method)
-	{
-		return method.getDeclarationAsString(false, false);
-	}
-
-	/**
-	 * Visit all {@link FieldDeclaration}s.
-	 * <p>
-	 * This only worries about the field that is being declared.
-	 * </p>
-	 *
-	 * @param n   The current {@code FieldDeclaration}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(FieldDeclaration n, Object arg)
-	{
-		super.visit(n, arg);
-		n.getVariables().forEach(variableDeclarator -> {
-			SimpleName name = variableDeclarator.getName();
-			String fieldName = name.getIdentifier();
-			Range range = name.getRange().get();
-			int line = range.begin.line;
-			int columnStart = range.begin.column;
-			int columnEnd = range.end.column;
-			this.classFileContainer.putField(fieldName, new ClassFieldLocation(getOwner(), "declaration", line, columnStart, columnEnd + 1));
-		});
-	}
-
-	/**
-	 * Visit all {@link FieldAccessExpr}s.
-	 * <p>
-	 * This finds the field accesses.
-	 * </p>
-	 *
-	 * @param n   The current {@code FieldAccessExpr}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(FieldAccessExpr n, Object arg)
-	{
-		super.visit(n, arg);
-		SimpleName simpleName = n.getName();
-		String fieldName = simpleName.getIdentifier();
-		Range range = n.getTokenRange().get().getEnd().getRange().get();
-		int line = range.begin.line;
-		int columnStart = range.begin.column;
-		int columnEnd = range.end.column;
-		this.classFileContainer.putField(fieldName, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-
-		if (n.hasScope())
-		{
-			CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
-			if (method == null)
-			{
-				method = findConstructorForExpression(n, this.compilationUnit);
-			}
-
-			if (method != null)
-			{
-				Expression scope = n.getScope();
-				if (scope instanceof NameExpr)
-				{
-					NameExpr nameExpr = (NameExpr) scope;
-					try
-					{
-						ResolvedValueDeclaration vd = nameExpr.resolve();
-						SimpleName simpleName1 = nameExpr.getName();
-						String name1 = simpleName1.getIdentifier();
-						Range range1 = nameExpr.getRange().get();
-						int line1 = range1.begin.line;
-						int columnStart1 = range1.begin.column;
-						int columnEnd1 = range1.end.column;
-						if (vd.isField())
-						{
-							this.classFileContainer.putField(name1, new ClassFieldLocation(getOwner(), "reference", line1, columnStart1, columnEnd1 + 1));
-						} else if (vd.isVariable())
-						{
-						this.classFileContainer.putLocalVariable(name1, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line1, columnStart1, columnEnd1 + 1));
-						} else if (vd.isParameter())
-						{
-							this.classFileContainer.putParameter(name1, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line1, columnStart1, columnEnd1 + 1));
-						}
-					} catch (UnsolvedSymbolException ignore)
-					{
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Visit all {@link ConstructorDeclaration}s.
-	 * <p>
-	 * This deals with the parameters and the constructor. Not the body of the constructor.
-	 * </p>
-	 *
-	 * @param n   The current {@code ConstructorDeclaration}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(ConstructorDeclaration n, Object arg)
-	{
-		super.visit(n, arg);
-		StringBuilder parameterTypes = new StringBuilder();
-		AtomicInteger count = new AtomicInteger();
-		n.getParameters().forEach(parameter -> {
-			SimpleName name = parameter.getName();
-			String parameterName = name.getIdentifier();
-			Range range = name.getRange().get();
-			int line = range.begin.line;
-			int columnStart = range.begin.column;
-			int columnEnd = range.end.column;
-			this.classFileContainer.putParameter(parameterName, new ClassParameterLocation(getOwner(), n.getDeclarationAsString(false, false),
-					"declaration", line, columnStart, columnEnd + 1));
-			count.getAndIncrement();
-			parameterTypes.append(parameter.getTypeAsString());
-			if (n.getParameters().size() > 1 && count.get() != n.getParameters().size())
-			{
-				parameterTypes.append(", ");
-			}
-		});
-
-		SimpleName simpleName = n.getName();
-		String constructorName = simpleName.getIdentifier();
-		Range range = simpleName.getRange().get();
-		int line = range.begin.line;
-		int columnStart = range.begin.column;
-		int columnEnd = range.end.column;
-		this.classFileContainer.putMethod(constructorName, new ClassMethodLocation(getOwner(), parameterTypes.toString(), "declaration", line,
-				columnStart,
-				columnEnd + 1));
-	}
-
-	/**
-	 * Find all {@link ExplicitConstructorInvocationStmt}s.
-	 * <p>
-	 * E.g. {@code this()} or {@code this(param, ...)} and {@code super()} or {@code super(param, ...)}.
-	 * </p>
-	 *
-	 * @param n   The current {@code ExplicitConstructorInvocationStmt}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(ExplicitConstructorInvocationStmt n, Object arg)
-	{
-		super.visit(n, arg);
-		ConstructorDeclaration constructor = findConstructorForStatement(n, this.compilationUnit);
-		if (constructor != null)
-		{
-			n.getArguments().forEach(argument -> {
-				if (argument instanceof NameExpr)
-				{
-					NameExpr nameExpr = (NameExpr) argument;
-					ResolvedValueDeclaration vd = nameExpr.resolve();
-					SimpleName simpleName = nameExpr.getName();
-					String name = simpleName.getIdentifier();
-					Range range = simpleName.getRange().get();
-					int line = range.begin.line;
-					int columnStart = range.begin.column;
-					int columnEnd = range.end.column;
-					if (vd.isField())
-					{
-						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-					} else if (vd.isVariable())
-					{
-						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), constructor.getDeclarationAsString(false, false), "reference", line, columnStart,
-								columnEnd + 1));
-					} else if (vd.isParameter())
-					{
-						this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(),
-								constructor.getDeclarationAsString(false, false),
-								"reference", line, columnStart, columnEnd + 1));
-					}
-				} else
-				{
-					if ((argument instanceof LongLiteralExpr) || (argument instanceof StringLiteralExpr) || (argument instanceof CharLiteralExpr) || argument instanceof BooleanLiteralExpr || argument instanceof NullLiteralExpr || argument instanceof IntegerLiteralExpr)
-					{
-						return;
-					}
-
-					System.err.println(argument.getClass().getSimpleName());
-				}
-			});
-		}
-	}
-
-	/**
-	 * Visit all {@link MethodDeclaration}s.
-	 * <p>
-	 * This deals with the parameters and the method name.
-	 * </p>
-	 *
-	 * @param n   The current {@code MethodDeclaration}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(MethodDeclaration n, Object arg)
-	{
-		super.visit(n, arg);
-		StringBuilder parameterTypes = new StringBuilder();
-		AtomicInteger count = new AtomicInteger();
-		n.getParameters().forEach(parameter -> {
-			SimpleName name = parameter.getName();
-			String parameterName = name.getIdentifier();
-			Range range = name.getRange().get();
-			int line = range.begin.line;
-			int columnStart = range.begin.column;
-			int columnEnd = range.end.column;
-			this.classFileContainer.putParameter(parameterName, new ClassParameterLocation(getOwner(), n.getDeclarationAsString(false, false),
-					"declaration", line, columnStart, columnEnd + 1));
-			count.getAndIncrement();
-			parameterTypes.append(parameter.getTypeAsString());
-			if (n.getParameters().size() > 1 && count.get() != n.getParameters().size())
-			{
-				parameterTypes.append(", ");
-			}
-		});
-
-		SimpleName methodSimpleName = n.getName();
-		String methodName = methodSimpleName.getIdentifier();
-		Range range = methodSimpleName.getRange().get();
-		int line = range.begin.line;
-		int columnStart = range.begin.column;
-		int columnEnd = range.end.column;
-		this.classFileContainer.putMethod(methodName, new ClassMethodLocation(getOwner(), parameterTypes.toString(), "declaration", line, columnStart,
-				columnEnd + 1));
-	}
-
-	/**
-	 * Visit all {@link MethodCallExpr}s.
-	 *
-	 * @param n   The current {@code MethodCallExpr}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(MethodCallExpr n, Object arg)
-	{
-		super.visit(n, arg);
-		CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
-		InitializerDeclaration staticInitializer = null;
-		if (method == null)
-		{
-			method = findConstructorForExpression(n, this.compilationUnit);
-			if (method == null)
-			{
-				staticInitializer = findInitializerForExpression(n, this.compilationUnit);
-			}
-		}
-
-		if (method != null)
-		{
-			if (n.hasScope())
-			{
-				Expression scope = n.getScope().get();
-				if (scope instanceof NameExpr)
-				{
-					NameExpr nameExpr = (NameExpr) scope;
-					try
-					{
-						ResolvedValueDeclaration vd = nameExpr.resolve();
-						SimpleName simpleName = nameExpr.getName();
-						String name = simpleName.getIdentifier();
-						Range range = simpleName.getRange().get();
-						int line = range.begin.line;
-						int columnStart = range.begin.column;
-						int columnEnd = range.end.column;
-						if (vd.isField())
-						{
-							this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-						} else if (vd.isVariable())
-						{
-							this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-						} else if (vd.isParameter())
-						{
-							this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-						}
-					} catch (UnsolvedSymbolException ignored)
-					{
-
-					}
-				}
-			}
-
-			CallableDeclaration<?> finalMethod = method;
-			n.getArguments().forEach(argument -> {
-				if (argument instanceof NameExpr)
-				{
-					NameExpr nameExpr = (NameExpr) argument;
-					ResolvedValueDeclaration vd = nameExpr.resolve();
-					SimpleName simpleName = nameExpr.getName();
-					String name = simpleName.getIdentifier();
-					Range range = simpleName.getRange().get();
-					int line = range.begin.line;
-					int columnStart = range.begin.column;
-					int columnEnd = range.end.column;
-					if (vd.isField())
-					{
-						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-					} else if (vd.isVariable())
-					{
-						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(finalMethod), "reference", line, columnStart, columnEnd + 1));
-					} else if (vd.isParameter())
-					{
-						this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(finalMethod), "reference", line, columnStart, columnEnd + 1));
-					}
-				}
-			});
-		} else if (staticInitializer != null)
-		{
-			if (n.hasScope())
-			{
-				Expression scope = n.getScope().get();
-				if (scope instanceof NameExpr)
-				{
-					NameExpr nameExpr = (NameExpr) scope;
-					try
-					{
-						ResolvedValueDeclaration vd = nameExpr.resolve();
-						SimpleName simpleName = nameExpr.getName();
-						String name = simpleName.getIdentifier();
-						Range range = simpleName.getRange().get();
-						int line = range.begin.line;
-						int columnStart = range.begin.column;
-						int columnEnd = range.end.column;
-						if (vd.isField())
-						{
-							this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-						} else if (vd.isVariable())
-						{
-							this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
-						} else if (vd.isParameter())
-						{
-							this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
-						}
-					} catch (UnsolvedSymbolException ignored)
-					{
-
-					}
-				}
-			}
-
-			n.getArguments().forEach(argument -> {
-				if (argument instanceof NameExpr)
-				{
-					NameExpr nameExpr = (NameExpr) argument;
-					ResolvedValueDeclaration vd = nameExpr.resolve();
-					SimpleName simpleName = nameExpr.getName();
-					String name = simpleName.getIdentifier();
-					Range range = simpleName.getRange().get();
-					int line = range.begin.line;
-					int columnStart = range.begin.column;
-					int columnEnd = range.end.column;
-					if (vd.isField())
-					{
-						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-					} else if (vd.isVariable())
-					{
-						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
-					} else if (vd.isParameter())
-					{
-						this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
-					}
-				}
-			});
-		}
-	}
-
-	/**
-	 * Visit all {@link ObjectCreationExpr}s.
-	 *
-	 * @param n   The current {@code ObjectCreationExpr}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(ObjectCreationExpr n, Object arg)
-	{
-		super.visit(n, arg);
-		CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
-		if (method == null)
-		{
-			method = findConstructorForExpression(n, this.compilationUnit);
-		}
-
-		if (method != null)
-		{
-			CallableDeclaration<?> finalMethod = method;
-			n.getArguments().forEach(argument -> {
-				if (argument instanceof NameExpr)
-				{
-					NameExpr nameExpr = (NameExpr) argument;
-					ResolvedValueDeclaration vd = nameExpr.resolve();
-					SimpleName simpleName = nameExpr.getName();
-					String name = simpleName.getIdentifier();
-					Range range = simpleName.getRange().get();
-					int line = range.begin.line;
-					int columnStart = range.begin.column;
-					int columnEnd = range.end.column;
-					if (vd.isField())
-					{
-						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-					} else if (vd.isVariable())
-					{
-						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(finalMethod), "reference", line, columnStart, columnEnd + 1));
-					} else if (vd.isParameter())
-					{
-						this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(finalMethod), "reference", line, columnStart, columnEnd + 1));
-					}
-				}
-			});
-		}
-	}
-
-	/**
-	 * Visit all {@link VariableDeclarationExpr}s.
-	 *
-	 * @param n   The current {@code VariableDeclarationExpr}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(VariableDeclarationExpr n, Object arg)
-	{
-		super.visit(n, arg);
-		CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
-		InitializerDeclaration staticInitializer = null;
-		if (method == null)
-		{
-			method = findConstructorForExpression(n, this.compilationUnit);
-			if (method == null)
-			{
-				staticInitializer = findInitializerForExpression(n, this.compilationUnit);
-			}
-		}
-
-		if (method != null)
-		{
-			CallableDeclaration<?> finalMethod = method;
-			n.getVariables().forEach(variable -> {
-				ResolvedValueDeclaration vd = variable.resolve();
-				SimpleName simpleName = variable.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(finalMethod), "declaration", line, columnStart, columnEnd + 1));
-			});
-		} else if (staticInitializer != null)
-		{
-			n.getVariables().forEach(variable -> {
-				ResolvedValueDeclaration vd = variable.resolve();
-				SimpleName simpleName = variable.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "declaration", line, columnStart, columnEnd + 1));
-			});
-		}
-	}
-
-	/**
-	 * Visit all {@link AssignExpr}s.
-	 *
-	 * @param n   The current {@code AssignExpr}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(AssignExpr n, Object arg)
-	{
-		super.visit(n, arg);
-		CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
-		InitializerDeclaration staticInitializer = null;
-		if (method == null)
-		{
-			method = findConstructorForExpression(n, this.compilationUnit);
-			if (method == null)
-			{
-				staticInitializer = findInitializerForExpression(n, this.compilationUnit);
-			}
-		}
-
-		if (method != null)
-		{
-			Expression value = n.getValue();
-			if (value instanceof NameExpr)
-			{
-				NameExpr nameExpr = (NameExpr) value;
-				ResolvedValueDeclaration vd = nameExpr.resolve();
-				SimpleName simpleName = nameExpr.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				if (vd.isField())
-				{
-					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isVariable())
-				{
-					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isParameter())
-				{
-					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				}
-			}
-
-			Expression target = n.getTarget();
-			if (target instanceof NameExpr)
-			{
-				NameExpr nameExpr = (NameExpr) target;
-				try
-				{
-					ResolvedValueDeclaration vd = nameExpr.resolve();
-					SimpleName simpleName = nameExpr.getName();
-					String name = simpleName.getIdentifier();
-					Range range = simpleName.getRange().get();
-					int line = range.begin.line;
-					int columnStart = range.begin.column;
-					int columnEnd = range.end.column;
-					if (vd.isField())
-					{
-						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-					} else if (vd.isVariable())
-					{
-						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-					} else if (vd.isParameter())
-					{
-						this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-					}
-				} catch (UnsolvedSymbolException e)
-				{
-					System.err.println(nameExpr.getName().getIdentifier() + " not resolved. " + e.getMessage());
-				}
-			}
-		} else if (staticInitializer != null)
-		{
-			Expression value = n.getValue();
-			if (value instanceof NameExpr)
-			{
-				NameExpr nameExpr = (NameExpr) value;
-				ResolvedValueDeclaration vd = nameExpr.resolve();
-				SimpleName simpleName = nameExpr.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				if (vd.isField())
-				{
-					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isVariable())
-				{
-					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
-				}/* else if (vd.isParameter()) {
+    private final ClassFileContainer classFileContainer;
+    private final CompilationUnit compilationUnit;
+
+    public MyVoidVisitor(ClassFileContainer container, CompilationUnit compilationUnit)
+    {
+        this.classFileContainer = container;
+        this.compilationUnit = compilationUnit;
+    }
+
+    private String getOwner()
+    {
+        return this.classFileContainer.className.substring(this.classFileContainer.className.lastIndexOf('.') + 1);
+    }
+
+    private String getMethod(CallableDeclaration<?> method)
+    {
+        return method.getDeclarationAsString(false, false);
+    }
+
+    /**
+     * Visit all {@link FieldDeclaration}s.
+     * <p>
+     * This only worries about the field that is being declared.
+     * </p>
+     *
+     * @param n   The current {@code FieldDeclaration}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(FieldDeclaration n, Object arg)
+    {
+        super.visit(n, arg);
+        n.getVariables().forEach(variableDeclarator -> {
+            SimpleName name = variableDeclarator.getName();
+            String fieldName = name.getIdentifier();
+            Range range = name.getRange().get();
+            int line = range.begin.line;
+            int columnStart = range.begin.column;
+            int columnEnd = range.end.column;
+            this.classFileContainer.putField(fieldName, new ClassFieldLocation(getOwner(), "declaration", line, columnStart, columnEnd + 1));
+        });
+    }
+
+    /**
+     * Visit all {@link FieldAccessExpr}s.
+     * <p>
+     * This finds the field accesses.
+     * </p>
+     *
+     * @param n   The current {@code FieldAccessExpr}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(FieldAccessExpr n, Object arg)
+    {
+        super.visit(n, arg);
+        SimpleName simpleName = n.getName();
+        String fieldName = simpleName.getIdentifier();
+        Range range = n.getTokenRange().get().getEnd().getRange().get();
+        int line = range.begin.line;
+        int columnStart = range.begin.column;
+        int columnEnd = range.end.column;
+        this.classFileContainer.putField(fieldName, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+
+        if (n.hasScope())
+        {
+            CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+            if (method == null)
+            {
+                method = findConstructorForExpression(n, this.compilationUnit);
+            }
+
+            if (method != null)
+            {
+                Expression scope = n.getScope();
+                if (scope instanceof NameExpr)
+                {
+                    NameExpr nameExpr = (NameExpr) scope;
+                    try
+                    {
+                        ResolvedValueDeclaration vd = nameExpr.resolve();
+                        SimpleName simpleName1 = nameExpr.getName();
+                        String name1 = simpleName1.getIdentifier();
+                        Range range1 = nameExpr.getRange().get();
+                        int line1 = range1.begin.line;
+                        int columnStart1 = range1.begin.column;
+                        int columnEnd1 = range1.end.column;
+                        if (vd.isField())
+                        {
+                            this.classFileContainer.putField(name1, new ClassFieldLocation(getOwner(), "reference", line1, columnStart1, columnEnd1 + 1));
+                        } else if (vd.isVariable())
+                        {
+                            this.classFileContainer.putLocalVariable(name1, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line1, columnStart1, columnEnd1 + 1));
+                        } else if (vd.isParameter())
+                        {
+                            this.classFileContainer.putParameter(name1, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line1, columnStart1, columnEnd1 + 1));
+                        }
+                    } catch (UnsolvedSymbolException ignore)
+                    {
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Visit all {@link ConstructorDeclaration}s.
+     * <p>
+     * This deals with the parameters and the constructor. Not the body of the constructor.
+     * </p>
+     *
+     * @param n   The current {@code ConstructorDeclaration}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(ConstructorDeclaration n, Object arg)
+    {
+        super.visit(n, arg);
+        StringBuilder parameterTypes = new StringBuilder();
+        AtomicInteger count = new AtomicInteger();
+        n.getParameters().forEach(parameter -> {
+            SimpleName name = parameter.getName();
+            String parameterName = name.getIdentifier();
+            Range range = name.getRange().get();
+            int line = range.begin.line;
+            int columnStart = range.begin.column;
+            int columnEnd = range.end.column;
+            this.classFileContainer.putParameter(parameterName, new ClassParameterLocation(getOwner(), n.getDeclarationAsString(false, false),
+                    "declaration", line, columnStart, columnEnd + 1));
+            count.getAndIncrement();
+            parameterTypes.append(parameter.getTypeAsString());
+            if (n.getParameters().size() > 1 && count.get() != n.getParameters().size())
+            {
+                parameterTypes.append(", ");
+            }
+        });
+
+        SimpleName simpleName = n.getName();
+        String constructorName = simpleName.getIdentifier();
+        Range range = simpleName.getRange().get();
+        int line = range.begin.line;
+        int columnStart = range.begin.column;
+        int columnEnd = range.end.column;
+        this.classFileContainer.putMethod(constructorName, new ClassMethodLocation(getOwner(), parameterTypes.toString(), "declaration", line,
+                columnStart,
+                columnEnd + 1));
+    }
+
+    /**
+     * Find all {@link ExplicitConstructorInvocationStmt}s.
+     * <p>
+     * E.g. {@code this()} or {@code this(param, ...)} and {@code super()} or {@code super(param, ...)}.
+     * </p>
+     *
+     * @param n   The current {@code ExplicitConstructorInvocationStmt}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(ExplicitConstructorInvocationStmt n, Object arg)
+    {
+        super.visit(n, arg);
+        ConstructorDeclaration constructor = findConstructorForStatement(n, this.compilationUnit);
+        if (constructor != null)
+        {
+            n.getArguments().forEach(argument -> {
+                if (argument instanceof NameExpr)
+                {
+                    NameExpr nameExpr = (NameExpr) argument;
+                    ResolvedValueDeclaration vd = nameExpr.resolve();
+                    SimpleName simpleName = nameExpr.getName();
+                    String name = simpleName.getIdentifier();
+                    Range range = simpleName.getRange().get();
+                    int line = range.begin.line;
+                    int columnStart = range.begin.column;
+                    int columnEnd = range.end.column;
+                    if (vd.isField())
+                    {
+                        this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                    } else if (vd.isVariable())
+                    {
+                        this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), constructor.getDeclarationAsString(false, false), "reference", line, columnStart,
+                                columnEnd + 1));
+                    } else if (vd.isParameter())
+                    {
+                        this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(),
+                                constructor.getDeclarationAsString(false, false),
+                                "reference", line, columnStart, columnEnd + 1));
+                    }
+                } else
+                {
+                    if ((argument instanceof LongLiteralExpr) || (argument instanceof StringLiteralExpr) || (argument instanceof CharLiteralExpr) || argument instanceof BooleanLiteralExpr || argument instanceof NullLiteralExpr || argument instanceof IntegerLiteralExpr)
+                    {
+                        return;
+                    }
+
+                    System.err.println(argument.getClass().getSimpleName());
+                }
+            });
+        }
+    }
+
+    /**
+     * Visit all {@link MethodDeclaration}s.
+     * <p>
+     * This deals with the parameters and the method name.
+     * </p>
+     *
+     * @param n   The current {@code MethodDeclaration}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(MethodDeclaration n, Object arg)
+    {
+        super.visit(n, arg);
+        StringBuilder parameterTypes = new StringBuilder();
+        AtomicInteger count = new AtomicInteger();
+        n.getParameters().forEach(parameter -> {
+            SimpleName name = parameter.getName();
+            String parameterName = name.getIdentifier();
+            Range range = name.getRange().get();
+            int line = range.begin.line;
+            int columnStart = range.begin.column;
+            int columnEnd = range.end.column;
+            this.classFileContainer.putParameter(parameterName, new ClassParameterLocation(getOwner(), n.getDeclarationAsString(false, false),
+                    "declaration", line, columnStart, columnEnd + 1));
+            count.getAndIncrement();
+            parameterTypes.append(parameter.getTypeAsString());
+            if (n.getParameters().size() > 1 && count.get() != n.getParameters().size())
+            {
+                parameterTypes.append(", ");
+            }
+        });
+
+        SimpleName methodSimpleName = n.getName();
+        String methodName = methodSimpleName.getIdentifier();
+        Range range = methodSimpleName.getRange().get();
+        int line = range.begin.line;
+        int columnStart = range.begin.column;
+        int columnEnd = range.end.column;
+        this.classFileContainer.putMethod(methodName, new ClassMethodLocation(getOwner(), parameterTypes.toString(), "declaration", line, columnStart,
+                columnEnd + 1));
+    }
+
+    /**
+     * Visit all {@link MethodCallExpr}s.
+     *
+     * @param n   The current {@code MethodCallExpr}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(MethodCallExpr n, Object arg)
+    {
+        super.visit(n, arg);
+        CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+        InitializerDeclaration staticInitializer = null;
+        if (method == null)
+        {
+            method = findConstructorForExpression(n, this.compilationUnit);
+            if (method == null)
+            {
+                staticInitializer = findInitializerForExpression(n, this.compilationUnit);
+            }
+        }
+
+        if (method != null)
+        {
+            if (n.hasScope())
+            {
+                Expression scope = n.getScope().get();
+                if (scope instanceof NameExpr)
+                {
+                    NameExpr nameExpr = (NameExpr) scope;
+                    try
+                    {
+                        ResolvedValueDeclaration vd = nameExpr.resolve();
+                        SimpleName simpleName = nameExpr.getName();
+                        String name = simpleName.getIdentifier();
+                        Range range = simpleName.getRange().get();
+                        int line = range.begin.line;
+                        int columnStart = range.begin.column;
+                        int columnEnd = range.end.column;
+                        if (vd.isField())
+                        {
+                            this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                        } else if (vd.isVariable())
+                        {
+                            this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                        } else if (vd.isParameter())
+                        {
+                            this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                        }
+                    } catch (UnsolvedSymbolException ignored)
+                    {
+
+                    }
+                }
+            }
+
+            CallableDeclaration<?> finalMethod = method;
+            n.getArguments().forEach(argument -> {
+                if (argument instanceof NameExpr)
+                {
+                    NameExpr nameExpr = (NameExpr) argument;
+                    ResolvedValueDeclaration vd = nameExpr.resolve();
+                    SimpleName simpleName = nameExpr.getName();
+                    String name = simpleName.getIdentifier();
+                    Range range = simpleName.getRange().get();
+                    int line = range.begin.line;
+                    int columnStart = range.begin.column;
+                    int columnEnd = range.end.column;
+                    if (vd.isField())
+                    {
+                        this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                    } else if (vd.isVariable())
+                    {
+                        this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(finalMethod), "reference", line, columnStart, columnEnd + 1));
+                    } else if (vd.isParameter())
+                    {
+                        this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(finalMethod), "reference", line, columnStart, columnEnd + 1));
+                    }
+                }
+            });
+        } else if (staticInitializer != null)
+        {
+            if (n.hasScope())
+            {
+                Expression scope = n.getScope().get();
+                if (scope instanceof NameExpr)
+                {
+                    NameExpr nameExpr = (NameExpr) scope;
+                    try
+                    {
+                        ResolvedValueDeclaration vd = nameExpr.resolve();
+                        SimpleName simpleName = nameExpr.getName();
+                        String name = simpleName.getIdentifier();
+                        Range range = simpleName.getRange().get();
+                        int line = range.begin.line;
+                        int columnStart = range.begin.column;
+                        int columnEnd = range.end.column;
+                        if (vd.isField())
+                        {
+                            this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                        } else if (vd.isVariable())
+                        {
+                            this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+                        } else if (vd.isParameter())
+                        {
+                            this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+                        }
+                    } catch (UnsolvedSymbolException ignored)
+                    {
+
+                    }
+                }
+            }
+
+            n.getArguments().forEach(argument -> {
+                if (argument instanceof NameExpr)
+                {
+                    NameExpr nameExpr = (NameExpr) argument;
+                    ResolvedValueDeclaration vd = nameExpr.resolve();
+                    SimpleName simpleName = nameExpr.getName();
+                    String name = simpleName.getIdentifier();
+                    Range range = simpleName.getRange().get();
+                    int line = range.begin.line;
+                    int columnStart = range.begin.column;
+                    int columnEnd = range.end.column;
+                    if (vd.isField())
+                    {
+                        this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                    } else if (vd.isVariable())
+                    {
+                        this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+                    } else if (vd.isParameter())
+                    {
+                        this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+                    }
+                }
+            });
+        }
+    }
+
+    /**
+     * Visit all {@link ObjectCreationExpr}s.
+     *
+     * @param n   The current {@code ObjectCreationExpr}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(ObjectCreationExpr n, Object arg)
+    {
+        super.visit(n, arg);
+        CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+        if (method == null)
+        {
+            method = findConstructorForExpression(n, this.compilationUnit);
+        }
+
+        if (method != null)
+        {
+            CallableDeclaration<?> finalMethod = method;
+            n.getArguments().forEach(argument -> {
+                if (argument instanceof NameExpr)
+                {
+                    NameExpr nameExpr = (NameExpr) argument;
+                    ResolvedValueDeclaration vd = nameExpr.resolve();
+                    SimpleName simpleName = nameExpr.getName();
+                    String name = simpleName.getIdentifier();
+                    Range range = simpleName.getRange().get();
+                    int line = range.begin.line;
+                    int columnStart = range.begin.column;
+                    int columnEnd = range.end.column;
+                    if (vd.isField())
+                    {
+                        this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                    } else if (vd.isVariable())
+                    {
+                        this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(finalMethod), "reference", line, columnStart, columnEnd + 1));
+                    } else if (vd.isParameter())
+                    {
+                        this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(finalMethod), "reference", line, columnStart, columnEnd + 1));
+                    }
+                }
+            });
+        }
+    }
+
+    /**
+     * Visit all {@link VariableDeclarationExpr}s.
+     *
+     * @param n   The current {@code VariableDeclarationExpr}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(VariableDeclarationExpr n, Object arg)
+    {
+        super.visit(n, arg);
+        CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+        InitializerDeclaration staticInitializer = null;
+        if (method == null)
+        {
+            method = findConstructorForExpression(n, this.compilationUnit);
+            if (method == null)
+            {
+                staticInitializer = findInitializerForExpression(n, this.compilationUnit);
+            }
+        }
+
+        if (method != null)
+        {
+            CallableDeclaration<?> finalMethod = method;
+            n.getVariables().forEach(variable -> {
+                ResolvedValueDeclaration vd = variable.resolve();
+                SimpleName simpleName = variable.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(finalMethod), "declaration", line, columnStart, columnEnd + 1));
+            });
+        } else if (staticInitializer != null)
+        {
+            n.getVariables().forEach(variable -> {
+                ResolvedValueDeclaration vd = variable.resolve();
+                SimpleName simpleName = variable.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "declaration", line, columnStart, columnEnd + 1));
+            });
+        }
+    }
+
+    /**
+     * Visit all {@link AssignExpr}s.
+     *
+     * @param n   The current {@code AssignExpr}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(AssignExpr n, Object arg)
+    {
+        super.visit(n, arg);
+        CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+        InitializerDeclaration staticInitializer = null;
+        if (method == null)
+        {
+            method = findConstructorForExpression(n, this.compilationUnit);
+            if (method == null)
+            {
+                staticInitializer = findInitializerForExpression(n, this.compilationUnit);
+            }
+        }
+
+        if (method != null)
+        {
+            Expression value = n.getValue();
+            if (value instanceof NameExpr)
+            {
+                NameExpr nameExpr = (NameExpr) value;
+                ResolvedValueDeclaration vd = nameExpr.resolve();
+                SimpleName simpleName = nameExpr.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                if (vd.isField())
+                {
+                    this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isVariable())
+                {
+                    this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isParameter())
+                {
+                    this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                }
+            }
+
+            Expression target = n.getTarget();
+            if (target instanceof NameExpr)
+            {
+                NameExpr nameExpr = (NameExpr) target;
+                try
+                {
+                    ResolvedValueDeclaration vd = nameExpr.resolve();
+                    SimpleName simpleName = nameExpr.getName();
+                    String name = simpleName.getIdentifier();
+                    Range range = simpleName.getRange().get();
+                    int line = range.begin.line;
+                    int columnStart = range.begin.column;
+                    int columnEnd = range.end.column;
+                    if (vd.isField())
+                    {
+                        this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                    } else if (vd.isVariable())
+                    {
+                        this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                    } else if (vd.isParameter())
+                    {
+                        this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                    }
+                } catch (UnsolvedSymbolException e)
+                {
+                    System.err.println(nameExpr.getName().getIdentifier() + " not resolved. " + e.getMessage());
+                }
+            }
+        } else if (staticInitializer != null)
+        {
+            Expression value = n.getValue();
+            if (value instanceof NameExpr)
+            {
+                NameExpr nameExpr = (NameExpr) value;
+                ResolvedValueDeclaration vd = nameExpr.resolve();
+                SimpleName simpleName = nameExpr.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                if (vd.isField())
+                {
+                    this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isVariable())
+                {
+                    this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+                }/* else if (vd.isParameter()) {
 					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
 				}*/
-			}
-
-			Expression target = n.getTarget();
-			if (target instanceof NameExpr)
-			{
-				NameExpr nameExpr = (NameExpr) target;
-				try
-				{
-					ResolvedValueDeclaration vd = nameExpr.resolve();
-					SimpleName simpleName = nameExpr.getName();
-					String name = simpleName.getIdentifier();
-					Range range = simpleName.getRange().get();
-					int line = range.begin.line;
-					int columnStart = range.begin.column;
-					int columnEnd = range.end.column;
-					if (vd.isField())
-					{
-						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-					} else if (vd.isVariable())
-					{
-						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
-					}/* else if (vd.isParameter()) {
+            }
+
+            Expression target = n.getTarget();
+            if (target instanceof NameExpr)
+            {
+                NameExpr nameExpr = (NameExpr) target;
+                try
+                {
+                    ResolvedValueDeclaration vd = nameExpr.resolve();
+                    SimpleName simpleName = nameExpr.getName();
+                    String name = simpleName.getIdentifier();
+                    Range range = simpleName.getRange().get();
+                    int line = range.begin.line;
+                    int columnStart = range.begin.column;
+                    int columnEnd = range.end.column;
+                    if (vd.isField())
+                    {
+                        this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                    } else if (vd.isVariable())
+                    {
+                        this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+                    }/* else if (vd.isParameter()) {
 						System.err.println("AssignExpr - parameter2");
 					}*/
-				} catch (UnsolvedSymbolException e)
-				{
-					System.err.println(nameExpr.getName().getIdentifier() + " not resolved. " + e.getMessage());
-				}
-			}
-		}
-	}
-
-	/**
-	 * Visit all {@link CatchClause}s.
-	 *
-	 * @param n   The current {@code CatchClause}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(CatchClause n, Object arg)
-	{
-		super.visit(n, arg);
-		TryStmt parentNode = (TryStmt) n.getParentNode().get();
-		CallableDeclaration<?> method = findMethodForStatement(parentNode, this.compilationUnit);
-		if (method == null)
-		{
-			method = findConstructorForStatement(parentNode, this.compilationUnit);
-		}
-
-		if (method != null)
-		{
-			SimpleName simpleName = n.getParameter().getName();
-			String name = simpleName.getIdentifier();
-			Range range = simpleName.getRange().get();
-			int line = range.begin.line;
-			int columnStart = range.begin.column;
-			int columnEnd = range.end.column;
-			this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "declaration", line, columnStart, columnEnd + 1));
-		}
-	}
-
-	/**
-	 * Visit all {@link ThrowStmt}s.
-	 *
-	 * @param n   The current {@code ThrowStmt}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(ThrowStmt n, Object arg)
-	{
-		super.visit(n, arg);
-		Expression expression = n.getExpression();
-		if (expression instanceof NameExpr)
-		{
-			NameExpr nameExpr = (NameExpr) expression;
-			CallableDeclaration<?> method = findMethodForStatement(n, this.compilationUnit);
-			if (method == null)
-			{
-				method = findConstructorForStatement(n, this.compilationUnit);
-			}
-
-			if (method != null)
-			{
-				ResolvedValueDeclaration vd = nameExpr.resolve();
-				SimpleName simpleName = nameExpr.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				if (vd.isField())
-				{
-					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isVariable())
-				{
-					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isParameter())
-				{
-					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Visit all {@link InstanceOfExpr}s.
-	 *
-	 * @param n   The current {@code InstanceOfExpr}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(InstanceOfExpr n, Object arg)
-	{
-		super.visit(n, arg);
-		CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
-		if (method == null)
-		{
-			method = findConstructorForExpression(n, this.compilationUnit);
-		}
-
-		if (method != null)
-		{
-			Expression expression = n.getExpression();
-			if (expression instanceof NameExpr)
-			{
-				NameExpr nameExpr = (NameExpr) expression;
-				ResolvedValueDeclaration vd = nameExpr.resolve();
-				SimpleName simpleName = nameExpr.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				if (vd.isField())
-				{
-					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isVariable())
-				{
-					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isParameter())
-				{
-					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Visit all {@link BinaryExpr}s.
-	 *
-	 * @param n   The current {@code BinaryExpr}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(BinaryExpr n, Object arg)
-	{
-		super.visit(n, arg);
-		CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
-		if (method == null)
-		{
-			method = findConstructorForExpression(n, this.compilationUnit);
-		}
-
-		if (method != null)
-		{
-			Expression left = n.getLeft();
-			if (left instanceof NameExpr)
-			{
-				NameExpr nameExpr = (NameExpr) left;
-				ResolvedValueDeclaration vd = nameExpr.resolve();
-				SimpleName simpleName = nameExpr.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				if (vd.isField())
-				{
-					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isVariable())
-				{
-					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isParameter())
-				{
-					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				}
-			}
-
-			Expression right = n.getRight();
-			if (right instanceof NameExpr)
-			{
-				NameExpr nameExpr = (NameExpr) right;
-				ResolvedValueDeclaration vd = nameExpr.resolve();
-				SimpleName simpleName = nameExpr.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				if (vd.isField())
-				{
-					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isVariable())
-				{
-					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isParameter())
-				{
-					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Visit all {@link CastExpr}s.
-	 *
-	 * @param n   The current {@code CastExpr}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(CastExpr n, Object arg)
-	{
-		super.visit(n, arg);
-		CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
-		if (method == null)
-		{
-			method = findConstructorForExpression(n, this.compilationUnit);
-		}
-
-		if (method != null)
-		{
-			Expression expression = n.getExpression();
-			if (expression instanceof NameExpr)
-			{
-				NameExpr nameExpr = (NameExpr) expression;
-				ResolvedValueDeclaration vd = nameExpr.resolve();
-				SimpleName simpleName = nameExpr.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				if (vd.isField())
-				{
-					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isVariable())
-				{
-					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isParameter())
-				{
-					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Visit all {@link IfStmt}s.
-	 *
-	 * @param n   The current {@code IfStmt}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(IfStmt n, Object arg)
-	{
-		super.visit(n, arg);
-		Expression condition = n.getCondition();
-		if (condition instanceof NameExpr)
-		{
-			NameExpr nameExpr = (NameExpr) condition;
-			CallableDeclaration<?> method = findMethodForStatement(n, this.compilationUnit);
-			InitializerDeclaration staticInitializer = null;
-			if (method == null)
-			{
-				method = findConstructorForStatement(n, this.compilationUnit);
-				if (method == null)
-				{
-					staticInitializer = findInitializerForStatement(n, this.compilationUnit);
-				}
-			}
-
-			if (method != null)
-			{
-				ResolvedValueDeclaration vd = nameExpr.resolve();
-				SimpleName simpleName = nameExpr.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				if (vd.isField())
-				{
-					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isVariable())
-				{
-					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isParameter())
-				{
-					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				}
-			} else if (staticInitializer != null)
-			{
-				ResolvedValueDeclaration vd = nameExpr.resolve();
-				SimpleName simpleName = nameExpr.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				if (vd.isField())
-				{
-					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isVariable())
-				{
-					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isParameter())
-				{
-					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Visit all {@link ArrayInitializerExpr}s.
-	 *
-	 * @param n   The current {@code ArrayInitializerExpr}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(ArrayInitializerExpr n, Object arg)
-	{
-		super.visit(n, arg);
-		n.getValues().forEach(value -> {
-			if (value instanceof NameExpr)
-			{
-				NameExpr nameExpr = (NameExpr) value;
-				CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
-				if (method == null)
-				{
-					method = findConstructorForExpression(n, this.compilationUnit);
-				}
-
-				if (method != null)
-				{
-					ResolvedValueDeclaration vd = nameExpr.resolve();
-					SimpleName simpleName = nameExpr.getName();
-					String name = simpleName.getIdentifier();
-					Range range = simpleName.getRange().get();
-					int line = range.begin.line;
-					int columnStart = range.begin.column;
-					int columnEnd = range.end.column;
-					if (vd.isField())
-					{
-						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-					} else if (vd.isVariable())
-					{
-						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-					} else if (vd.isParameter())
-					{
-						this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-					}
-				}
-			}
-		});
-	}
-
-	/**
-	 * Visit all {@link ArrayCreationExpr}s.
-	 *
-	 * @param n   The current {@code ArrayCreationExpr}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(ArrayCreationExpr n, Object arg)
-	{
-		super.visit(n, arg);
-		n.getLevels().forEach(level -> {
-			Expression dimension = level.getDimension().orElse(null);
-			if (dimension instanceof NameExpr)
-			{
-				NameExpr nameExpr = (NameExpr) dimension;
-				CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
-				if (method == null)
-				{
-					method = findConstructorForExpression(n, this.compilationUnit);
-				}
-
-				if (method != null)
-				{
-					ResolvedValueDeclaration vd = nameExpr.resolve();
-					SimpleName simpleName = nameExpr.getName();
-					String name = simpleName.getIdentifier();
-					Range range = simpleName.getRange().get();
-					int line = range.begin.line;
-					int columnStart = range.begin.column;
-					int columnEnd = range.end.column;
-					if (vd.isField())
-					{
-						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-					} else if (vd.isVariable())
-					{
-						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-					} else if (vd.isParameter())
-					{
-						this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-					}
-				}
-			}
-		});
-	}
-
-	/**
-	 * Visit all {@link ArrayAccessExpr}s.
-	 *
-	 * @param n   The current {@code ArrayAccessExpr}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(ArrayAccessExpr n, Object arg)
-	{
-		super.visit(n, arg);
-		Expression expression = n.getName();
-		if (expression instanceof NameExpr)
-		{
-			NameExpr nameExpr = (NameExpr) expression;
-			CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
-			if (method == null)
-			{
-				method = findConstructorForExpression(n, this.compilationUnit);
-			}
-
-			if (method != null)
-			{
-				ResolvedValueDeclaration vd = nameExpr.resolve();
-				SimpleName simpleName = nameExpr.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				if (vd.isField())
-				{
-					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isVariable())
-				{
-					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isParameter())
-				{
-					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				}
-			}
-		}
-
-		Expression index = n.getIndex();
-		if (index instanceof NameExpr)
-		{
-			NameExpr nameExpr = (NameExpr) index;
-			CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
-			if (method == null)
-			{
-				method = findConstructorForExpression(n, this.compilationUnit);
-			}
-
-			if (method != null)
-			{
-				ResolvedValueDeclaration vd = nameExpr.resolve();
-				SimpleName simpleName = nameExpr.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				if (vd.isField())
-				{
-					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isVariable())
-				{
-					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isParameter())
-				{
-					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Visit all {@link ForEachStmt}s.
-	 *
-	 * @param n   The current {@code ForEachStmt}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(ForEachStmt n, Object arg)
-	{
-		super.visit(n, arg);
-		Expression iterable = n.getIterable();
-		if (iterable instanceof NameExpr)
-		{
-			NameExpr nameExpr = (NameExpr) iterable;
-			CallableDeclaration<?> method = findMethodForStatement(n, this.compilationUnit);
-			if (method == null)
-			{
-				method = findConstructorForStatement(n, this.compilationUnit);
-			}
-
-			if (method != null)
-			{
-				ResolvedValueDeclaration vd = nameExpr.resolve();
-				SimpleName simpleName = nameExpr.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				if (vd.isField())
-				{
-					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isVariable())
-				{
-					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isParameter())
-				{
-					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Visit all {@link ReturnStmt}s.
-	 *
-	 * @param n   The current {@code ReturnStmt}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(ReturnStmt n, Object arg)
-	{
-		super.visit(n, arg);
-		Expression expression = n.getExpression().orElse(null);
-		if (expression instanceof NameExpr)
-		{
-			NameExpr nameExpr = (NameExpr) expression;
-			CallableDeclaration<?> method = findMethodForStatement(n, this.compilationUnit);
-			if (method == null)
-			{
-				method = findConstructorForStatement(n, this.compilationUnit);
-			}
-
-			if (method != null)
-			{
-				ResolvedValueDeclaration vd = nameExpr.resolve();
-				SimpleName simpleName = nameExpr.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				if (vd.isField())
-				{
-					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isVariable())
-				{
-					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isParameter())
-				{
-					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Visit all {@link UnaryExpr}s.
-	 *
-	 * @param n   The current {@code UnaryExpr}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(UnaryExpr n, Object arg)
-	{
-		super.visit(n, arg);
-		Expression expression = n.getExpression();
-		if (expression instanceof NameExpr)
-		{
-			NameExpr nameExpr = (NameExpr) expression;
-			CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
-			if (method == null)
-			{
-				method = findConstructorForExpression(n, this.compilationUnit);
-			}
-
-			if (method != null)
-			{
-				try
-				{
-					ResolvedValueDeclaration vd = nameExpr.resolve();
-					SimpleName simpleName = nameExpr.getName();
-					String name = simpleName.getIdentifier();
-					Range range = simpleName.getRange().get();
-					int line = range.begin.line;
-					int columnStart = range.begin.column;
-					int columnEnd = range.end.column;
-					if (vd.isField())
-					{
-						this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-					} else if (vd.isVariable())
-					{
-						this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-					} else if (vd.isParameter())
-					{
-						this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-					}
-				} catch (UnsolvedSymbolException ignored)
-				{
-				}
-			}
-		}
-	}
-
-	/**
-	 * Visit all {@link ConditionalExpr}s.
-	 *
-	 * @param n   The current {@code ConditionalExpr}
-	 * @param arg Don't worry about it
-	 */
-	@Override
-	public void visit(ConditionalExpr n, Object arg)
-	{
-		super.visit(n, arg);
-		Expression elseExpr = n.getElseExpr();
-		if (elseExpr instanceof NameExpr)
-		{
-			NameExpr nameExpr = (NameExpr) elseExpr;
-			CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
-			if (method == null)
-			{
-				method = findConstructorForExpression(n, this.compilationUnit);
-			}
-
-			if (method != null)
-			{
-				ResolvedValueDeclaration vd = nameExpr.resolve();
-				SimpleName simpleName = nameExpr.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				if (vd.isField())
-				{
-					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isVariable())
-				{
-					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isParameter())
-				{
-					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				}
-			}
-		}
-
-		Expression thenExpr = n.getThenExpr();
-		if (thenExpr instanceof NameExpr)
-		{
-			NameExpr nameExpr = (NameExpr) thenExpr;
-			CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
-			if (method == null)
-			{
-				method = findConstructorForExpression(n, this.compilationUnit);
-			}
-
-			if (method != null)
-			{
-				ResolvedValueDeclaration vd = nameExpr.resolve();
-				SimpleName simpleName = nameExpr.getName();
-				String name = simpleName.getIdentifier();
-				Range range = simpleName.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				if (vd.isField())
-				{
-					this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isVariable())
-				{
-					this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
-				} else if (vd.isParameter())
-				{
-					this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd));
-				}
-			}
-		}
-	}
-
-	@Override
-	public void visit(LambdaExpr n, Object arg)
-	{
-		super.visit(n, arg);
-		CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
-		if (method == null)
-		{
-			method = findConstructorForExpression(n, this.compilationUnit);
-		}
-
-		if (method != null)
-		{
-			CallableDeclaration<?> finalMethod = method;
-			n.getParameters().forEach(parameter -> {
-				SimpleName simpleName = parameter.getName();
-				String name = simpleName.getIdentifier();
-				Range range = parameter.getRange().get();
-				int line = range.begin.line;
-				int columnStart = range.begin.column;
-				int columnEnd = range.end.column;
-				this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(finalMethod), "declaration", line, columnStart, columnEnd + 1));
-			});
-		}
-	}
-
-	/**
-	 * Look through the {@link CompilationUnit} for the specific statement within its methods.
-	 *
-	 * @param statement The {@code statement} we are looking for
-	 * @param cu        The {@code CompilationUnit}
-	 * @return the method that contains the {@code statement}.
-	 */
-	private MethodDeclaration findMethodForStatement(Statement statement, CompilationUnit cu)
-	{
-		final boolean[] contains = {false};
-		final MethodDeclaration[] methodDeclaration = {null};
-		cu.accept(new VoidVisitorAdapter<Void>()
-		{
-			@Override
-			public void visit(MethodDeclaration n, Void arg)
-			{
-				super.visit(n, arg);
-				if (!n.isAbstract())
-				{
-					for (Statement statement1 : n.getBody().get().getStatements())
-					{
-						if (statement1.containsWithinRange(statement))
-						{
-							contains[0] = true;
-							methodDeclaration[0] = n;
-						}
-					}
-				}
-			}
-		}, null);
-
-		if (contains[0])
-		{
-			return methodDeclaration[0];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Look through the {@link CompilationUnit} for the specific statement within its methods.
-	 *
-	 * @param expression The {@code expression} we are looking for
-	 * @param cu         The {@code CompilationUnit}
-	 * @return the method that contains the {@code expression}.
-	 */
-	private MethodDeclaration findMethodForExpression(Expression expression, CompilationUnit cu)
-	{
-		final boolean[] contains = {false};
-		final MethodDeclaration[] methodDeclaration = {null};
-		cu.accept(new VoidVisitorAdapter<Void>()
-		{
-			@Override
-			public void visit(MethodDeclaration n, Void arg)
-			{
-				super.visit(n, arg);
-				if (!n.isAbstract())
-				{
-					for (Statement statement : n.getBody().get().getStatements())
-					{
-						if (statement.containsWithinRange(expression))
-						{
-							contains[0] = true;
-							methodDeclaration[0] = n;
-						}
-					}
-				}
-			}
-		}, null);
-
-		if (contains[0])
-		{
-			return methodDeclaration[0];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Look through the {@link CompilationUnit} for the specific statement within its methods.
-	 *
-	 * @param statement The {@code statement} we are looking for
-	 * @param cu        The {@code CompilationUnit}
-	 * @return the constructor that contains the {@code statement}.
-	 */
-	private ConstructorDeclaration findConstructorForStatement(Statement statement, CompilationUnit cu)
-	{
-		final boolean[] contains = {false};
-		final ConstructorDeclaration[] constructorDeclaration = {null};
-		cu.accept(new VoidVisitorAdapter<Void>()
-		{
-			@Override
-			public void visit(ConstructorDeclaration n, Void arg)
-			{
-				super.visit(n, arg);
-				for (Statement statement1 : n.getBody().getStatements())
-				{
-					if (statement1.containsWithinRange(statement))
-					{
-						contains[0] = true;
-						constructorDeclaration[0] = n;
-					}
-				}
-			}
-		}, null);
-
-		if (contains[0])
-		{
-			return constructorDeclaration[0];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Look through the {@link CompilationUnit} for the specific statement within its methods.
-	 *
-	 * @param expression The {@code expression} we are looking for
-	 * @param cu         The {@code CompilationUnit}
-	 * @return the constructor that contains the {@code expression}.
-	 */
-	private ConstructorDeclaration findConstructorForExpression(Expression expression, CompilationUnit cu)
-	{
-		final boolean[] contains = {false};
-		final ConstructorDeclaration[] constructorDeclaration = {null};
-		cu.accept(new VoidVisitorAdapter<Void>()
-		{
-			@Override
-			public void visit(ConstructorDeclaration n, Void arg)
-			{
-				super.visit(n, arg);
-				for (Statement statement1 : n.getBody().getStatements())
-				{
-					if (statement1.containsWithinRange(expression))
-					{
-						contains[0] = true;
-						constructorDeclaration[0] = n;
-					}
-				}
-			}
-		}, null);
-
-		if (contains[0])
-		{
-			return constructorDeclaration[0];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Look through the {@link CompilationUnit} for the specific statement within its methods.
-	 *
-	 * @param statement The {@code statement} we are looking for
-	 * @param cu        The {@code CompilationUnit}
-	 * @return the initializer that contains the {@code statement}.
-	 */
-	private InitializerDeclaration findInitializerForStatement(Statement statement, CompilationUnit cu)
-	{
-		final boolean[] contains = {false};
-		final InitializerDeclaration[] initializerDeclaration = {null};
-		cu.accept(new VoidVisitorAdapter<Void>()
-		{
-			@Override
-			public void visit(InitializerDeclaration n, Void arg)
-			{
-				super.visit(n, arg);
-				for (Statement statement : n.getBody().getStatements())
-				{
-					if (statement.containsWithinRange(statement))
-					{
-						contains[0] = true;
-						initializerDeclaration[0] = n;
-					}
-				}
-			}
-		}, null);
-
-		if (contains[0])
-		{
-			return initializerDeclaration[0];
-		} else
-		{
-			return null;
-		}
-	}
-
-	/**
-	 * Look through the {@link CompilationUnit} for the specific statement within its methods.
-	 *
-	 * @param expression The {@code expression} we are looking for
-	 * @param cu         The {@code CompilationUnit}
-	 * @return the initializer that contains the {@code expression}.
-	 */
-	private InitializerDeclaration findInitializerForExpression(Expression expression, CompilationUnit cu)
-	{
-		final boolean[] contains = {false};
-		final InitializerDeclaration[] initializerDeclaration = {null};
-		cu.accept(new VoidVisitorAdapter<Void>()
-		{
-			@Override
-			public void visit(InitializerDeclaration n, Void arg)
-			{
-				super.visit(n, arg);
-				for (Statement statement : n.getBody().getStatements())
-				{
-					if (statement.containsWithinRange(expression))
-					{
-						contains[0] = true;
-						initializerDeclaration[0] = n;
-					}
-				}
-			}
-		}, null);
-
-		if (contains[0])
-		{
-			return initializerDeclaration[0];
-		}
-
-		return null;
-	}
+                } catch (UnsolvedSymbolException e)
+                {
+                    System.err.println(nameExpr.getName().getIdentifier() + " not resolved. " + e.getMessage());
+                }
+            }
+        }
+    }
+
+    /**
+     * Visit all {@link CatchClause}s.
+     *
+     * @param n   The current {@code CatchClause}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(CatchClause n, Object arg)
+    {
+        super.visit(n, arg);
+        TryStmt parentNode = (TryStmt) n.getParentNode().get();
+        CallableDeclaration<?> method = findMethodForStatement(parentNode, this.compilationUnit);
+        if (method == null)
+        {
+            method = findConstructorForStatement(parentNode, this.compilationUnit);
+        }
+
+        if (method != null)
+        {
+            SimpleName simpleName = n.getParameter().getName();
+            String name = simpleName.getIdentifier();
+            Range range = simpleName.getRange().get();
+            int line = range.begin.line;
+            int columnStart = range.begin.column;
+            int columnEnd = range.end.column;
+            this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "declaration", line, columnStart, columnEnd + 1));
+        }
+    }
+
+    /**
+     * Visit all {@link ThrowStmt}s.
+     *
+     * @param n   The current {@code ThrowStmt}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(ThrowStmt n, Object arg)
+    {
+        super.visit(n, arg);
+        Expression expression = n.getExpression();
+        if (expression instanceof NameExpr)
+        {
+            NameExpr nameExpr = (NameExpr) expression;
+            CallableDeclaration<?> method = findMethodForStatement(n, this.compilationUnit);
+            if (method == null)
+            {
+                method = findConstructorForStatement(n, this.compilationUnit);
+            }
+
+            if (method != null)
+            {
+                ResolvedValueDeclaration vd = nameExpr.resolve();
+                SimpleName simpleName = nameExpr.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                if (vd.isField())
+                {
+                    this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isVariable())
+                {
+                    this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isParameter())
+                {
+                    this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                }
+            }
+        }
+    }
+
+    /**
+     * Visit all {@link InstanceOfExpr}s.
+     *
+     * @param n   The current {@code InstanceOfExpr}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(InstanceOfExpr n, Object arg)
+    {
+        super.visit(n, arg);
+        CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+        if (method == null)
+        {
+            method = findConstructorForExpression(n, this.compilationUnit);
+        }
+
+        if (method != null)
+        {
+            Expression expression = n.getExpression();
+            if (expression instanceof NameExpr)
+            {
+                NameExpr nameExpr = (NameExpr) expression;
+                ResolvedValueDeclaration vd = nameExpr.resolve();
+                SimpleName simpleName = nameExpr.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                if (vd.isField())
+                {
+                    this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isVariable())
+                {
+                    this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isParameter())
+                {
+                    this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                }
+            }
+        }
+    }
+
+    /**
+     * Visit all {@link BinaryExpr}s.
+     *
+     * @param n   The current {@code BinaryExpr}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(BinaryExpr n, Object arg)
+    {
+        super.visit(n, arg);
+        CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+        if (method == null)
+        {
+            method = findConstructorForExpression(n, this.compilationUnit);
+        }
+
+        if (method != null)
+        {
+            Expression left = n.getLeft();
+            if (left instanceof NameExpr)
+            {
+                NameExpr nameExpr = (NameExpr) left;
+                ResolvedValueDeclaration vd = nameExpr.resolve();
+                SimpleName simpleName = nameExpr.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                if (vd.isField())
+                {
+                    this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isVariable())
+                {
+                    this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isParameter())
+                {
+                    this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                }
+            }
+
+            Expression right = n.getRight();
+            if (right instanceof NameExpr)
+            {
+                NameExpr nameExpr = (NameExpr) right;
+                ResolvedValueDeclaration vd = nameExpr.resolve();
+                SimpleName simpleName = nameExpr.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                if (vd.isField())
+                {
+                    this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isVariable())
+                {
+                    this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isParameter())
+                {
+                    this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                }
+            }
+        }
+    }
+
+    /**
+     * Visit all {@link CastExpr}s.
+     *
+     * @param n   The current {@code CastExpr}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(CastExpr n, Object arg)
+    {
+        super.visit(n, arg);
+        CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+        if (method == null)
+        {
+            method = findConstructorForExpression(n, this.compilationUnit);
+        }
+
+        if (method != null)
+        {
+            Expression expression = n.getExpression();
+            if (expression instanceof NameExpr)
+            {
+                NameExpr nameExpr = (NameExpr) expression;
+                ResolvedValueDeclaration vd = nameExpr.resolve();
+                SimpleName simpleName = nameExpr.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                if (vd.isField())
+                {
+                    this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isVariable())
+                {
+                    this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isParameter())
+                {
+                    this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                }
+            }
+        }
+    }
+
+    /**
+     * Visit all {@link IfStmt}s.
+     *
+     * @param n   The current {@code IfStmt}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(IfStmt n, Object arg)
+    {
+        super.visit(n, arg);
+        Expression condition = n.getCondition();
+        if (condition instanceof NameExpr)
+        {
+            NameExpr nameExpr = (NameExpr) condition;
+            CallableDeclaration<?> method = findMethodForStatement(n, this.compilationUnit);
+            InitializerDeclaration staticInitializer = null;
+            if (method == null)
+            {
+                method = findConstructorForStatement(n, this.compilationUnit);
+                if (method == null)
+                {
+                    staticInitializer = findInitializerForStatement(n, this.compilationUnit);
+                }
+            }
+
+            if (method != null)
+            {
+                ResolvedValueDeclaration vd = nameExpr.resolve();
+                SimpleName simpleName = nameExpr.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                if (vd.isField())
+                {
+                    this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isVariable())
+                {
+                    this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isParameter())
+                {
+                    this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                }
+            } else if (staticInitializer != null)
+            {
+                ResolvedValueDeclaration vd = nameExpr.resolve();
+                SimpleName simpleName = nameExpr.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                if (vd.isField())
+                {
+                    this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isVariable())
+                {
+                    this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isParameter())
+                {
+                    this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+                }
+            }
+        }
+    }
+
+    /**
+     * Visit all {@link ArrayInitializerExpr}s.
+     *
+     * @param n   The current {@code ArrayInitializerExpr}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(ArrayInitializerExpr n, Object arg)
+    {
+        super.visit(n, arg);
+        n.getValues().forEach(value -> {
+            if (value instanceof NameExpr)
+            {
+                NameExpr nameExpr = (NameExpr) value;
+                CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+                if (method == null)
+                {
+                    method = findConstructorForExpression(n, this.compilationUnit);
+                }
+
+                if (method != null)
+                {
+                    ResolvedValueDeclaration vd = nameExpr.resolve();
+                    SimpleName simpleName = nameExpr.getName();
+                    String name = simpleName.getIdentifier();
+                    Range range = simpleName.getRange().get();
+                    int line = range.begin.line;
+                    int columnStart = range.begin.column;
+                    int columnEnd = range.end.column;
+                    if (vd.isField())
+                    {
+                        this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                    } else if (vd.isVariable())
+                    {
+                        this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                    } else if (vd.isParameter())
+                    {
+                        this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     * Visit all {@link ArrayCreationExpr}s.
+     *
+     * @param n   The current {@code ArrayCreationExpr}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(ArrayCreationExpr n, Object arg)
+    {
+        super.visit(n, arg);
+        n.getLevels().forEach(level -> {
+            Expression dimension = level.getDimension().orElse(null);
+            if (dimension instanceof NameExpr)
+            {
+                NameExpr nameExpr = (NameExpr) dimension;
+                CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+                if (method == null)
+                {
+                    method = findConstructorForExpression(n, this.compilationUnit);
+                }
+
+                if (method != null)
+                {
+                    ResolvedValueDeclaration vd = nameExpr.resolve();
+                    SimpleName simpleName = nameExpr.getName();
+                    String name = simpleName.getIdentifier();
+                    Range range = simpleName.getRange().get();
+                    int line = range.begin.line;
+                    int columnStart = range.begin.column;
+                    int columnEnd = range.end.column;
+                    if (vd.isField())
+                    {
+                        this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                    } else if (vd.isVariable())
+                    {
+                        this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                    } else if (vd.isParameter())
+                    {
+                        this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     * Visit all {@link ArrayAccessExpr}s.
+     *
+     * @param n   The current {@code ArrayAccessExpr}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(ArrayAccessExpr n, Object arg)
+    {
+        super.visit(n, arg);
+        Expression expression = n.getName();
+        if (expression instanceof NameExpr)
+        {
+            NameExpr nameExpr = (NameExpr) expression;
+            CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+            if (method == null)
+            {
+                method = findConstructorForExpression(n, this.compilationUnit);
+            }
+
+            if (method != null)
+            {
+                ResolvedValueDeclaration vd = nameExpr.resolve();
+                SimpleName simpleName = nameExpr.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                if (vd.isField())
+                {
+                    this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isVariable())
+                {
+                    this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isParameter())
+                {
+                    this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                }
+            }
+        }
+
+        Expression index = n.getIndex();
+        if (index instanceof NameExpr)
+        {
+            NameExpr nameExpr = (NameExpr) index;
+            CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+            if (method == null)
+            {
+                method = findConstructorForExpression(n, this.compilationUnit);
+            }
+
+            if (method != null)
+            {
+                ResolvedValueDeclaration vd = nameExpr.resolve();
+                SimpleName simpleName = nameExpr.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                if (vd.isField())
+                {
+                    this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isVariable())
+                {
+                    this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isParameter())
+                {
+                    this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                }
+            }
+        }
+    }
+
+    /**
+     * Visit all {@link ForEachStmt}s.
+     *
+     * @param n   The current {@code ForEachStmt}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(ForEachStmt n, Object arg)
+    {
+        super.visit(n, arg);
+        Expression iterable = n.getIterable();
+        if (iterable instanceof NameExpr)
+        {
+            NameExpr nameExpr = (NameExpr) iterable;
+            CallableDeclaration<?> method = findMethodForStatement(n, this.compilationUnit);
+            if (method == null)
+            {
+                method = findConstructorForStatement(n, this.compilationUnit);
+            }
+
+            if (method != null)
+            {
+                ResolvedValueDeclaration vd = nameExpr.resolve();
+                SimpleName simpleName = nameExpr.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                if (vd.isField())
+                {
+                    this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isVariable())
+                {
+                    this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isParameter())
+                {
+                    this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                }
+            }
+        }
+    }
+
+    /**
+     * Visit all {@link ReturnStmt}s.
+     *
+     * @param n   The current {@code ReturnStmt}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(ReturnStmt n, Object arg)
+    {
+        super.visit(n, arg);
+        Expression expression = n.getExpression().orElse(null);
+        if (expression instanceof NameExpr)
+        {
+            NameExpr nameExpr = (NameExpr) expression;
+            CallableDeclaration<?> method = findMethodForStatement(n, this.compilationUnit);
+            if (method == null)
+            {
+                method = findConstructorForStatement(n, this.compilationUnit);
+            }
+
+            if (method != null)
+            {
+                ResolvedValueDeclaration vd = nameExpr.resolve();
+                SimpleName simpleName = nameExpr.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                if (vd.isField())
+                {
+                    this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isVariable())
+                {
+                    this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isParameter())
+                {
+                    this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                }
+            }
+        }
+    }
+
+    /**
+     * Visit all {@link UnaryExpr}s.
+     *
+     * @param n   The current {@code UnaryExpr}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(UnaryExpr n, Object arg)
+    {
+        super.visit(n, arg);
+        Expression expression = n.getExpression();
+        if (expression instanceof NameExpr)
+        {
+            NameExpr nameExpr = (NameExpr) expression;
+            CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+            if (method == null)
+            {
+                method = findConstructorForExpression(n, this.compilationUnit);
+            }
+
+            if (method != null)
+            {
+                try
+                {
+                    ResolvedValueDeclaration vd = nameExpr.resolve();
+                    SimpleName simpleName = nameExpr.getName();
+                    String name = simpleName.getIdentifier();
+                    Range range = simpleName.getRange().get();
+                    int line = range.begin.line;
+                    int columnStart = range.begin.column;
+                    int columnEnd = range.end.column;
+                    if (vd.isField())
+                    {
+                        this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                    } else if (vd.isVariable())
+                    {
+                        this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                    } else if (vd.isParameter())
+                    {
+                        this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                    }
+                } catch (UnsolvedSymbolException ignored)
+                {
+                }
+            }
+        }
+    }
+
+    /**
+     * Visit all {@link ConditionalExpr}s.
+     *
+     * @param n   The current {@code ConditionalExpr}
+     * @param arg Don't worry about it
+     */
+    @Override
+    public void visit(ConditionalExpr n, Object arg)
+    {
+        super.visit(n, arg);
+        Expression elseExpr = n.getElseExpr();
+        if (elseExpr instanceof NameExpr)
+        {
+            NameExpr nameExpr = (NameExpr) elseExpr;
+            CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+            if (method == null)
+            {
+                method = findConstructorForExpression(n, this.compilationUnit);
+            }
+
+            if (method != null)
+            {
+                ResolvedValueDeclaration vd = nameExpr.resolve();
+                SimpleName simpleName = nameExpr.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                if (vd.isField())
+                {
+                    this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isVariable())
+                {
+                    this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isParameter())
+                {
+                    this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                }
+            }
+        }
+
+        Expression thenExpr = n.getThenExpr();
+        if (thenExpr instanceof NameExpr)
+        {
+            NameExpr nameExpr = (NameExpr) thenExpr;
+            CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+            if (method == null)
+            {
+                method = findConstructorForExpression(n, this.compilationUnit);
+            }
+
+            if (method != null)
+            {
+                ResolvedValueDeclaration vd = nameExpr.resolve();
+                SimpleName simpleName = nameExpr.getName();
+                String name = simpleName.getIdentifier();
+                Range range = simpleName.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                if (vd.isField())
+                {
+                    this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isVariable())
+                {
+                    this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                } else if (vd.isParameter())
+                {
+                    this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd));
+                }
+            }
+        }
+    }
+
+    @Override
+    public void visit(LambdaExpr n, Object arg)
+    {
+        super.visit(n, arg);
+        CallableDeclaration<?> method = findMethodForExpression(n, this.compilationUnit);
+        if (method == null)
+        {
+            method = findConstructorForExpression(n, this.compilationUnit);
+        }
+
+        if (method != null)
+        {
+            CallableDeclaration<?> finalMethod = method;
+            n.getParameters().forEach(parameter -> {
+                SimpleName simpleName = parameter.getName();
+                String name = simpleName.getIdentifier();
+                Range range = parameter.getRange().get();
+                int line = range.begin.line;
+                int columnStart = range.begin.column;
+                int columnEnd = range.end.column;
+                this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(finalMethod), "declaration", line, columnStart, columnEnd + 1));
+            });
+        }
+    }
+
+    /**
+     * Look through the {@link CompilationUnit} for the specific statement within its methods.
+     *
+     * @param statement The {@code statement} we are looking for
+     * @param cu        The {@code CompilationUnit}
+     * @return the method that contains the {@code statement}.
+     */
+    private MethodDeclaration findMethodForStatement(Statement statement, CompilationUnit cu)
+    {
+        final boolean[] contains = {false};
+        final MethodDeclaration[] methodDeclaration = {null};
+        cu.accept(new VoidVisitorAdapter<Void>()
+        {
+            @Override
+            public void visit(MethodDeclaration n, Void arg)
+            {
+                super.visit(n, arg);
+                if (!n.isAbstract())
+                {
+                    for (Statement statement1 : n.getBody().get().getStatements())
+                    {
+                        if (statement1.containsWithinRange(statement))
+                        {
+                            contains[0] = true;
+                            methodDeclaration[0] = n;
+                        }
+                    }
+                }
+            }
+        }, null);
+
+        if (contains[0])
+        {
+            return methodDeclaration[0];
+        }
+
+        return null;
+    }
+
+    /**
+     * Look through the {@link CompilationUnit} for the specific statement within its methods.
+     *
+     * @param expression The {@code expression} we are looking for
+     * @param cu         The {@code CompilationUnit}
+     * @return the method that contains the {@code expression}.
+     */
+    private MethodDeclaration findMethodForExpression(Expression expression, CompilationUnit cu)
+    {
+        final boolean[] contains = {false};
+        final MethodDeclaration[] methodDeclaration = {null};
+        cu.accept(new VoidVisitorAdapter<Void>()
+        {
+            @Override
+            public void visit(MethodDeclaration n, Void arg)
+            {
+                super.visit(n, arg);
+                if (!n.isAbstract())
+                {
+                    for (Statement statement : n.getBody().get().getStatements())
+                    {
+                        if (statement.containsWithinRange(expression))
+                        {
+                            contains[0] = true;
+                            methodDeclaration[0] = n;
+                        }
+                    }
+                }
+            }
+        }, null);
+
+        if (contains[0])
+        {
+            return methodDeclaration[0];
+        }
+
+        return null;
+    }
+
+    /**
+     * Look through the {@link CompilationUnit} for the specific statement within its methods.
+     *
+     * @param statement The {@code statement} we are looking for
+     * @param cu        The {@code CompilationUnit}
+     * @return the constructor that contains the {@code statement}.
+     */
+    private ConstructorDeclaration findConstructorForStatement(Statement statement, CompilationUnit cu)
+    {
+        final boolean[] contains = {false};
+        final ConstructorDeclaration[] constructorDeclaration = {null};
+        cu.accept(new VoidVisitorAdapter<Void>()
+        {
+            @Override
+            public void visit(ConstructorDeclaration n, Void arg)
+            {
+                super.visit(n, arg);
+                for (Statement statement1 : n.getBody().getStatements())
+                {
+                    if (statement1.containsWithinRange(statement))
+                    {
+                        contains[0] = true;
+                        constructorDeclaration[0] = n;
+                    }
+                }
+            }
+        }, null);
+
+        if (contains[0])
+        {
+            return constructorDeclaration[0];
+        }
+
+        return null;
+    }
+
+    /**
+     * Look through the {@link CompilationUnit} for the specific statement within its methods.
+     *
+     * @param expression The {@code expression} we are looking for
+     * @param cu         The {@code CompilationUnit}
+     * @return the constructor that contains the {@code expression}.
+     */
+    private ConstructorDeclaration findConstructorForExpression(Expression expression, CompilationUnit cu)
+    {
+        final boolean[] contains = {false};
+        final ConstructorDeclaration[] constructorDeclaration = {null};
+        cu.accept(new VoidVisitorAdapter<Void>()
+        {
+            @Override
+            public void visit(ConstructorDeclaration n, Void arg)
+            {
+                super.visit(n, arg);
+                for (Statement statement1 : n.getBody().getStatements())
+                {
+                    if (statement1.containsWithinRange(expression))
+                    {
+                        contains[0] = true;
+                        constructorDeclaration[0] = n;
+                    }
+                }
+            }
+        }, null);
+
+        if (contains[0])
+        {
+            return constructorDeclaration[0];
+        }
+
+        return null;
+    }
+
+    /**
+     * Look through the {@link CompilationUnit} for the specific statement within its methods.
+     *
+     * @param statement The {@code statement} we are looking for
+     * @param cu        The {@code CompilationUnit}
+     * @return the initializer that contains the {@code statement}.
+     */
+    private InitializerDeclaration findInitializerForStatement(Statement statement, CompilationUnit cu)
+    {
+        final boolean[] contains = {false};
+        final InitializerDeclaration[] initializerDeclaration = {null};
+        cu.accept(new VoidVisitorAdapter<Void>()
+        {
+            @Override
+            public void visit(InitializerDeclaration n, Void arg)
+            {
+                super.visit(n, arg);
+                for (Statement statement : n.getBody().getStatements())
+                {
+                    if (statement.containsWithinRange(statement))
+                    {
+                        contains[0] = true;
+                        initializerDeclaration[0] = n;
+                    }
+                }
+            }
+        }, null);
+
+        if (contains[0])
+        {
+            return initializerDeclaration[0];
+        } else
+        {
+            return null;
+        }
+    }
+
+    /**
+     * Look through the {@link CompilationUnit} for the specific statement within its methods.
+     *
+     * @param expression The {@code expression} we are looking for
+     * @param cu         The {@code CompilationUnit}
+     * @return the initializer that contains the {@code expression}.
+     */
+    private InitializerDeclaration findInitializerForExpression(Expression expression, CompilationUnit cu)
+    {
+        final boolean[] contains = {false};
+        final InitializerDeclaration[] initializerDeclaration = {null};
+        cu.accept(new VoidVisitorAdapter<Void>()
+        {
+            @Override
+            public void visit(InitializerDeclaration n, Void arg)
+            {
+                super.visit(n, arg);
+                for (Statement statement : n.getBody().getStatements())
+                {
+                    if (statement.containsWithinRange(expression))
+                    {
+                        contains[0] = true;
+                        initializerDeclaration[0] = n;
+                    }
+                }
+            }
+        }, null);
+
+        if (contains[0])
+        {
+            return initializerDeclaration[0];
+        }
+
+        return null;
+    }
 }
\ No newline at end of file

From 8dc70a581c0fc79917bb2e25ad0212a36c0ba458 Mon Sep 17 00:00:00 2001
From: Cody <6558800+Bl3nd@users.noreply.github.com>
Date: Sat, 7 Sep 2024 19:22:10 -0600
Subject: [PATCH 04/11] Added the "Go-To" action to bring the caret to the
 variables declaration. Also: - BUG: Tokens with only one character would not
 get shown if the caret was before the character - ADD: Made the caret visible

---
 .../gui/components/actions/GoToAction.java    | 78 +++++++++++++++++++
 .../gui/util/BytecodeViewPanelUpdater.java    | 24 +++---
 .../classcontainer/parser/TokenUtil.java      |  4 +-
 3 files changed, 95 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java

diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java
new file mode 100644
index 000000000..41a49b8cf
--- /dev/null
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java
@@ -0,0 +1,78 @@
+package the.bytecode.club.bytecodeviewer.gui.components.actions;
+
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+import org.fife.ui.rsyntaxtextarea.Token;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.ClassFileContainer;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassFieldLocation;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.parser.TokenUtil;
+
+import javax.swing.*;
+import javax.swing.text.Element;
+import java.awt.event.ActionEvent;
+
+/**
+ * Created by Bl3nd.
+ * Date: 9/7/2024
+ */
+public class GoToAction extends AbstractAction
+{
+    private final ClassFileContainer container;
+
+    public GoToAction(ClassFileContainer classFileContainer)
+    {
+        this.container = classFileContainer;
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e)
+    {
+        RSyntaxTextArea textArea = (RSyntaxTextArea) e.getSource();
+        int line = textArea.getCaretLineNumber() + 1;
+        int column = textArea.getCaretOffsetFromLineStart();
+
+        container.fieldMembers.values().forEach(fields -> fields.forEach(field -> {
+            if (field.line == line && field.columnStart - 1 <= column && field.columnEnd >= column) {
+                Element root = textArea.getDocument().getDefaultRootElement();
+                ClassFieldLocation first = fields.get(0);
+                int startOffset = root.getElement(first.line - 1).getStartOffset() + (first.columnStart - 1);
+                textArea.setCaretPosition(startOffset);
+            }
+        }));
+
+        container.methodParameterMembers.values().forEach(parameters -> parameters.forEach(parameter -> {
+            if (parameter.line == line && parameter.columnStart - 1 <= column && parameter.columnEnd >= column) {
+                Element root = textArea.getDocument().getDefaultRootElement();
+                if (parameter.decRef.equalsIgnoreCase("declaration")) {
+                    int startOffset = root.getElement(parameter.line - 1).getStartOffset() + (parameter.columnStart - 1);
+                    textArea.setCaretPosition(startOffset);
+                } else {
+                    String method = parameter.method;
+                    parameters.stream().filter(classParameterLocation -> classParameterLocation.method.equals(method)).forEach(classParameterLocation -> {
+                        if (classParameterLocation.decRef.equalsIgnoreCase("declaration")) {
+                            int startOffset = root.getElement(classParameterLocation.line - 1).getStartOffset() + (classParameterLocation.columnStart - 1);
+                            textArea.setCaretPosition(startOffset);
+                        }
+                    });
+                }
+            }
+        }));
+
+        container.methodLocalMembers.values().forEach(localMembers -> localMembers.forEach(localMember -> {
+            if (localMember.line == line && localMember.columnStart - 1 <= column && localMember.columnEnd >= column) {
+                Element root = textArea.getDocument().getDefaultRootElement();
+                if (localMember.decRef.equals("declaration")) {
+                    int startOffset = root.getElement(localMember.line - 1).getStartOffset() + (localMember.columnStart - 1);
+                    textArea.setCaretPosition(startOffset);
+                } else {
+                    String method = localMember.method;
+                    localMembers.stream().filter(classLocalVariableLocation -> classLocalVariableLocation.method.equals(method)).forEach(classLocalVariableLocation -> {
+                        if (classLocalVariableLocation.decRef.equalsIgnoreCase("declaration")) {
+                            int startOffset = root.getElement(classLocalVariableLocation.line - 1).getStartOffset() + (classLocalVariableLocation.columnStart - 1);
+                            textArea.setCaretPosition(startOffset);
+                        }
+                    });
+                }
+            }
+        }));
+    }
+}
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
index 88ef24d2a..64c71eb18 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
@@ -19,13 +19,11 @@
 package the.bytecode.club.bytecodeviewer.gui.util;
 
 import java.awt.*;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
 import java.util.Objects;
 import java.util.regex.Matcher;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JPanel;
-import javax.swing.JViewport;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
 import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
 import javax.swing.event.ChangeEvent;
@@ -45,6 +43,7 @@
 import the.bytecode.club.bytecodeviewer.gui.components.MyErrorStripe;
 import the.bytecode.club.bytecodeviewer.gui.components.RSyntaxTextAreaHighlighterEx;
 import the.bytecode.club.bytecodeviewer.gui.components.SearchableRSyntaxTextArea;
+import the.bytecode.club.bytecodeviewer.gui.components.actions.GoToAction;
 import the.bytecode.club.bytecodeviewer.gui.hexviewer.HexViewer;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.BytecodeViewPanel;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ClassViewer;
@@ -401,6 +400,8 @@ public void buildTextArea(Decompiler decompiler, String decompiledSource)
 
 		bytecodeViewPanel.textArea.setMarkOccurrencesColor(Color.ORANGE);
 		bytecodeViewPanel.textArea.setCursor(new Cursor(Cursor.TEXT_CURSOR));
+		bytecodeViewPanel.textArea.getCaret().setVisible(true);
+		bytecodeViewPanel.textArea.getCaret().setBlinkRate(0);
 		bytecodeViewPanel.textArea.setHighlighter(new RSyntaxTextAreaHighlighterEx());
 
 		if (bytecodeViewPanel.decompiler != Decompiler.BYTECODE_DISASSEMBLER)
@@ -413,7 +414,6 @@ public void buildTextArea(Decompiler decompiler, String decompiledSource)
 			bytecodeViewPanel.textArea.setSyntaxEditingStyle("text/javaBytecode");
 		}
 		bytecodeViewPanel.textArea.setCodeFoldingEnabled(true);
-		bytecodeViewPanel.textArea.setAntiAliasingEnabled(true);
 		bytecodeViewPanel.textArea.setText(decompiledSource);
 		bytecodeViewPanel.textArea.setCaretPosition(0);
 		bytecodeViewPanel.textArea.setEditable(isPanelEditable);
@@ -432,14 +432,18 @@ else if (isPanelEditable && decompiler == Decompiler.KRAKATAU_DISASSEMBLER)
 		bytecodeViewPanel.revalidate();
 		bytecodeViewPanel.repaint();
 
+		String classContainerName = viewer.resource.workingName + "-" + decompiler.getDecompilerName();
+		ClassFileContainer classFileContainer = viewer.classFiles.get(classContainerName);
+		bytecodeViewPanel.textArea.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_B, InputEvent.CTRL_DOWN_MASK), "goToAction");
+		bytecodeViewPanel.textArea.getActionMap().put("goToAction", new GoToAction(classFileContainer));
+
 		bytecodeViewPanel.textArea.addCaretListener(e -> {
 			if (bytecodeViewPanel.textArea.isFocusOwner())
 			{
 				RSyntaxTextAreaHighlighterEx highlighterEx = (RSyntaxTextAreaHighlighterEx) bytecodeViewPanel.textArea.getHighlighter();
 				highlighterEx.clearMarkOccurrencesHighlights();
 				RSyntaxTextArea textArea = (RSyntaxTextArea) e.getSource();
-				String workingName = viewer.resource.workingName + "-" + decompiler.getDecompilerName();
-				markOccurrences(textArea, viewer.classFiles.get(workingName), errorStripe);
+				markOccurrences(textArea, viewer.classFiles.get(classContainerName), errorStripe);
 			}
 		});
 	}
@@ -447,8 +451,8 @@ else if (isPanelEditable && decompiler == Decompiler.KRAKATAU_DISASSEMBLER)
 	private void markOccurrences(RSyntaxTextArea textArea, ClassFileContainer classFileContainer, MyErrorStripe errorStripe)
 	{
 		RSyntaxTextAreaHighlighterEx highlighterEx = (RSyntaxTextAreaHighlighterEx) textArea.getHighlighter();
-		Token token = textArea.modelToToken(textArea.getCaretPosition() - 1);
-		if (token == null || token.getLexeme().equals(";"))
+		Token token = textArea.modelToToken(textArea.getCaretPosition());
+		if (token == null)
 		{
 			highlighterEx.clearMarkOccurrencesHighlights();
 			errorStripe.refreshMarkers();
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/TokenUtil.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/TokenUtil.java
index b51251d6e..5bb5b8ae0 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/TokenUtil.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/TokenUtil.java
@@ -22,7 +22,9 @@ public static Token getToken(final RSyntaxTextArea textArea, final @NotNull Toke
 				|| lexeme.equals("-")
 				|| lexeme.equals("+")
 				|| lexeme.equals(" ")
-				? textArea.modelToToken(textArea.getCaretPosition() + 1)
+				|| lexeme.equals(";")
+				|| lexeme.equals(",")
+				? textArea.modelToToken(textArea.getCaretPosition() - 1)
 				: token;
 	}
 }

From 262a408c951788e4c3316995700fca2ea5073f02 Mon Sep 17 00:00:00 2001
From: Cody <6558800+Bl3nd@users.noreply.github.com>
Date: Mon, 9 Sep 2024 22:28:04 -0600
Subject: [PATCH 05/11] Add left padding to search panel buttons.

---
 .../club/bytecodeviewer/gui/components/TextAreaSearchPanel.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/TextAreaSearchPanel.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/TextAreaSearchPanel.java
index fa9a32e04..15250bff9 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/TextAreaSearchPanel.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/TextAreaSearchPanel.java
@@ -54,6 +54,7 @@ private void setup()
         JPanel searchPanel = new JPanel();
         searchPanel.setLayout(new BoxLayout(searchPanel, BoxLayout.X_AXIS));
 
+        searchPanel.add(Box.createHorizontalStrut(35));
         JButton searchNext = new JButton(IconResources.nextIcon);
         searchPanel.add(searchNext);
         searchNext.addActionListener(arg0 -> ((SearchableRSyntaxTextArea) textArea).search(searchInput.getText(), true, caseSensitiveSearch.isSelected()));

From afeab95f0bb50746a8d87a9c7bc040fd030bd1a1 Mon Sep 17 00:00:00 2001
From: Cody <6558800+Bl3nd@users.noreply.github.com>
Date: Thu, 12 Sep 2024 18:42:35 -0600
Subject: [PATCH 06/11] Add ability to open an accessed fields parent class.

---
 .../gui/components/actions/GoToAction.java    |   43 +-
 .../gui/util/BytecodeViewPanelUpdater.java    | 1121 +++++++++--------
 .../classcontainer/ClassFileContainer.java    |   24 +-
 .../classcontainer/parser/MyVoidVisitor.java  |   37 +-
 4 files changed, 647 insertions(+), 578 deletions(-)

diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java
index 41a49b8cf..07cb9e339 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java
@@ -2,6 +2,9 @@
 
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.Token;
+import org.objectweb.asm.tree.ClassNode;
+import the.bytecode.club.bytecodeviewer.BytecodeViewer;
+import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.ClassFileContainer;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassFieldLocation;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.parser.TokenUtil;
@@ -31,7 +34,21 @@ public void actionPerformed(ActionEvent e)
         int column = textArea.getCaretOffsetFromLineStart();
 
         container.fieldMembers.values().forEach(fields -> fields.forEach(field -> {
-            if (field.line == line && field.columnStart - 1 <= column && field.columnEnd >= column) {
+            if (field.line == line && field.columnStart - 1 <= column && field.columnEnd >= column)
+            {
+                // Open the class that is associated with the field's owner.
+                if (!field.owner.equals(container.getName()))
+                {
+                    ResourceContainer resourceContainer = BytecodeViewer.getFileContainer(container.getParentContainer());
+                    if (resourceContainer != null)
+                    {
+                        String s = container.getImport(field.owner);
+                        BytecodeViewer.viewer.workPane.addClassResource(resourceContainer, s + ".class");
+                    }
+
+                    return;
+                }
+
                 Element root = textArea.getDocument().getDefaultRootElement();
                 ClassFieldLocation first = fields.get(0);
                 int startOffset = root.getElement(first.line - 1).getStartOffset() + (first.columnStart - 1);
@@ -40,15 +57,19 @@ public void actionPerformed(ActionEvent e)
         }));
 
         container.methodParameterMembers.values().forEach(parameters -> parameters.forEach(parameter -> {
-            if (parameter.line == line && parameter.columnStart - 1 <= column && parameter.columnEnd >= column) {
+            if (parameter.line == line && parameter.columnStart - 1 <= column && parameter.columnEnd >= column)
+            {
                 Element root = textArea.getDocument().getDefaultRootElement();
-                if (parameter.decRef.equalsIgnoreCase("declaration")) {
+                if (parameter.decRef.equalsIgnoreCase("declaration"))
+                {
                     int startOffset = root.getElement(parameter.line - 1).getStartOffset() + (parameter.columnStart - 1);
                     textArea.setCaretPosition(startOffset);
-                } else {
+                } else
+                {
                     String method = parameter.method;
                     parameters.stream().filter(classParameterLocation -> classParameterLocation.method.equals(method)).forEach(classParameterLocation -> {
-                        if (classParameterLocation.decRef.equalsIgnoreCase("declaration")) {
+                        if (classParameterLocation.decRef.equalsIgnoreCase("declaration"))
+                        {
                             int startOffset = root.getElement(classParameterLocation.line - 1).getStartOffset() + (classParameterLocation.columnStart - 1);
                             textArea.setCaretPosition(startOffset);
                         }
@@ -58,15 +79,19 @@ public void actionPerformed(ActionEvent e)
         }));
 
         container.methodLocalMembers.values().forEach(localMembers -> localMembers.forEach(localMember -> {
-            if (localMember.line == line && localMember.columnStart - 1 <= column && localMember.columnEnd >= column) {
+            if (localMember.line == line && localMember.columnStart - 1 <= column && localMember.columnEnd >= column)
+            {
                 Element root = textArea.getDocument().getDefaultRootElement();
-                if (localMember.decRef.equals("declaration")) {
+                if (localMember.decRef.equals("declaration"))
+                {
                     int startOffset = root.getElement(localMember.line - 1).getStartOffset() + (localMember.columnStart - 1);
                     textArea.setCaretPosition(startOffset);
-                } else {
+                } else
+                {
                     String method = localMember.method;
                     localMembers.stream().filter(classLocalVariableLocation -> classLocalVariableLocation.method.equals(method)).forEach(classLocalVariableLocation -> {
-                        if (classLocalVariableLocation.decRef.equalsIgnoreCase("declaration")) {
+                        if (classLocalVariableLocation.decRef.equalsIgnoreCase("declaration"))
+                        {
                             int startOffset = root.getElement(classLocalVariableLocation.line - 1).getStartOffset() + (classLocalVariableLocation.columnStart - 1);
                             textArea.setCaretPosition(startOffset);
                         }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
index 64c71eb18..b22fd95b6 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
@@ -18,22 +18,8 @@
 
 package the.bytecode.club.bytecodeviewer.gui.util;
 
-import java.awt.*;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-import java.util.Objects;
-import java.util.regex.Matcher;
-import javax.swing.*;
-import javax.swing.event.CaretEvent;
-import javax.swing.event.CaretListener;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.Element;
-
 import org.fife.ui.rsyntaxtextarea.*;
 import org.fife.ui.rtextarea.SmartHighlightPainter;
-import org.jetbrains.annotations.NotNull;
 import org.objectweb.asm.ClassWriter;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Configuration;
@@ -54,6 +40,19 @@
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.parser.TokenUtil;
 import the.bytecode.club.bytecodeviewer.util.MethodParser;
 
+import javax.swing.*;
+import javax.swing.event.CaretEvent;
+import javax.swing.event.CaretListener;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Element;
+import java.awt.*;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.util.Objects;
+import java.util.regex.Matcher;
+
 import static the.bytecode.club.bytecodeviewer.gui.resourceviewer.TabbedPane.BLANK_COLOR;
 import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.EDITABLE;
 
@@ -68,562 +67,564 @@
 
 public class BytecodeViewPanelUpdater implements Runnable
 {
-	public final ClassViewer viewer;
-	public final BytecodeViewPanel bytecodeViewPanel;
-	private final JButton button;
-	private final byte[] classBytes;
-
-	public SearchableRSyntaxTextArea updateUpdaterTextArea;
-	public JComboBox<Integer> methodsList;
-	public boolean isPanelEditable;
-	public boolean waitingFor;
-	private Thread thread;
-
-	public BytecodeViewPanelUpdater(BytecodeViewPanel bytecodeViewPanel, ClassViewer cv, byte[] classBytes, boolean isPanelEditable, JButton button)
-	{
-		this.viewer = cv;
-		this.bytecodeViewPanel = bytecodeViewPanel;
-		this.classBytes = classBytes;
-		this.isPanelEditable = isPanelEditable;
-		this.button = button;
-		waitingFor = true;
-	}
-
-	public void processDisplay()
-	{
-		try
-		{
-			BytecodeViewer.updateBusyStatus(true);
-
-			if (bytecodeViewPanel.decompiler != Decompiler.NONE)
-			{
-				//hex viewer
-				if (bytecodeViewPanel.decompiler == Decompiler.HEXCODE_VIEWER)
-				{
-					final ClassWriter cw = new ClassWriter(0);
-					viewer.resource.getResourceClassNode().accept(cw);
-
-					SwingUtilities.invokeLater(() ->
-					{
-						final HexViewer hex = new HexViewer(cw.toByteArray());
-						bytecodeViewPanel.add(hex);
-					});
-				} else
-				{
-					final Decompiler decompiler = bytecodeViewPanel.decompiler;
-
-					//perform decompiling inside of this thread
-					final String decompiledSource = decompiler.getDecompiler().decompileClassNode(viewer.resource.getResourceClassNode(), classBytes);
-
-					ClassFileContainer container = new ClassFileContainer(viewer.resource.workingName + "-" + decompiler.getDecompilerName(), decompiledSource);
-					if (!container.hasBeenParsed)
-					{
-						container.parse();
-						viewer.classFiles.put(viewer.resource.workingName + "-" + decompiler.getDecompilerName(), container);
-					}
-
-					//set the swing components on the swing thread
-					SwingUtilities.invokeLater(() ->
-					{
-						buildTextArea(decompiler, decompiledSource);
-						waitingFor = false;
-					});
-
-					//hold this thread until the swing thread has finished attaching the components
-					while (waitingFor)
-					{
-						try
-						{
-							Thread.sleep(1);
-						} catch (Exception ignored)
-						{
-						}
-					}
-				}
-			}
-		} catch (IndexOutOfBoundsException | NullPointerException e)
-		{
-			//ignore
-		} catch (Exception e)
-		{
-			BytecodeViewer.handleException(e);
-		} finally
-		{
-			viewer.resetDivider();
-			BytecodeViewer.updateBusyStatus(false);
-			SwingUtilities.invokeLater(() ->
-			{
-				if (button != null)
-					button.setEnabled(true);
-			});
-		}
-	}
-
-	public void startNewThread()
-	{
-		thread = new Thread(this, "Pane Update");
-		thread.start();
-	}
-
-	@Override
-	public void run()
-	{
-		if (bytecodeViewPanel.decompiler == Decompiler.NONE)
-			return;
-
-		processDisplay();
-
-		if (bytecodeViewPanel.decompiler == Decompiler.HEXCODE_VIEWER)
-			return;
-
-		//nullcheck broken pane
-		if (updateUpdaterTextArea == null || updateUpdaterTextArea.getScrollPane() == null
-				|| updateUpdaterTextArea.getScrollPane().getViewport() == null)
-		{
-			//build an error message
-			SwingUtilities.invokeLater(() ->
-					buildTextArea(bytecodeViewPanel.decompiler, "Critical BCV Error"));
-			return;
-		}
-
-		//this still freezes the swing UI
-		synchronizePane();
-	}
-
-	public final CaretListener caretListener = new CaretListener()
-	{
-		@Override
-		public void caretUpdate(CaretEvent e)
-		{
-			MethodParser methods = viewer.methods.get(bytecodeViewPanel.panelIndex);
-			if (methods != null)
-			{
-				int methodLine = methods.findActiveMethod(updateUpdaterTextArea.getCaretLineNumber());
-
-				if (methodLine != -1)
-				{
-					if (BytecodeViewer.viewer.showClassMethods.isSelected())
-					{
-						if (methodsList != null)
-						{
-							if (methodLine != (int) Objects.requireNonNull(methodsList.getSelectedItem()))
-							{
-								methodsList.setSelectedItem(methodLine);
-							}
-						}
-					}
-					if (BytecodeViewer.viewer.synchronizedViewing.isSelected())
-					{
-						int panes = 2;
-						if (viewer.bytecodeViewPanel3 != null)
-							panes = 3;
-
-						for (int i = 0; i < panes; i++)
-						{
-							if (i != bytecodeViewPanel.panelIndex)
-							{
-								ClassViewer.selectMethod(viewer, i, methods.getMethod(methodLine));
-							}
-						}
-					}
-				}
-			}
-		}
-	};
-
-	public final ChangeListener viewportListener = new ChangeListener()
-	{
-		@Override
-		public void stateChanged(ChangeEvent e)
-		{
-			int panes = 2;
-			if (viewer.bytecodeViewPanel3 != null)
-				panes = 3;
-
-			if (BytecodeViewer.viewer.synchronizedViewing.isSelected())
-			{
-				if (updateUpdaterTextArea.isShowing() && (updateUpdaterTextArea.hasFocus() || updateUpdaterTextArea.getMousePosition() != null))
-				{
-					int caretLine = updateUpdaterTextArea.getCaretLineNumber();
-					int maxViewLine = ClassViewer.getMaxViewLine(updateUpdaterTextArea);
-					int activeViewLine = ClassViewer.getViewLine(updateUpdaterTextArea);
-					int activeLine = (activeViewLine == maxViewLine && caretLine > maxViewLine) ? caretLine :
-							activeViewLine;
-					int activeLineDelta = -1;
-					MethodParser.Method activeMethod = null;
-					MethodParser activeMethods = viewer.methods.get(bytecodeViewPanel.panelIndex);
-					if (activeMethods != null)
-					{
-						int activeMethodLine = activeMethods.findActiveMethod(activeLine);
-						if (activeMethodLine != -1)
-						{
-							activeLineDelta = activeLine - activeMethodLine;
-							activeMethod = activeMethods.getMethod(activeMethodLine);
-							ClassViewer.selectMethod(updateUpdaterTextArea, activeMethodLine);
-						}
-					}
-					for (int i = 0; i < panes; i++)
-					{
-						if (i != bytecodeViewPanel.panelIndex)
-						{
-							int setLine = -1;
-
-							RSyntaxTextArea area = null;
-							switch (i)
-							{
-								case 0:
-									area = viewer.bytecodeViewPanel1.updateThread.updateUpdaterTextArea;
-									break;
-								case 1:
-									area = viewer.bytecodeViewPanel2.updateThread.updateUpdaterTextArea;
-									break;
-								case 2:
-									area = viewer.bytecodeViewPanel3.updateThread.updateUpdaterTextArea;
-									break;
-							}
-
-							if (area != null)
-							{
-								if (activeMethod != null && activeLineDelta >= 0)
-								{
-									MethodParser methods = viewer.methods.get(i);
-									if (methods != null)
-									{
-										int methodLine = methods.findMethod(activeMethod);
-										if (methodLine != -1)
-										{
-											int viewLine = ClassViewer.getViewLine(area);
-											if (activeLineDelta != viewLine - methodLine)
-											{
-												setLine = methodLine + activeLineDelta;
-											}
-										}
-									}
-								} else if (activeLine != ClassViewer.getViewLine(area))
-								{
-									setLine = activeLine;
-								}
-								if (setLine >= 0)
-								{
-									ClassViewer.setViewLine(area, setLine);
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	};
-
-	public void synchronizePane()
-	{
-		if (bytecodeViewPanel.decompiler == Decompiler.HEXCODE_VIEWER
-				|| bytecodeViewPanel.decompiler == Decompiler.NONE)
-			return;
-
-		SwingUtilities.invokeLater(() ->
-		{
-			JViewport viewport = updateUpdaterTextArea.getScrollPane().getViewport();
-			viewport.addChangeListener(viewportListener);
-			updateUpdaterTextArea.addCaretListener(caretListener);
-		});
-
-		final MethodParser methods = viewer.methods.get(bytecodeViewPanel.panelIndex);
-		for (int i = 0; i < updateUpdaterTextArea.getLineCount(); i++)
-		{
-			String lineText = updateUpdaterTextArea.getLineText(i);
-			Matcher regexMatcher = MethodParser.regex.matcher(lineText);
-			if (regexMatcher.find())
-			{
-				String methodName = regexMatcher.group("name");
-				String methodParams = regexMatcher.group("params");
-				methods.addMethod(i, methodName, methodParams);
-			}
-		}
-
-		//TODO fix this
-		if (BytecodeViewer.viewer.showClassMethods.isSelected())
-		{
-			if (!methods.isEmpty())
-			{
-				methodsList = new JComboBox<>();
-
-				for (Integer line : methods.getMethodsLines())
-					methodsList.addItem(line);
-
-				methodsList.setRenderer(new MethodsRenderer(this));
-				methodsList.addActionListener(e ->
-				{
-					int line = (int) Objects.requireNonNull(methodsList.getSelectedItem());
-
-					RSyntaxTextArea area = null;
-					switch (bytecodeViewPanel.panelIndex)
-					{
-						case 0:
-							area = viewer.bytecodeViewPanel1.updateThread.updateUpdaterTextArea;
-							break;
-						case 1:
-							area = viewer.bytecodeViewPanel2.updateThread.updateUpdaterTextArea;
-							break;
-						case 2:
-							area = viewer.bytecodeViewPanel3.updateThread.updateUpdaterTextArea;
-							break;
-					}
-
-					if (area != null)
-						ClassViewer.selectMethod(area, line);
-				});
-
-				JPanel panel = new JPanel(new BorderLayout());
-				panel.add(updateUpdaterTextArea.getScrollPane().getColumnHeader().getComponent(0), BorderLayout.NORTH);
-				panel.add(methodsList, BorderLayout.SOUTH);
-				methodsList.setBackground(BLANK_COLOR);
-
-				SwingUtilities.invokeLater(() ->
-				{
-					updateUpdaterTextArea.getScrollPane().getColumnHeader().removeAll();
-					updateUpdaterTextArea.getScrollPane().getColumnHeader().add(panel);
-				});
-			}
-		}
-	}
-
-	public void buildTextArea(Decompiler decompiler, String decompiledSource)
-	{
-		updateUpdaterTextArea = new SearchableRSyntaxTextArea();
-
-		Configuration.rstaTheme.apply(updateUpdaterTextArea);
-		bytecodeViewPanel.add(updateUpdaterTextArea.getTextAreaSearchPanel(), BorderLayout.NORTH);
-		bytecodeViewPanel.add(updateUpdaterTextArea.getScrollPane());
-
-		bytecodeViewPanel.textArea = updateUpdaterTextArea;
-
-		bytecodeViewPanel.textArea.setMarkOccurrencesColor(Color.ORANGE);
-		bytecodeViewPanel.textArea.setCursor(new Cursor(Cursor.TEXT_CURSOR));
-		bytecodeViewPanel.textArea.getCaret().setVisible(true);
-		bytecodeViewPanel.textArea.getCaret().setBlinkRate(0);
-		bytecodeViewPanel.textArea.setHighlighter(new RSyntaxTextAreaHighlighterEx());
-
-		if (bytecodeViewPanel.decompiler != Decompiler.BYTECODE_DISASSEMBLER)
-		{
-			bytecodeViewPanel.textArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
-		} else
-		{
-			AbstractTokenMakerFactory tokenMakerFactory = (AbstractTokenMakerFactory) TokenMakerFactory.getDefaultInstance();
-			tokenMakerFactory.putMapping("text/javaBytecode", "the.bytecode.club.bytecodeviewer.decompilers.bytecode.JavaBytecodeTokenMaker");
-			bytecodeViewPanel.textArea.setSyntaxEditingStyle("text/javaBytecode");
-		}
-		bytecodeViewPanel.textArea.setCodeFoldingEnabled(true);
-		bytecodeViewPanel.textArea.setText(decompiledSource);
-		bytecodeViewPanel.textArea.setCaretPosition(0);
-		bytecodeViewPanel.textArea.setEditable(isPanelEditable);
-
-		if (isPanelEditable && decompiler == Decompiler.SMALI_DISASSEMBLER)
-			bytecodeViewPanel.compiler = Compiler.SMALI_ASSEMBLER;
-		else if (isPanelEditable && decompiler == Decompiler.KRAKATAU_DISASSEMBLER)
-			bytecodeViewPanel.compiler = Compiler.KRAKATAU_ASSEMBLER;
-
-		String editable = isPanelEditable ? " - " + EDITABLE : "";
-		bytecodeViewPanel.textArea.getTextAreaSearchPanel().getTitleHeader().setText(decompiler.getDecompilerName() + editable);
-
-		MyErrorStripe errorStripe = new MyErrorStripe(bytecodeViewPanel.textArea);
-		bytecodeViewPanel.add(errorStripe, BorderLayout.LINE_END);
-
-		bytecodeViewPanel.revalidate();
-		bytecodeViewPanel.repaint();
-
-		String classContainerName = viewer.resource.workingName + "-" + decompiler.getDecompilerName();
-		ClassFileContainer classFileContainer = viewer.classFiles.get(classContainerName);
-		bytecodeViewPanel.textArea.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_B, InputEvent.CTRL_DOWN_MASK), "goToAction");
-		bytecodeViewPanel.textArea.getActionMap().put("goToAction", new GoToAction(classFileContainer));
-
-		bytecodeViewPanel.textArea.addCaretListener(e -> {
-			if (bytecodeViewPanel.textArea.isFocusOwner())
-			{
-				RSyntaxTextAreaHighlighterEx highlighterEx = (RSyntaxTextAreaHighlighterEx) bytecodeViewPanel.textArea.getHighlighter();
-				highlighterEx.clearMarkOccurrencesHighlights();
-				RSyntaxTextArea textArea = (RSyntaxTextArea) e.getSource();
-				markOccurrences(textArea, viewer.classFiles.get(classContainerName), errorStripe);
-			}
-		});
-	}
-
-	private void markOccurrences(RSyntaxTextArea textArea, ClassFileContainer classFileContainer, MyErrorStripe errorStripe)
-	{
-		RSyntaxTextAreaHighlighterEx highlighterEx = (RSyntaxTextAreaHighlighterEx) textArea.getHighlighter();
-		Token token = textArea.modelToToken(textArea.getCaretPosition());
-		if (token == null)
-		{
-			highlighterEx.clearMarkOccurrencesHighlights();
-			errorStripe.refreshMarkers();
-			return;
-		}
-
-		token = TokenUtil.getToken(textArea, token);
-		if (token == null)
-		{
-			highlighterEx.clearMarkOccurrencesHighlights();
-			errorStripe.refreshMarkers();
-			return;
-		}
-
-		int line = textArea.getCaretLineNumber() + 1;
-		int column = textArea.getCaretOffsetFromLineStart();
-		Token finalToken = token;
+    public final ClassViewer viewer;
+    public final BytecodeViewPanel bytecodeViewPanel;
+    private final JButton button;
+    private final byte[] classBytes;
+
+    public SearchableRSyntaxTextArea updateUpdaterTextArea;
+    public JComboBox<Integer> methodsList;
+    public boolean isPanelEditable;
+    public boolean waitingFor;
+    private Thread thread;
+
+    public BytecodeViewPanelUpdater(BytecodeViewPanel bytecodeViewPanel, ClassViewer cv, byte[] classBytes, boolean isPanelEditable, JButton button)
+    {
+        this.viewer = cv;
+        this.bytecodeViewPanel = bytecodeViewPanel;
+        this.classBytes = classBytes;
+        this.isPanelEditable = isPanelEditable;
+        this.button = button;
+        waitingFor = true;
+    }
+
+    public void processDisplay()
+    {
+        try
+        {
+            BytecodeViewer.updateBusyStatus(true);
+
+            if (bytecodeViewPanel.decompiler != Decompiler.NONE)
+            {
+                //hex viewer
+                if (bytecodeViewPanel.decompiler == Decompiler.HEXCODE_VIEWER)
+                {
+                    final ClassWriter cw = new ClassWriter(0);
+                    viewer.resource.getResourceClassNode().accept(cw);
+
+                    SwingUtilities.invokeLater(() ->
+                    {
+                        final HexViewer hex = new HexViewer(cw.toByteArray());
+                        bytecodeViewPanel.add(hex);
+                    });
+                } else
+                {
+                    final Decompiler decompiler = bytecodeViewPanel.decompiler;
+
+                    //perform decompiling inside of this thread
+                    final String decompiledSource = decompiler.getDecompiler().decompileClassNode(viewer.resource.getResourceClassNode(), classBytes);
+
+                    ClassFileContainer container = new ClassFileContainer(viewer.resource.workingName + "-" + decompiler.getDecompilerName(), decompiledSource, viewer.resource.container.name);
+                    if (!container.hasBeenParsed)
+                    {
+                        container.parse();
+                        viewer.classFiles.put(viewer.resource.workingName + "-" + decompiler.getDecompilerName(), container);
+                        container.hasBeenParsed = true;
+                    }
+
+                    //set the swing components on the swing thread
+                    SwingUtilities.invokeLater(() ->
+                    {
+                        buildTextArea(decompiler, decompiledSource);
+                        waitingFor = false;
+                    });
+
+                    //hold this thread until the swing thread has finished attaching the components
+                    while (waitingFor)
+                    {
+                        try
+                        {
+                            Thread.sleep(1);
+                        } catch (Exception ignored)
+                        {
+                        }
+                    }
+                }
+            }
+        } catch (IndexOutOfBoundsException | NullPointerException e)
+        {
+            //ignore
+        } catch (Exception e)
+        {
+            BytecodeViewer.handleException(e);
+        } finally
+        {
+            viewer.resetDivider();
+            BytecodeViewer.updateBusyStatus(false);
+            SwingUtilities.invokeLater(() ->
+            {
+                if (button != null)
+                    button.setEnabled(true);
+            });
+        }
+    }
+
+    public void startNewThread()
+    {
+        thread = new Thread(this, "Pane Update");
+        thread.start();
+    }
+
+    @Override
+    public void run()
+    {
+        if (bytecodeViewPanel.decompiler == Decompiler.NONE)
+            return;
+
+        processDisplay();
+
+        if (bytecodeViewPanel.decompiler == Decompiler.HEXCODE_VIEWER)
+            return;
+
+        //nullcheck broken pane
+        if (updateUpdaterTextArea == null || updateUpdaterTextArea.getScrollPane() == null
+                || updateUpdaterTextArea.getScrollPane().getViewport() == null)
+        {
+            //build an error message
+            SwingUtilities.invokeLater(() ->
+                    buildTextArea(bytecodeViewPanel.decompiler, "Critical BCV Error"));
+            return;
+        }
+
+        //this still freezes the swing UI
+        synchronizePane();
+    }
+
+    public final CaretListener caretListener = new CaretListener()
+    {
+        @Override
+        public void caretUpdate(CaretEvent e)
+        {
+            MethodParser methods = viewer.methods.get(bytecodeViewPanel.panelIndex);
+            if (methods != null)
+            {
+                int methodLine = methods.findActiveMethod(updateUpdaterTextArea.getCaretLineNumber());
+
+                if (methodLine != -1)
+                {
+                    if (BytecodeViewer.viewer.showClassMethods.isSelected())
+                    {
+                        if (methodsList != null)
+                        {
+                            if (methodLine != (int) Objects.requireNonNull(methodsList.getSelectedItem()))
+                            {
+                                methodsList.setSelectedItem(methodLine);
+                            }
+                        }
+                    }
+                    if (BytecodeViewer.viewer.synchronizedViewing.isSelected())
+                    {
+                        int panes = 2;
+                        if (viewer.bytecodeViewPanel3 != null)
+                            panes = 3;
+
+                        for (int i = 0; i < panes; i++)
+                        {
+                            if (i != bytecodeViewPanel.panelIndex)
+                            {
+                                ClassViewer.selectMethod(viewer, i, methods.getMethod(methodLine));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    };
+
+    public final ChangeListener viewportListener = new ChangeListener()
+    {
+        @Override
+        public void stateChanged(ChangeEvent e)
+        {
+            int panes = 2;
+            if (viewer.bytecodeViewPanel3 != null)
+                panes = 3;
+
+            if (BytecodeViewer.viewer.synchronizedViewing.isSelected())
+            {
+                if (updateUpdaterTextArea.isShowing() && (updateUpdaterTextArea.hasFocus() || updateUpdaterTextArea.getMousePosition() != null))
+                {
+                    int caretLine = updateUpdaterTextArea.getCaretLineNumber();
+                    int maxViewLine = ClassViewer.getMaxViewLine(updateUpdaterTextArea);
+                    int activeViewLine = ClassViewer.getViewLine(updateUpdaterTextArea);
+                    int activeLine = (activeViewLine == maxViewLine && caretLine > maxViewLine) ? caretLine :
+                            activeViewLine;
+                    int activeLineDelta = -1;
+                    MethodParser.Method activeMethod = null;
+                    MethodParser activeMethods = viewer.methods.get(bytecodeViewPanel.panelIndex);
+                    if (activeMethods != null)
+                    {
+                        int activeMethodLine = activeMethods.findActiveMethod(activeLine);
+                        if (activeMethodLine != -1)
+                        {
+                            activeLineDelta = activeLine - activeMethodLine;
+                            activeMethod = activeMethods.getMethod(activeMethodLine);
+                            ClassViewer.selectMethod(updateUpdaterTextArea, activeMethodLine);
+                        }
+                    }
+                    for (int i = 0; i < panes; i++)
+                    {
+                        if (i != bytecodeViewPanel.panelIndex)
+                        {
+                            int setLine = -1;
+
+                            RSyntaxTextArea area = null;
+                            switch (i)
+                            {
+                                case 0:
+                                    area = viewer.bytecodeViewPanel1.updateThread.updateUpdaterTextArea;
+                                    break;
+                                case 1:
+                                    area = viewer.bytecodeViewPanel2.updateThread.updateUpdaterTextArea;
+                                    break;
+                                case 2:
+                                    area = viewer.bytecodeViewPanel3.updateThread.updateUpdaterTextArea;
+                                    break;
+                            }
+
+                            if (area != null)
+                            {
+                                if (activeMethod != null && activeLineDelta >= 0)
+                                {
+                                    MethodParser methods = viewer.methods.get(i);
+                                    if (methods != null)
+                                    {
+                                        int methodLine = methods.findMethod(activeMethod);
+                                        if (methodLine != -1)
+                                        {
+                                            int viewLine = ClassViewer.getViewLine(area);
+                                            if (activeLineDelta != viewLine - methodLine)
+                                            {
+                                                setLine = methodLine + activeLineDelta;
+                                            }
+                                        }
+                                    }
+                                } else if (activeLine != ClassViewer.getViewLine(area))
+                                {
+                                    setLine = activeLine;
+                                }
+                                if (setLine >= 0)
+                                {
+                                    ClassViewer.setViewLine(area, setLine);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    };
+
+    public void synchronizePane()
+    {
+        if (bytecodeViewPanel.decompiler == Decompiler.HEXCODE_VIEWER
+                || bytecodeViewPanel.decompiler == Decompiler.NONE)
+            return;
+
+        SwingUtilities.invokeLater(() ->
+        {
+            JViewport viewport = updateUpdaterTextArea.getScrollPane().getViewport();
+            viewport.addChangeListener(viewportListener);
+            updateUpdaterTextArea.addCaretListener(caretListener);
+        });
+
+        final MethodParser methods = viewer.methods.get(bytecodeViewPanel.panelIndex);
+        for (int i = 0; i < updateUpdaterTextArea.getLineCount(); i++)
+        {
+            String lineText = updateUpdaterTextArea.getLineText(i);
+            Matcher regexMatcher = MethodParser.regex.matcher(lineText);
+            if (regexMatcher.find())
+            {
+                String methodName = regexMatcher.group("name");
+                String methodParams = regexMatcher.group("params");
+                methods.addMethod(i, methodName, methodParams);
+            }
+        }
+
+        //TODO fix this
+        if (BytecodeViewer.viewer.showClassMethods.isSelected())
+        {
+            if (!methods.isEmpty())
+            {
+                methodsList = new JComboBox<>();
+
+                for (Integer line : methods.getMethodsLines())
+                    methodsList.addItem(line);
+
+                methodsList.setRenderer(new MethodsRenderer(this));
+                methodsList.addActionListener(e ->
+                {
+                    int line = (int) Objects.requireNonNull(methodsList.getSelectedItem());
+
+                    RSyntaxTextArea area = null;
+                    switch (bytecodeViewPanel.panelIndex)
+                    {
+                        case 0:
+                            area = viewer.bytecodeViewPanel1.updateThread.updateUpdaterTextArea;
+                            break;
+                        case 1:
+                            area = viewer.bytecodeViewPanel2.updateThread.updateUpdaterTextArea;
+                            break;
+                        case 2:
+                            area = viewer.bytecodeViewPanel3.updateThread.updateUpdaterTextArea;
+                            break;
+                    }
+
+                    if (area != null)
+                        ClassViewer.selectMethod(area, line);
+                });
+
+                JPanel panel = new JPanel(new BorderLayout());
+                panel.add(updateUpdaterTextArea.getScrollPane().getColumnHeader().getComponent(0), BorderLayout.NORTH);
+                panel.add(methodsList, BorderLayout.SOUTH);
+                methodsList.setBackground(BLANK_COLOR);
+
+                SwingUtilities.invokeLater(() ->
+                {
+                    updateUpdaterTextArea.getScrollPane().getColumnHeader().removeAll();
+                    updateUpdaterTextArea.getScrollPane().getColumnHeader().add(panel);
+                });
+            }
+        }
+    }
+
+    public void buildTextArea(Decompiler decompiler, String decompiledSource)
+    {
+        updateUpdaterTextArea = new SearchableRSyntaxTextArea();
+
+        Configuration.rstaTheme.apply(updateUpdaterTextArea);
+        bytecodeViewPanel.add(updateUpdaterTextArea.getTextAreaSearchPanel(), BorderLayout.NORTH);
+        bytecodeViewPanel.add(updateUpdaterTextArea.getScrollPane());
+
+        bytecodeViewPanel.textArea = updateUpdaterTextArea;
+
+        bytecodeViewPanel.textArea.setMarkOccurrencesColor(Color.ORANGE);
+        bytecodeViewPanel.textArea.setCursor(new Cursor(Cursor.TEXT_CURSOR));
+        bytecodeViewPanel.textArea.getCaret().setVisible(true);
+        bytecodeViewPanel.textArea.getCaret().setBlinkRate(0);
+        bytecodeViewPanel.textArea.setHighlighter(new RSyntaxTextAreaHighlighterEx());
+
+        if (bytecodeViewPanel.decompiler != Decompiler.BYTECODE_DISASSEMBLER)
+        {
+            bytecodeViewPanel.textArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
+        } else
+        {
+            AbstractTokenMakerFactory tokenMakerFactory = (AbstractTokenMakerFactory) TokenMakerFactory.getDefaultInstance();
+            tokenMakerFactory.putMapping("text/javaBytecode", "the.bytecode.club.bytecodeviewer.decompilers.bytecode.JavaBytecodeTokenMaker");
+            bytecodeViewPanel.textArea.setSyntaxEditingStyle("text/javaBytecode");
+        }
+        bytecodeViewPanel.textArea.setCodeFoldingEnabled(true);
+        bytecodeViewPanel.textArea.setText(decompiledSource);
+        bytecodeViewPanel.textArea.setCaretPosition(0);
+        bytecodeViewPanel.textArea.setEditable(isPanelEditable);
+
+        if (isPanelEditable && decompiler == Decompiler.SMALI_DISASSEMBLER)
+            bytecodeViewPanel.compiler = Compiler.SMALI_ASSEMBLER;
+        else if (isPanelEditable && decompiler == Decompiler.KRAKATAU_DISASSEMBLER)
+            bytecodeViewPanel.compiler = Compiler.KRAKATAU_ASSEMBLER;
+
+        String editable = isPanelEditable ? " - " + EDITABLE : "";
+        bytecodeViewPanel.textArea.getTextAreaSearchPanel().getTitleHeader().setText(decompiler.getDecompilerName() + editable);
+
+        MyErrorStripe errorStripe = new MyErrorStripe(bytecodeViewPanel.textArea);
+        bytecodeViewPanel.add(errorStripe, BorderLayout.LINE_END);
+
+        bytecodeViewPanel.revalidate();
+        bytecodeViewPanel.repaint();
+
+        String classContainerName = viewer.resource.workingName + "-" + decompiler.getDecompilerName();
+        ClassFileContainer classFileContainer = viewer.classFiles.get(classContainerName);
+        bytecodeViewPanel.textArea.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_B, InputEvent.CTRL_DOWN_MASK), "goToAction");
+        bytecodeViewPanel.textArea.getActionMap().put("goToAction", new GoToAction(classFileContainer));
+
+        bytecodeViewPanel.textArea.addCaretListener(e -> {
+            if (bytecodeViewPanel.textArea.isFocusOwner())
+            {
+                RSyntaxTextAreaHighlighterEx highlighterEx = (RSyntaxTextAreaHighlighterEx) bytecodeViewPanel.textArea.getHighlighter();
+                highlighterEx.clearMarkOccurrencesHighlights();
+                RSyntaxTextArea textArea = (RSyntaxTextArea) e.getSource();
+                markOccurrences(textArea, viewer.classFiles.get(classContainerName), errorStripe);
+            }
+        });
+    }
+
+    private void markOccurrences(RSyntaxTextArea textArea, ClassFileContainer classFileContainer, MyErrorStripe errorStripe)
+    {
+        RSyntaxTextAreaHighlighterEx highlighterEx = (RSyntaxTextAreaHighlighterEx) textArea.getHighlighter();
+        Token token = textArea.modelToToken(textArea.getCaretPosition());
+        if (token == null)
+        {
+            highlighterEx.clearMarkOccurrencesHighlights();
+            errorStripe.refreshMarkers();
+            return;
+        }
+
+        token = TokenUtil.getToken(textArea, token);
+        if (token == null)
+        {
+            highlighterEx.clearMarkOccurrencesHighlights();
+            errorStripe.refreshMarkers();
+            return;
+        }
+
+        int line = textArea.getCaretLineNumber() + 1;
+        int column = textArea.getCaretOffsetFromLineStart();
+        Token finalToken = token;
 
 		/*
 		Fields
 		 */
-		markField(textArea, classFileContainer, line, column, finalToken, highlighterEx);
+        markField(textArea, classFileContainer, line, column, finalToken, highlighterEx);
 
 		/*
 		Method parameters
 		 */
-		markMethodParameter(textArea, classFileContainer, line, column, finalToken, highlighterEx);
+        markMethodParameter(textArea, classFileContainer, line, column, finalToken, highlighterEx);
 
 		/*
 		Method local variables
 		 */
-		markMethodLocalVariable(textArea, classFileContainer, line, column, finalToken, highlighterEx);
-
-		errorStripe.refreshMarkers();
-	}
-
-	private void markField(RSyntaxTextArea textArea, ClassFileContainer classFileContainer, int line, int column, Token finalToken, RSyntaxTextAreaHighlighterEx highlighterEx)
-	{
-		classFileContainer.fieldMembers.values().forEach(fields -> fields.forEach(field -> {
-			String owner;
-			if (field.line == line && field.columnStart - 1 <= column && field.columnEnd >= column)
-			{
-				owner = field.owner;
-				try
-				{
-					Element root = textArea.getDocument().getDefaultRootElement();
-					for (
-							ClassFieldLocation location :
-							classFileContainer.getFieldLocationsFor(finalToken.getLexeme())
-					)
-					{
-						if (Objects.equals(owner, location.owner))
-						{
-							int startOffset = root
-									.getElement(location.line - 1)
-									.getStartOffset() + (location.columnStart - 1);
-							int endOffset = root
-									.getElement(location.line - 1)
-									.getStartOffset() + (location.columnEnd - 1);
-							highlighterEx.addMarkedOccurrenceHighlight(
-									startOffset, endOffset, new SmartHighlightPainter()
-							);
-						}
-					}
-				} catch (BadLocationException ex)
-				{
-					throw new RuntimeException(ex);
-				}
-			}
-		}));
-	}
-
-	/**
-	 * Search through the text area and mark all occurrences that match the selected token.
-	 *
-	 * @param textArea           the text area
-	 * @param classFileContainer the container
-	 * @param line               the caret line
-	 * @param column             the caret column
-	 * @param finalToken         the token
-	 * @param highlighterEx      the highlighter
-	 */
-	private static void markMethodParameter(
-			RSyntaxTextArea textArea,
-			ClassFileContainer classFileContainer,
-			int line,
-			int column,
-			Token finalToken,
-			RSyntaxTextAreaHighlighterEx highlighterEx
-	)
-	{
-		classFileContainer.methodParameterMembers.values().forEach(parameters -> parameters.forEach(parameter -> {
-			String method;
-			if (parameter.line == line && parameter.columnStart - 1 <= column && parameter.columnEnd >= column)
-			{
-				method = parameter.method;
-				try
-				{
-					Element root = textArea.getDocument().getDefaultRootElement();
-					for (
-							ClassParameterLocation location :
-							classFileContainer.getParameterLocationsFor(finalToken.getLexeme())
-					)
-					{
-						if (Objects.equals(method, location.method))
-						{
-							int startOffset = root
-									.getElement(location.line - 1)
-									.getStartOffset() + (location.columnStart - 1);
-							int endOffset = root
-									.getElement(location.line - 1)
-									.getStartOffset() + (location.columnEnd - 1);
-
-							highlighterEx.addMarkedOccurrenceHighlight(
-									startOffset, endOffset, new SmartHighlightPainter()
-							);
-						}
-					}
-				} catch (BadLocationException ex)
-				{
-					throw new RuntimeException(ex);
-				}
-			}
-		}));
-	}
-
-	/**
-	 * Search through the text area and mark all occurrences that match the selected token.
-	 *
-	 * @param textArea           the text area
-	 * @param classFileContainer the container
-	 * @param line               the caret line
-	 * @param column             the caret column
-	 * @param finalToken         the token
-	 * @param highlighterEx      the highlighter
-	 */
-	private static void markMethodLocalVariable(
-			RSyntaxTextArea textArea,
-			ClassFileContainer classFileContainer,
-			int line,
-			int column,
-			Token finalToken,
-			RSyntaxTextAreaHighlighterEx highlighterEx
-	) {
-		classFileContainer.methodLocalMembers.values().forEach(localVariables -> localVariables.forEach(localVariable -> {
-			String method;
-			if (localVariable.line == line && localVariable.columnStart - 1 <= column && localVariable.columnEnd >= column) {
-				method = localVariable.method;
-				try {
-					Element root = textArea.getDocument().getDefaultRootElement();
-					for (
-							ClassLocalVariableLocation location :
-							classFileContainer.getLocalLocationsFor(finalToken.getLexeme())
-					) {
-						if (Objects.equals(method, location.method)) {
-							int startOffset = root
-									.getElement(location.line - 1)
-									.getStartOffset() + (location.columnStart - 1);
-							int endOffset = root
-									.getElement(location.line - 1)
-									.getStartOffset() + (location.columnEnd - 1);
-
-							highlighterEx.addMarkedOccurrenceHighlight(
-									startOffset, endOffset, new SmartHighlightPainter()
-							);
-						}
-					}
-				} catch (BadLocationException ex) {
-					throw new RuntimeException(ex);
-				}
-			}
-		}));
-	}
+        markMethodLocalVariable(textArea, classFileContainer, line, column, finalToken, highlighterEx);
+
+        errorStripe.refreshMarkers();
+    }
+
+    private void markField(RSyntaxTextArea textArea, ClassFileContainer classFileContainer, int line, int column, Token finalToken, RSyntaxTextAreaHighlighterEx highlighterEx)
+    {
+        classFileContainer.fieldMembers.values().forEach(fields -> fields.forEach(field -> {
+            if (field.line == line && field.columnStart - 1 <= column && field.columnEnd >= column)
+            {
+                try
+                {
+                    Element root = textArea.getDocument().getDefaultRootElement();
+                    for (
+                            ClassFieldLocation location :
+                            classFileContainer.getFieldLocationsFor(finalToken.getLexeme())
+                    )
+                    {
+                        int startOffset = root
+                                .getElement(location.line - 1)
+                                .getStartOffset() + (location.columnStart - 1);
+                        int endOffset = root
+                                .getElement(location.line - 1)
+                                .getStartOffset() + (location.columnEnd - 1);
+                        highlighterEx.addMarkedOccurrenceHighlight(
+                                startOffset, endOffset, new SmartHighlightPainter()
+                        );
+                    }
+                } catch (BadLocationException ex)
+                {
+                    throw new RuntimeException(ex);
+                }
+            }
+        }));
+    }
+
+    /**
+     * Search through the text area and mark all occurrences that match the selected token.
+     *
+     * @param textArea           the text area
+     * @param classFileContainer the container
+     * @param line               the caret line
+     * @param column             the caret column
+     * @param finalToken         the token
+     * @param highlighterEx      the highlighter
+     */
+    private static void markMethodParameter(
+            RSyntaxTextArea textArea,
+            ClassFileContainer classFileContainer,
+            int line,
+            int column,
+            Token finalToken,
+            RSyntaxTextAreaHighlighterEx highlighterEx
+    )
+    {
+        classFileContainer.methodParameterMembers.values().forEach(parameters -> parameters.forEach(parameter -> {
+            String method;
+            if (parameter.line == line && parameter.columnStart - 1 <= column && parameter.columnEnd >= column)
+            {
+                method = parameter.method;
+                try
+                {
+                    Element root = textArea.getDocument().getDefaultRootElement();
+                    for (
+                            ClassParameterLocation location :
+                            classFileContainer.getParameterLocationsFor(finalToken.getLexeme())
+                    )
+                    {
+                        if (Objects.equals(method, location.method))
+                        {
+                            int startOffset = root
+                                    .getElement(location.line - 1)
+                                    .getStartOffset() + (location.columnStart - 1);
+                            int endOffset = root
+                                    .getElement(location.line - 1)
+                                    .getStartOffset() + (location.columnEnd - 1);
+
+                            highlighterEx.addMarkedOccurrenceHighlight(
+                                    startOffset, endOffset, new SmartHighlightPainter()
+                            );
+                        }
+                    }
+                } catch (BadLocationException ex)
+                {
+                    throw new RuntimeException(ex);
+                }
+            }
+        }));
+    }
+
+    /**
+     * Search through the text area and mark all occurrences that match the selected token.
+     *
+     * @param textArea           the text area
+     * @param classFileContainer the container
+     * @param line               the caret line
+     * @param column             the caret column
+     * @param finalToken         the token
+     * @param highlighterEx      the highlighter
+     */
+    private static void markMethodLocalVariable(
+            RSyntaxTextArea textArea,
+            ClassFileContainer classFileContainer,
+            int line,
+            int column,
+            Token finalToken,
+            RSyntaxTextAreaHighlighterEx highlighterEx
+    )
+    {
+        classFileContainer.methodLocalMembers.values().forEach(localVariables -> localVariables.forEach(localVariable -> {
+            String method;
+            if (localVariable.line == line && localVariable.columnStart - 1 <= column && localVariable.columnEnd >= column)
+            {
+                method = localVariable.method;
+                try
+                {
+                    Element root = textArea.getDocument().getDefaultRootElement();
+                    for (
+                            ClassLocalVariableLocation location :
+                            classFileContainer.getLocalLocationsFor(finalToken.getLexeme())
+                    )
+                    {
+                        if (Objects.equals(method, location.method))
+                        {
+                            int startOffset = root
+                                    .getElement(location.line - 1)
+                                    .getStartOffset() + (location.columnStart - 1);
+                            int endOffset = root
+                                    .getElement(location.line - 1)
+                                    .getStartOffset() + (location.columnEnd - 1);
+
+                            highlighterEx.addMarkedOccurrenceHighlight(
+                                    startOffset, endOffset, new SmartHighlightPainter()
+                            );
+                        }
+                    }
+                } catch (BadLocationException ex)
+                {
+                    throw new RuntimeException(ex);
+                }
+            }
+        }));
+    }
 }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
index 93d7a2115..6a9d338b8 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
@@ -26,15 +26,18 @@ public class ClassFileContainer
 	public transient NavigableMap<String, ArrayList<ClassParameterLocation>> methodParameterMembers = new TreeMap<>();
 	public transient NavigableMap<String, ArrayList<ClassLocalVariableLocation>> methodLocalMembers = new TreeMap<>();
 	public transient NavigableMap<String, ArrayList<ClassMethodLocation>> methodMembers = new TreeMap<>();
+	public transient NavigableMap<String, String> imports = new TreeMap<>();
 
 	public boolean hasBeenParsed = false;
 	public final String className;
 	private final String content;
+	private final String parentContainer;
 
-	public ClassFileContainer(String className, String content)
+	public ClassFileContainer(String className, String content, String parentContainer)
 	{
 		this.className = className;
 		this.content = content;
+		this.parentContainer = parentContainer;
 	}
 
 	public void parse()
@@ -50,6 +53,15 @@ public void parse()
 		}
 	}
 
+	public String getName() {
+		return this.className.substring(this.className.lastIndexOf('.') + 1);
+	}
+
+	public String getParentContainer()
+	{
+		return this.parentContainer;
+	}
+
 	public void putField(String key, ClassFieldLocation value)
 	{
 		this.fieldMembers.computeIfAbsent(key, v -> new ArrayList<>()).add(value);
@@ -89,4 +101,14 @@ public List<ClassMethodLocation> getMethodLocationsFor(String key)
 	{
 		return methodMembers.getOrDefault(key, new ArrayList<>());
 	}
+
+	public void putImport(String key, String value)
+	{
+		this.imports.put(key, value);
+	}
+
+	public String getImport(String key) {
+		String value = this.imports.get(key);
+		return value + "/" + key;
+	}
 }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
index cee420bec..2bc3cfeed 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
@@ -2,9 +2,11 @@
 
 import com.github.javaparser.Range;
 import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.ImportDeclaration;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.stmt.*;
+import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
 import com.github.javaparser.resolution.UnsolvedSymbolException;
 import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
@@ -14,6 +16,7 @@
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassMethodLocation;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassParameterLocation;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -34,7 +37,7 @@ public MyVoidVisitor(ClassFileContainer container, CompilationUnit compilationUn
 
     private String getOwner()
     {
-        return this.classFileContainer.className.substring(this.classFileContainer.className.lastIndexOf('.') + 1);
+        return this.classFileContainer.getName();
     }
 
     private String getMethod(CallableDeclaration<?> method)
@@ -66,6 +69,17 @@ public void visit(FieldDeclaration n, Object arg)
         });
     }
 
+    @Override
+    public void visit(ImportDeclaration n, Object arg)
+    {
+        super.visit(n, arg);
+        Name class_ = n.getName();
+        String className = class_.getIdentifier();
+        String package_ = Objects.requireNonNull(class_.getQualifier().orElse(null)).asString();
+        package_ = package_.replace('.', '/');
+        this.classFileContainer.putImport(className, package_);
+    }
+
     /**
      * Visit all {@link FieldAccessExpr}s.
      * <p>
@@ -85,7 +99,6 @@ public void visit(FieldAccessExpr n, Object arg)
         int line = range.begin.line;
         int columnStart = range.begin.column;
         int columnEnd = range.end.column;
-        this.classFileContainer.putField(fieldName, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
 
         if (n.hasScope())
         {
@@ -101,15 +114,15 @@ public void visit(FieldAccessExpr n, Object arg)
                 if (scope instanceof NameExpr)
                 {
                     NameExpr nameExpr = (NameExpr) scope;
+                    SimpleName simpleName1 = nameExpr.getName();
+                    String name1 = simpleName1.getIdentifier();
+                    Range range1 = nameExpr.getRange().get();
+                    int line1 = range1.begin.line;
+                    int columnStart1 = range1.begin.column;
+                    int columnEnd1 = range1.end.column;
                     try
                     {
                         ResolvedValueDeclaration vd = nameExpr.resolve();
-                        SimpleName simpleName1 = nameExpr.getName();
-                        String name1 = simpleName1.getIdentifier();
-                        Range range1 = nameExpr.getRange().get();
-                        int line1 = range1.begin.line;
-                        int columnStart1 = range1.begin.column;
-                        int columnEnd1 = range1.end.column;
                         if (vd.isField())
                         {
                             this.classFileContainer.putField(name1, new ClassFieldLocation(getOwner(), "reference", line1, columnStart1, columnEnd1 + 1));
@@ -122,12 +135,20 @@ public void visit(FieldAccessExpr n, Object arg)
                         }
                     } catch (UnsolvedSymbolException ignore)
                     {
+                        this.classFileContainer.putField(fieldName, new ClassFieldLocation(name1, "reference", line, columnStart, columnEnd + 1));
                     }
                 }
             }
         }
     }
 
+    @Override
+    public void visit(ClassOrInterfaceType n, Object arg)
+    {
+        super.visit(n, arg);
+//        System.err.println(n.getName().getIdentifier());
+    }
+
     /**
      * Visit all {@link ConstructorDeclaration}s.
      * <p>

From e756324245cac09db300c967c30dcd17e9d78ef3 Mon Sep 17 00:00:00 2001
From: Cody <6558800+Bl3nd@users.noreply.github.com>
Date: Mon, 16 Sep 2024 18:22:15 -0600
Subject: [PATCH 07/11] [Go-To] Move caret to requested field.

- Also added enum constant declarations to the token parser.
---
 .../components/SearchableRSyntaxTextArea.java |  22 +-
 .../gui/components/actions/GoToAction.java    |  97 ++-
 .../gui/resourceviewer/Workspace.java         |   7 +-
 .../resourceviewer/viewer/ClassViewer.java    | 617 +++++++++---------
 .../gui/util/BytecodeViewPanelUpdater.java    |  42 +-
 .../classcontainer/ClassFileContainer.java    |   4 +
 .../classcontainer/parser/MyVoidVisitor.java  |  27 +
 7 files changed, 478 insertions(+), 338 deletions(-)

diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java
index 813ffd660..f093b8110 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java
@@ -30,9 +30,7 @@
 import javax.swing.*;
 import javax.swing.text.BadLocationException;
 import java.awt.*;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseWheelEvent;
+import java.awt.event.*;
 
 /**
  * Searching on an RSyntaxTextArea using swing highlighting
@@ -87,6 +85,24 @@ public SearchableRSyntaxTextArea()
             GlobalHotKeys.keyPressed(keyEvent);
         }));
 
+        setCursor(new Cursor(Cursor.TEXT_CURSOR));
+        getCaret().setBlinkRate(0);
+        getCaret().setVisible(true);
+        addFocusListener(new FocusAdapter()
+        {
+            @Override
+            public void focusGained(FocusEvent e)
+            {
+                getCaret().setVisible(true);
+            }
+
+            @Override
+            public void focusLost(FocusEvent e)
+            {
+                getCaret().setVisible(true);
+            }
+        });
+
         final Font newFont = getFont().deriveFont((float) BytecodeViewer.viewer.getFontSize());
 
         //set number-bar font
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java
index 07cb9e339..8fafc209c 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java
@@ -1,17 +1,20 @@
 package the.bytecode.club.bytecodeviewer.gui.components.actions;
 
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
-import org.fife.ui.rsyntaxtextarea.Token;
-import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
+import the.bytecode.club.bytecodeviewer.gui.resourceviewer.BytecodeViewPanel;
+import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ClassViewer;
+import the.bytecode.club.bytecodeviewer.gui.util.BytecodeViewPanelUpdater;
 import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.ClassFileContainer;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassFieldLocation;
-import the.bytecode.club.bytecodeviewer.resources.classcontainer.parser.TokenUtil;
 
 import javax.swing.*;
+import javax.swing.event.CaretEvent;
+import javax.swing.event.CaretListener;
 import javax.swing.text.Element;
 import java.awt.event.ActionEvent;
+import java.util.HashMap;
 
 /**
  * Created by Bl3nd.
@@ -36,20 +39,14 @@ public void actionPerformed(ActionEvent e)
         container.fieldMembers.values().forEach(fields -> fields.forEach(field -> {
             if (field.line == line && field.columnStart - 1 <= column && field.columnEnd >= column)
             {
+                Element root = textArea.getDocument().getDefaultRootElement();
                 // Open the class that is associated with the field's owner.
                 if (!field.owner.equals(container.getName()))
                 {
-                    ResourceContainer resourceContainer = BytecodeViewer.getFileContainer(container.getParentContainer());
-                    if (resourceContainer != null)
-                    {
-                        String s = container.getImport(field.owner);
-                        BytecodeViewer.viewer.workPane.addClassResource(resourceContainer, s + ".class");
-                    }
-
+                    openFieldClass(field, textArea);
                     return;
                 }
 
-                Element root = textArea.getDocument().getDefaultRootElement();
                 ClassFieldLocation first = fields.get(0);
                 int startOffset = root.getElement(first.line - 1).getStartOffset() + (first.columnStart - 1);
                 textArea.setCaretPosition(startOffset);
@@ -100,4 +97,82 @@ public void actionPerformed(ActionEvent e)
             }
         }));
     }
+
+    private void openFieldClass(ClassFieldLocation field, RSyntaxTextArea textArea)
+    {
+        String token = textArea.modelToToken(textArea.getCaretPosition()).getLexeme();
+        ResourceContainer resourceContainer = BytecodeViewer.getFileContainer(container.getParentContainer());
+        if (resourceContainer != null)
+        {
+            String s = container.getImport(field.owner);
+            BytecodeViewer.viewer.workPane.addClassResource(resourceContainer, s + ".class");
+            ClassViewer activeResource = (ClassViewer) BytecodeViewer.viewer.workPane.getActiveResource();
+            HashMap<String, ClassFileContainer> classFiles = BytecodeViewer.viewer.workPane.classFiles;
+            Thread thread = new Thread(() -> {
+                try
+                {
+                    BytecodeViewer.updateBusyStatus(true);
+                    Thread.sleep(1000);
+                } catch (InterruptedException e)
+                {
+                    throw new RuntimeException(e);
+                } finally
+                {
+                    BytecodeViewer.updateBusyStatus(false);
+                }
+
+                String s2 = activeResource.resource.workingName + "-" + this.container.getDecompiler();
+                ClassFileContainer classFileContainer = classFiles.get(s2);
+                classFileContainer.fieldMembers.forEach((field1, field2) -> {
+                    if (field1.equals(token))
+                    {
+                        field2.forEach(classFieldLocation -> {
+                            if (classFieldLocation.type.equals("declaration"))
+                            {
+                                for (int i = 0; i < 3; i++)
+                                {
+                                    BytecodeViewPanel panel = activeResource.getPanel(i);
+                                    if (panel.textArea != null)
+                                    {
+                                        if (panel.decompiler.getDecompilerName().equals(this.container.getDecompiler()))
+                                        {
+                                            Element root = panel.textArea.getDocument().getDefaultRootElement();
+                                            int startOffset = root.getElement(classFieldLocation.line - 1).getStartOffset() + (classFieldLocation.columnStart - 1);
+                                            panel.textArea.setCaretPosition(startOffset);
+                                            for (CaretListener caretListener : panel.textArea.getCaretListeners())
+                                            {
+                                                if (caretListener instanceof BytecodeViewPanelUpdater.MarkerCaretListener)
+                                                {
+                                                    BytecodeViewPanelUpdater.MarkerCaretListener markerCaretListener = (BytecodeViewPanelUpdater.MarkerCaretListener) caretListener;
+                                                    markerCaretListener.caretUpdate(new CaretEvent(panel.textArea)
+                                                    {
+                                                        @Override
+                                                        public int getDot()
+                                                        {
+                                                            return panel.textArea.getCaret().getDot();
+                                                        }
+
+                                                        @Override
+                                                        public int getMark()
+                                                        {
+                                                            return 0;
+                                                        }
+                                                    });
+                                                }
+                                            }
+
+                                            panel.textArea.requestFocusInWindow();
+
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                        });
+                    }
+                });
+            });
+            thread.start();
+        }
+    }
 }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java
index b25c35768..c513ab1be 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java
@@ -24,6 +24,7 @@
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.FileViewer;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ResourceViewer;
 import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.ClassFileContainer;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedComponents;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJButton;
@@ -33,13 +34,10 @@
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
-import static the.bytecode.club.bytecodeviewer.Constants.BLOCK_TAB_MENU;
-
 /**
  * This pane contains all the resources, as tabs.
  *
@@ -54,6 +52,7 @@ public class Workspace extends TranslatedVisibleComponent {
 	public final JPanel buttonPanel;
 	public final JButton refreshClass;
 	public final Set<String> openedTabs = new HashSet<>();
+	public HashMap<String, ClassFileContainer> classFiles = new HashMap<>();
 
 	public Workspace() {
 		super("Workspace", TranslatedComponents.WORK_SPACE);
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/viewer/ClassViewer.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/viewer/ClassViewer.java
index 23c467d7d..bd2d9115c 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/viewer/ClassViewer.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/viewer/ClassViewer.java
@@ -27,7 +27,6 @@
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.BytecodeViewPanel;
 import the.bytecode.club.bytecodeviewer.resources.Resource;
 import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
-import the.bytecode.club.bytecodeviewer.resources.classcontainer.ClassFileContainer;
 import the.bytecode.club.bytecodeviewer.util.MethodParser;
 
 import javax.swing.*;
@@ -38,7 +37,6 @@
 import java.awt.event.HierarchyEvent;
 import java.awt.event.HierarchyListener;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 
 import static the.bytecode.club.bytecodeviewer.util.MethodParser.Method;
@@ -53,307 +51,316 @@
 
 public class ClassViewer extends ResourceViewer
 {
-	public JSplitPane sp;
-	public JSplitPane sp2;
-	public BytecodeViewPanel bytecodeViewPanel1 = new BytecodeViewPanel(0, this);
-	public BytecodeViewPanel bytecodeViewPanel2 = new BytecodeViewPanel(1, this);
-	public BytecodeViewPanel bytecodeViewPanel3 = new BytecodeViewPanel(2, this);
-	public List<MethodParser> methods = Arrays.asList(new MethodParser(), new MethodParser(), new MethodParser());
-	public HashMap<String, ClassFileContainer> classFiles = new HashMap<>();
-	
-	public ClassViewer(ResourceContainer container, String name)
-	{
-		super(new Resource(name, container.getWorkingName(name), container));
-		
-		this.setName(name);
-		this.setLayout(new BorderLayout());
-		this.sp = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, bytecodeViewPanel1, bytecodeViewPanel2);
-		this.sp2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, sp, bytecodeViewPanel3);
-		this.add(sp2, BorderLayout.CENTER);
-		
-		this.addComponentListener(new ComponentAdapter()
-		{
-			@Override
-			public void componentResized(ComponentEvent e)
-			{
-				resetDivider();
-			}
-		});
-	}
-	
-	@Override
-	public void refresh(JButton button)
-	{
-		setPanes();
-		refreshTitle();
-		
-		bytecodeViewPanel1.createPane(this);
-		bytecodeViewPanel2.createPane(this);
-		bytecodeViewPanel3.createPane(this);
-		
-		byte[] classBytes = getResourceBytes();
-		
-		//TODO remove this once all of the importers have been properly updated to use a FileContainerImporter
-		if (classBytes == null || classBytes.length == 0 || Configuration.forceResourceUpdateFromClassNode)
-		{
-			//TODO remove this error message when all of the importers have been updated
-			// only APK and DEX are left
-			if (!Configuration.forceResourceUpdateFromClassNode)
-			{
-				System.err.println("WARNING: Class Resource imported using the old importer!");
-				System.err.println("TODO: Update it to use the FileContainerImporter");
-			}
-			
-			classBytes = ASMUtil.nodeToBytes(resource.getResourceClassNode());
-		}
-		
-		bytecodeViewPanel1.updatePane(this, classBytes, button, isPanel1Editable());
-		bytecodeViewPanel2.updatePane(this, classBytes, button, isPanel2Editable());
-		bytecodeViewPanel3.updatePane(this, classBytes, button, isPanel3Editable());
-		
-		Thread dumpBuild = new Thread(() ->
-		{
-			BytecodeViewer.updateBusyStatus(true);
-			
-			while (Configuration.currentlyDumping)
-			{
-				//wait until it's not dumping
-				try
-				{
-					Thread.sleep(100);
-				}
-				catch (InterruptedException e)
-				{
-					e.printStackTrace();
-				}
-			}
-			
-			BytecodeViewer.updateBusyStatus(false);
-			
-			if (bytecodeViewPanel1.decompiler != Decompiler.NONE)
-				bytecodeViewPanel1.updateThread.startNewThread();
-			
-			if (bytecodeViewPanel2.decompiler != Decompiler.NONE)
-				bytecodeViewPanel2.updateThread.startNewThread();
-			
-			if (bytecodeViewPanel3.decompiler != Decompiler.NONE)
-				bytecodeViewPanel3.updateThread.startNewThread();
-		}, "ClassViewer Temp Dump");
-		
-		dumpBuild.start();
-		
-		if (isPanel1Editable() || isPanel2Editable() || isPanel3Editable())
-		{
-			if (Configuration.warnForEditing)
-				return;
-			
-			Configuration.warnForEditing = true;
-			
-			if (!BytecodeViewer.viewer.autoCompileOnRefresh.isSelected() && !BytecodeViewer.viewer.compileOnSave.isSelected())
-			{
-				BytecodeViewer.showMessage("Make sure to compile (File>Compile or Ctrl + T) whenever you want to " + "test or export your changes.\nYou can set compile automatically on refresh or on save " + "in the settings menu.");
-				
-				SettingsSerializer.saveSettingsAsync();
-			}
-		}
-	}
-	
-	public void setPanes()
-	{
-		bytecodeViewPanel1.decompiler = BytecodeViewer.viewer.viewPane1.getSelectedDecompiler();
-		bytecodeViewPanel2.decompiler = BytecodeViewer.viewer.viewPane2.getSelectedDecompiler();
-		bytecodeViewPanel3.decompiler = BytecodeViewer.viewer.viewPane3.getSelectedDecompiler();
-	}
-	
-	public boolean isPanel1Editable()
-	{
-		setPanes();
-		return BytecodeViewer.viewer.viewPane1.isPaneEditable();
-	}
-	
-	public boolean isPanel2Editable()
-	{
-		setPanes();
-		return BytecodeViewer.viewer.viewPane2.isPaneEditable();
-	}
-	
-	public boolean isPanel3Editable()
-	{
-		setPanes();
-		return BytecodeViewer.viewer.viewPane3.isPaneEditable();
-	}
-	
-	
-	public static void selectMethod(RSyntaxTextArea area, int methodLine)
-	{
-		if (methodLine != area.getCaretLineNumber())
-		{
-			setCaretLine(area, methodLine);
-			setViewLine(area, methodLine);
-		}
-	}
-	
-	public static void selectMethod(ClassViewer classViewer, int paneId, Method method)
-	{
-		RSyntaxTextArea area = null;
-		switch (paneId)
-		{
-			case 0:
-				area = classViewer.bytecodeViewPanel1.updateThread.updateUpdaterTextArea;
-				break;
-				
-			case 1:
-				area = classViewer.bytecodeViewPanel2.updateThread.updateUpdaterTextArea;
-				break;
-				
-			case 2:
-				area = classViewer.bytecodeViewPanel3.updateThread.updateUpdaterTextArea;
-				break;
-		}
-		
-		if (area != null)
-		{
-			MethodParser methods = classViewer.methods.get(paneId);
-			if (methods != null)
-			{
-				int methodLine = methods.findMethod(method);
-				
-				if (methodLine != -1)
-					selectMethod(area, methodLine);
-			}
-		}
-	}
-	
-	public static int getMaxViewLine(RSyntaxTextArea area)
-	{
-		Container parent = area.getParent();
-		
-		if (parent instanceof JViewport)
-		{
-			JViewport viewport = (JViewport) parent;
-			int y = viewport.getViewSize().height - viewport.getExtentSize().height;
-			int lineHeight = area.getLineHeight();
-			return y >= lineHeight ? y / lineHeight : 0;
-		}
-		
-		return 0;
-	}
-	
-	public static int getViewLine(RSyntaxTextArea area)
-	{
-		Container parent = area.getParent();
-		
-		if (parent instanceof JViewport)
-		{
-			JViewport viewport = (JViewport) parent;
-			Point point = viewport.getViewPosition();
-			int lineHeight = area.getLineHeight();
-			return point.y >= lineHeight ? point.y / lineHeight : 0;
-		}
-		
-		return 0;
-	}
-	
-	public static void setViewLine(RSyntaxTextArea area, int line)
-	{
-		Container parent = area.getParent();
-		
-		if (parent instanceof JViewport)
-		{
-			JViewport viewport = (JViewport) parent;
-			int maxLine = ClassViewer.getMaxViewLine(area);
-			line = Math.min(line, maxLine);
-			viewport.setViewPosition(new Point(0, line * area.getLineHeight()));
-		}
-	}
-	
-	public static void setCaretLine(RSyntaxTextArea area, int line)
-	{
-		try
-		{
-			area.setCaretPosition(area.getLineStartOffset(line));
-		}
-		catch (BadLocationException ignored)
-		{
-		}
-	}
-	
-	public void resetDivider()
-	{
-		SwingUtilities.invokeLater(() ->
-		{
-			sp.setResizeWeight(0.5);
-			
-			if (bytecodeViewPanel2.decompiler != Decompiler.NONE && bytecodeViewPanel1.decompiler != Decompiler.NONE)
-				setDividerLocation(sp, 0.5);
-			else if (bytecodeViewPanel1.decompiler != Decompiler.NONE)
-				setDividerLocation(sp, 1);
-			else if (bytecodeViewPanel2.decompiler != Decompiler.NONE)
-			{
-				sp.setResizeWeight(1);
-				setDividerLocation(sp, 0);
-			}
-			else
-				setDividerLocation(sp, 0);
-			
-			if (bytecodeViewPanel3.decompiler != Decompiler.NONE)
-			{
-				sp2.setResizeWeight(0.7);
-				setDividerLocation(sp2, 0.7);
-				if ((bytecodeViewPanel2.decompiler == Decompiler.NONE && bytecodeViewPanel1.decompiler != Decompiler.NONE) || (bytecodeViewPanel1.decompiler == Decompiler.NONE && bytecodeViewPanel2.decompiler != Decompiler.NONE))
-					setDividerLocation(sp2, 0.5);
-				else if (bytecodeViewPanel1.decompiler == Decompiler.NONE)
-					setDividerLocation(sp2, 0);
-			}
-			else
-			{
-				sp.setResizeWeight(1);
-				sp2.setResizeWeight(0);
-				setDividerLocation(sp2, 1);
-			}
-		});
-	}
-	
-	/**
-	 * Whoever wrote this function, THANK YOU!
-	 */
-	public static JSplitPane setDividerLocation(JSplitPane splitter, double proportion)
-	{
-		if (splitter.isShowing())
-		{
-			if (splitter.getWidth() > 0 && splitter.getHeight() > 0)
-				splitter.setDividerLocation(proportion);
-			else
-			{
-				splitter.addComponentListener(new ComponentAdapter()
-				{
-					@Override
-					public void componentResized(ComponentEvent ce)
-					{
-						splitter.removeComponentListener(this);
-						setDividerLocation(splitter, proportion);
-					}
-				});
-			}
-		}
-		else
-		{
-			splitter.addHierarchyListener(new HierarchyListener()
-			{
-				@Override
-				public void hierarchyChanged(HierarchyEvent e)
-				{
-					if ((e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED) != 0 && splitter.isShowing())
-					{
-						splitter.removeHierarchyListener(this);
-						setDividerLocation(splitter, proportion);
-					}
-				}
-			});
-		}
-		
-		return splitter;
-	}
-	
-	private static final long serialVersionUID = -8650495368920680024L;
+    public JSplitPane sp;
+    public JSplitPane sp2;
+    public BytecodeViewPanel bytecodeViewPanel1 = new BytecodeViewPanel(0, this);
+    public BytecodeViewPanel bytecodeViewPanel2 = new BytecodeViewPanel(1, this);
+    public BytecodeViewPanel bytecodeViewPanel3 = new BytecodeViewPanel(2, this);
+    public List<MethodParser> methods = Arrays.asList(new MethodParser(), new MethodParser(), new MethodParser());
+
+    public ClassViewer(ResourceContainer container, String name)
+    {
+        super(new Resource(name, container.getWorkingName(name), container));
+
+        this.setName(name);
+        this.setLayout(new BorderLayout());
+        this.sp = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, bytecodeViewPanel1, bytecodeViewPanel2);
+        this.sp2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, sp, bytecodeViewPanel3);
+        this.add(sp2, BorderLayout.CENTER);
+
+        this.addComponentListener(new ComponentAdapter()
+        {
+            @Override
+            public void componentResized(ComponentEvent e)
+            {
+                resetDivider();
+            }
+        });
+    }
+
+    @Override
+    public void refresh(JButton button)
+    {
+        setPanes();
+        refreshTitle();
+
+        bytecodeViewPanel1.createPane(this);
+        bytecodeViewPanel2.createPane(this);
+        bytecodeViewPanel3.createPane(this);
+
+        byte[] classBytes = getResourceBytes();
+
+        //TODO remove this once all of the importers have been properly updated to use a FileContainerImporter
+        if (classBytes == null || classBytes.length == 0 || Configuration.forceResourceUpdateFromClassNode)
+        {
+            //TODO remove this error message when all of the importers have been updated
+            // only APK and DEX are left
+            if (!Configuration.forceResourceUpdateFromClassNode)
+            {
+                System.err.println("WARNING: Class Resource imported using the old importer!");
+                System.err.println("TODO: Update it to use the FileContainerImporter");
+            }
+
+            classBytes = ASMUtil.nodeToBytes(resource.getResourceClassNode());
+        }
+
+        bytecodeViewPanel1.updatePane(this, classBytes, button, isPanel1Editable());
+        bytecodeViewPanel2.updatePane(this, classBytes, button, isPanel2Editable());
+        bytecodeViewPanel3.updatePane(this, classBytes, button, isPanel3Editable());
+
+        Thread dumpBuild = new Thread(() ->
+        {
+            BytecodeViewer.updateBusyStatus(true);
+
+            while (Configuration.currentlyDumping)
+            {
+                //wait until it's not dumping
+                try
+                {
+                    Thread.sleep(100);
+                } catch (InterruptedException e)
+                {
+                    e.printStackTrace();
+                }
+            }
+
+            BytecodeViewer.updateBusyStatus(false);
+
+            if (bytecodeViewPanel1.decompiler != Decompiler.NONE)
+                bytecodeViewPanel1.updateThread.startNewThread();
+
+            if (bytecodeViewPanel2.decompiler != Decompiler.NONE)
+                bytecodeViewPanel2.updateThread.startNewThread();
+
+            if (bytecodeViewPanel3.decompiler != Decompiler.NONE)
+                bytecodeViewPanel3.updateThread.startNewThread();
+        }, "ClassViewer Temp Dump");
+
+        dumpBuild.start();
+
+        if (isPanel1Editable() || isPanel2Editable() || isPanel3Editable())
+        {
+            if (Configuration.warnForEditing)
+                return;
+
+            Configuration.warnForEditing = true;
+
+            if (!BytecodeViewer.viewer.autoCompileOnRefresh.isSelected() && !BytecodeViewer.viewer.compileOnSave.isSelected())
+            {
+                BytecodeViewer.showMessage("Make sure to compile (File>Compile or Ctrl + T) whenever you want to " + "test or export your changes.\nYou can set compile automatically on refresh or on save " + "in the settings menu.");
+
+                SettingsSerializer.saveSettingsAsync();
+            }
+        }
+    }
+
+    public void setPanes()
+    {
+        bytecodeViewPanel1.decompiler = BytecodeViewer.viewer.viewPane1.getSelectedDecompiler();
+        bytecodeViewPanel2.decompiler = BytecodeViewer.viewer.viewPane2.getSelectedDecompiler();
+        bytecodeViewPanel3.decompiler = BytecodeViewer.viewer.viewPane3.getSelectedDecompiler();
+    }
+
+    public boolean isPanel1Editable()
+    {
+        setPanes();
+        return BytecodeViewer.viewer.viewPane1.isPaneEditable();
+    }
+
+    public boolean isPanel2Editable()
+    {
+        setPanes();
+        return BytecodeViewer.viewer.viewPane2.isPaneEditable();
+    }
+
+    public boolean isPanel3Editable()
+    {
+        setPanes();
+        return BytecodeViewer.viewer.viewPane3.isPaneEditable();
+    }
+
+    public BytecodeViewPanel getPanel(int index)
+    {
+        switch (index)
+        {
+            case 0:
+                return bytecodeViewPanel1;
+            case 1:
+                return bytecodeViewPanel2;
+            case 2:
+                return bytecodeViewPanel3;
+        }
+
+        return null;
+    }
+
+
+    public static void selectMethod(RSyntaxTextArea area, int methodLine)
+    {
+        if (methodLine != area.getCaretLineNumber())
+        {
+            setCaretLine(area, methodLine);
+            setViewLine(area, methodLine);
+        }
+    }
+
+    public static void selectMethod(ClassViewer classViewer, int paneId, Method method)
+    {
+        RSyntaxTextArea area = null;
+        switch (paneId)
+        {
+            case 0:
+                area = classViewer.bytecodeViewPanel1.updateThread.updateUpdaterTextArea;
+                break;
+
+            case 1:
+                area = classViewer.bytecodeViewPanel2.updateThread.updateUpdaterTextArea;
+                break;
+
+            case 2:
+                area = classViewer.bytecodeViewPanel3.updateThread.updateUpdaterTextArea;
+                break;
+        }
+
+        if (area != null)
+        {
+            MethodParser methods = classViewer.methods.get(paneId);
+            if (methods != null)
+            {
+                int methodLine = methods.findMethod(method);
+
+                if (methodLine != -1)
+                    selectMethod(area, methodLine);
+            }
+        }
+    }
+
+    public static int getMaxViewLine(RSyntaxTextArea area)
+    {
+        Container parent = area.getParent();
+
+        if (parent instanceof JViewport)
+        {
+            JViewport viewport = (JViewport) parent;
+            int y = viewport.getViewSize().height - viewport.getExtentSize().height;
+            int lineHeight = area.getLineHeight();
+            return y >= lineHeight ? y / lineHeight : 0;
+        }
+
+        return 0;
+    }
+
+    public static int getViewLine(RSyntaxTextArea area)
+    {
+        Container parent = area.getParent();
+
+        if (parent instanceof JViewport)
+        {
+            JViewport viewport = (JViewport) parent;
+            Point point = viewport.getViewPosition();
+            int lineHeight = area.getLineHeight();
+            return point.y >= lineHeight ? point.y / lineHeight : 0;
+        }
+
+        return 0;
+    }
+
+    public static void setViewLine(RSyntaxTextArea area, int line)
+    {
+        Container parent = area.getParent();
+
+        if (parent instanceof JViewport)
+        {
+            JViewport viewport = (JViewport) parent;
+            int maxLine = ClassViewer.getMaxViewLine(area);
+            line = Math.min(line, maxLine);
+            viewport.setViewPosition(new Point(0, line * area.getLineHeight()));
+        }
+    }
+
+    public static void setCaretLine(RSyntaxTextArea area, int line)
+    {
+        try
+        {
+            area.setCaretPosition(area.getLineStartOffset(line));
+        } catch (BadLocationException ignored)
+        {
+        }
+    }
+
+    public void resetDivider()
+    {
+        SwingUtilities.invokeLater(() ->
+        {
+            sp.setResizeWeight(0.5);
+
+            if (bytecodeViewPanel2.decompiler != Decompiler.NONE && bytecodeViewPanel1.decompiler != Decompiler.NONE)
+                setDividerLocation(sp, 0.5);
+            else if (bytecodeViewPanel1.decompiler != Decompiler.NONE)
+                setDividerLocation(sp, 1);
+            else if (bytecodeViewPanel2.decompiler != Decompiler.NONE)
+            {
+                sp.setResizeWeight(1);
+                setDividerLocation(sp, 0);
+            } else
+                setDividerLocation(sp, 0);
+
+            if (bytecodeViewPanel3.decompiler != Decompiler.NONE)
+            {
+                sp2.setResizeWeight(0.7);
+                setDividerLocation(sp2, 0.7);
+                if ((bytecodeViewPanel2.decompiler == Decompiler.NONE && bytecodeViewPanel1.decompiler != Decompiler.NONE) || (bytecodeViewPanel1.decompiler == Decompiler.NONE && bytecodeViewPanel2.decompiler != Decompiler.NONE))
+                    setDividerLocation(sp2, 0.5);
+                else if (bytecodeViewPanel1.decompiler == Decompiler.NONE)
+                    setDividerLocation(sp2, 0);
+            } else
+            {
+                sp.setResizeWeight(1);
+                sp2.setResizeWeight(0);
+                setDividerLocation(sp2, 1);
+            }
+        });
+    }
+
+    /**
+     * Whoever wrote this function, THANK YOU!
+     */
+    public static JSplitPane setDividerLocation(JSplitPane splitter, double proportion)
+    {
+        if (splitter.isShowing())
+        {
+            if (splitter.getWidth() > 0 && splitter.getHeight() > 0)
+                splitter.setDividerLocation(proportion);
+            else
+            {
+                splitter.addComponentListener(new ComponentAdapter()
+                {
+                    @Override
+                    public void componentResized(ComponentEvent ce)
+                    {
+                        splitter.removeComponentListener(this);
+                        setDividerLocation(splitter, proportion);
+                    }
+                });
+            }
+        } else
+        {
+            splitter.addHierarchyListener(new HierarchyListener()
+            {
+                @Override
+                public void hierarchyChanged(HierarchyEvent e)
+                {
+                    if ((e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED) != 0 && splitter.isShowing())
+                    {
+                        splitter.removeHierarchyListener(this);
+                        setDividerLocation(splitter, proportion);
+                    }
+                }
+            });
+        }
+
+        return splitter;
+    }
+
+    private static final long serialVersionUID = -8650495368920680024L;
 }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
index b22fd95b6..2aaa80e94 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
@@ -72,6 +72,8 @@ public class BytecodeViewPanelUpdater implements Runnable
     private final JButton button;
     private final byte[] classBytes;
 
+    public MarkerCaretListener markerCaretListener;
+    private MyErrorStripe errorStripe;
     public SearchableRSyntaxTextArea updateUpdaterTextArea;
     public JComboBox<Integer> methodsList;
     public boolean isPanelEditable;
@@ -118,7 +120,7 @@ public void processDisplay()
                     if (!container.hasBeenParsed)
                     {
                         container.parse();
-                        viewer.classFiles.put(viewer.resource.workingName + "-" + decompiler.getDecompilerName(), container);
+                        BytecodeViewer.viewer.workPane.classFiles.put(viewer.resource.workingName + "-" + decompiler.getDecompilerName(), container);
                         container.hasBeenParsed = true;
                     }
 
@@ -399,9 +401,6 @@ public void buildTextArea(Decompiler decompiler, String decompiledSource)
         bytecodeViewPanel.textArea = updateUpdaterTextArea;
 
         bytecodeViewPanel.textArea.setMarkOccurrencesColor(Color.ORANGE);
-        bytecodeViewPanel.textArea.setCursor(new Cursor(Cursor.TEXT_CURSOR));
-        bytecodeViewPanel.textArea.getCaret().setVisible(true);
-        bytecodeViewPanel.textArea.getCaret().setBlinkRate(0);
         bytecodeViewPanel.textArea.setHighlighter(new RSyntaxTextAreaHighlighterEx());
 
         if (bytecodeViewPanel.decompiler != Decompiler.BYTECODE_DISASSEMBLER)
@@ -426,26 +425,19 @@ else if (isPanelEditable && decompiler == Decompiler.KRAKATAU_DISASSEMBLER)
         String editable = isPanelEditable ? " - " + EDITABLE : "";
         bytecodeViewPanel.textArea.getTextAreaSearchPanel().getTitleHeader().setText(decompiler.getDecompilerName() + editable);
 
-        MyErrorStripe errorStripe = new MyErrorStripe(bytecodeViewPanel.textArea);
+        errorStripe = new MyErrorStripe(bytecodeViewPanel.textArea);
         bytecodeViewPanel.add(errorStripe, BorderLayout.LINE_END);
 
         bytecodeViewPanel.revalidate();
         bytecodeViewPanel.repaint();
 
         String classContainerName = viewer.resource.workingName + "-" + decompiler.getDecompilerName();
-        ClassFileContainer classFileContainer = viewer.classFiles.get(classContainerName);
+        ClassFileContainer classFileContainer = BytecodeViewer.viewer.workPane.classFiles.get(classContainerName);
         bytecodeViewPanel.textArea.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_B, InputEvent.CTRL_DOWN_MASK), "goToAction");
         bytecodeViewPanel.textArea.getActionMap().put("goToAction", new GoToAction(classFileContainer));
 
-        bytecodeViewPanel.textArea.addCaretListener(e -> {
-            if (bytecodeViewPanel.textArea.isFocusOwner())
-            {
-                RSyntaxTextAreaHighlighterEx highlighterEx = (RSyntaxTextAreaHighlighterEx) bytecodeViewPanel.textArea.getHighlighter();
-                highlighterEx.clearMarkOccurrencesHighlights();
-                RSyntaxTextArea textArea = (RSyntaxTextArea) e.getSource();
-                markOccurrences(textArea, viewer.classFiles.get(classContainerName), errorStripe);
-            }
-        });
+        markerCaretListener = new MarkerCaretListener(classContainerName);
+        bytecodeViewPanel.textArea.addCaretListener(markerCaretListener);
     }
 
     private void markOccurrences(RSyntaxTextArea textArea, ClassFileContainer classFileContainer, MyErrorStripe errorStripe)
@@ -627,4 +619,24 @@ startOffset, endOffset, new SmartHighlightPainter()
             }
         }));
     }
+
+    public class MarkerCaretListener implements CaretListener
+    {
+
+        private final String classContainerName;
+
+        public MarkerCaretListener(String classContainerName)
+        {
+            this.classContainerName = classContainerName;
+        }
+
+        @Override
+        public void caretUpdate(CaretEvent e)
+        {
+            SearchableRSyntaxTextArea textArea = (SearchableRSyntaxTextArea) e.getSource();
+            RSyntaxTextAreaHighlighterEx highlighterEx = (RSyntaxTextAreaHighlighterEx) bytecodeViewPanel.textArea.getHighlighter();
+            highlighterEx.clearMarkOccurrencesHighlights();
+            markOccurrences(textArea, BytecodeViewer.viewer.workPane.classFiles.get(classContainerName), errorStripe);
+        }
+    }
 }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
index 6a9d338b8..7413dbd99 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
@@ -57,6 +57,10 @@ public String getName() {
 		return this.className.substring(this.className.lastIndexOf('.') + 1);
 	}
 
+	public String getDecompiler() {
+		return getName().substring(6);
+	}
+
 	public String getParentContainer()
 	{
 		return this.parentContainer;
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
index 2bc3cfeed..04ccfb5e8 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
@@ -1312,6 +1312,12 @@ public void visit(ConditionalExpr n, Object arg)
         }
     }
 
+    /**
+     * Visit all {@link LambdaExpr}'s.
+     *
+     * @param n The current {@code LambdaExpr}
+     * @param arg Don't worry about it.
+     */
     @Override
     public void visit(LambdaExpr n, Object arg)
     {
@@ -1337,6 +1343,27 @@ public void visit(LambdaExpr n, Object arg)
         }
     }
 
+    /**
+     * Visit all {@link EnumDeclaration}'s.
+     *
+     * @param n   The current {@code EnumDeclaration}
+     * @param arg Don't worry about it.
+     */
+    @Override
+    public void visit(EnumDeclaration n, Object arg)
+    {
+        super.visit(n, arg);
+        n.getEntries().forEach(entry -> {
+            SimpleName simpleName = entry.getName();
+            String name = simpleName.getIdentifier();
+            Range range = simpleName.getRange().get();
+            int line = range.begin.line;
+            int columnStart = range.begin.column;
+            int columnEnd = range.end.column;
+            this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "declaration", line, columnStart, columnEnd + 1));
+        });
+    }
+
     /**
      * Look through the {@link CompilationUnit} for the specific statement within its methods.
      *

From 00319e953769a3d028a173ac5ef6586456078393 Mon Sep 17 00:00:00 2001
From: Cody <6558800+Bl3nd@users.noreply.github.com>
Date: Wed, 18 Sep 2024 20:26:39 -0600
Subject: [PATCH 08/11] Add a little documentation and rename a few variables
 for clarity.

---
 .../gui/components/actions/GoToAction.java    |  17 +-
 .../classcontainer/ClassFileContainer.java    | 194 +++++++++---------
 .../classcontainer/parser/MyVoidVisitor.java  |   4 +-
 3 files changed, 116 insertions(+), 99 deletions(-)

diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java
index 8fafc209c..a71e625cd 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java
@@ -17,6 +17,8 @@
 import java.util.HashMap;
 
 /**
+ * This action is triggered by a user typing (CTRL+B). This goes to a specific variables declaration whether it be in the opened class, or a class within the jar.
+ * <p>
  * Created by Bl3nd.
  * Date: 9/7/2024
  */
@@ -98,14 +100,20 @@ public void actionPerformed(ActionEvent e)
         }));
     }
 
+    /**
+     * Open a class that contains the declaration of a field.
+     *
+     * @param field    The field to jump to
+     * @param textArea The text area of the current class (not the class we are opening)
+     */
     private void openFieldClass(ClassFieldLocation field, RSyntaxTextArea textArea)
     {
         String token = textArea.modelToToken(textArea.getCaretPosition()).getLexeme();
         ResourceContainer resourceContainer = BytecodeViewer.getFileContainer(container.getParentContainer());
         if (resourceContainer != null)
         {
-            String s = container.getImport(field.owner);
-            BytecodeViewer.viewer.workPane.addClassResource(resourceContainer, s + ".class");
+            String className = container.getImport(field.owner);
+            BytecodeViewer.viewer.workPane.addClassResource(resourceContainer, className + ".class");
             ClassViewer activeResource = (ClassViewer) BytecodeViewer.viewer.workPane.getActiveResource();
             HashMap<String, ClassFileContainer> classFiles = BytecodeViewer.viewer.workPane.classFiles;
             Thread thread = new Thread(() -> {
@@ -121,8 +129,8 @@ private void openFieldClass(ClassFieldLocation field, RSyntaxTextArea textArea)
                     BytecodeViewer.updateBusyStatus(false);
                 }
 
-                String s2 = activeResource.resource.workingName + "-" + this.container.getDecompiler();
-                ClassFileContainer classFileContainer = classFiles.get(s2);
+                String containerName = activeResource.resource.workingName + "-" + this.container.getDecompiler();
+                ClassFileContainer classFileContainer = classFiles.get(containerName);
                 classFileContainer.fieldMembers.forEach((field1, field2) -> {
                     if (field1.equals(token))
                     {
@@ -162,7 +170,6 @@ public int getMark()
                                             }
 
                                             panel.textArea.requestFocusInWindow();
-
                                             break;
                                         }
                                     }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
index 7413dbd99..9c53c137c 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
@@ -17,102 +17,110 @@
 import java.util.TreeMap;
 
 /**
+ * This is a container for a specific class. The container name is based on the actual class name and the decompiler used.
+ * <p>
  * Created by Bl3nd.
  * Date: 8/26/2024
  */
 public class ClassFileContainer
 {
-	public transient NavigableMap<String, ArrayList<ClassFieldLocation>> fieldMembers = new TreeMap<>();
-	public transient NavigableMap<String, ArrayList<ClassParameterLocation>> methodParameterMembers = new TreeMap<>();
-	public transient NavigableMap<String, ArrayList<ClassLocalVariableLocation>> methodLocalMembers = new TreeMap<>();
-	public transient NavigableMap<String, ArrayList<ClassMethodLocation>> methodMembers = new TreeMap<>();
-	public transient NavigableMap<String, String> imports = new TreeMap<>();
-
-	public boolean hasBeenParsed = false;
-	public final String className;
-	private final String content;
-	private final String parentContainer;
-
-	public ClassFileContainer(String className, String content, String parentContainer)
-	{
-		this.className = className;
-		this.content = content;
-		this.parentContainer = parentContainer;
-	}
-
-	public void parse()
-	{
-		try
-		{
-			StaticJavaParser.getParserConfiguration().setSymbolResolver(new JavaSymbolSolver(new ReflectionTypeSolver()));
-			CompilationUnit compilationUnit = StaticJavaParser.parse(this.content);
-			compilationUnit.accept(new MyVoidVisitor(this, compilationUnit), null);
-		} catch (ParseProblemException e)
-		{
-			System.err.println("Parsing error!");
-		}
-	}
-
-	public String getName() {
-		return this.className.substring(this.className.lastIndexOf('.') + 1);
-	}
-
-	public String getDecompiler() {
-		return getName().substring(6);
-	}
-
-	public String getParentContainer()
-	{
-		return this.parentContainer;
-	}
-
-	public void putField(String key, ClassFieldLocation value)
-	{
-		this.fieldMembers.computeIfAbsent(key, v -> new ArrayList<>()).add(value);
-	}
-
-	public List<ClassFieldLocation> getFieldLocationsFor(String fieldName)
-	{
-		return fieldMembers.getOrDefault(fieldName, new ArrayList<>());
-	}
-
-	public void putParameter(String key, ClassParameterLocation value)
-	{
-		this.methodParameterMembers.computeIfAbsent(key, v -> new ArrayList<>()).add(value);
-	}
-
-	public List<ClassParameterLocation> getParameterLocationsFor(String key)
-	{
-		return methodParameterMembers.getOrDefault(key, new ArrayList<>());
-	}
-
-	public void putLocalVariable(String key, ClassLocalVariableLocation value)
-	{
-		this.methodLocalMembers.computeIfAbsent(key, v -> new ArrayList<>()).add(value);
-	}
-
-	public List<ClassLocalVariableLocation> getLocalLocationsFor(String key)
-	{
-		return methodLocalMembers.getOrDefault(key, new ArrayList<>());
-	}
-
-	public void putMethod(String key, ClassMethodLocation value)
-	{
-		this.methodMembers.computeIfAbsent(key, v -> new ArrayList<>()).add(value);
-	}
-
-	public List<ClassMethodLocation> getMethodLocationsFor(String key)
-	{
-		return methodMembers.getOrDefault(key, new ArrayList<>());
-	}
-
-	public void putImport(String key, String value)
-	{
-		this.imports.put(key, value);
-	}
-
-	public String getImport(String key) {
-		String value = this.imports.get(key);
-		return value + "/" + key;
-	}
+    public transient NavigableMap<String, ArrayList<ClassFieldLocation>> fieldMembers = new TreeMap<>();
+    public transient NavigableMap<String, ArrayList<ClassParameterLocation>> methodParameterMembers = new TreeMap<>();
+    public transient NavigableMap<String, ArrayList<ClassLocalVariableLocation>> methodLocalMembers = new TreeMap<>();
+    public transient NavigableMap<String, ArrayList<ClassMethodLocation>> methodMembers = new TreeMap<>();
+    public transient NavigableMap<String, String> imports = new TreeMap<>();
+
+    public boolean hasBeenParsed = false;
+    public final String className;
+    private final String content;
+    private final String parentContainer;
+
+    public ClassFileContainer(String className, String content, String parentContainer)
+    {
+        this.className = className;
+        this.content = content;
+        this.parentContainer = parentContainer;
+    }
+
+    /**
+     * Parse the class content with JavaParser.
+     */
+    public void parse()
+    {
+        try
+        {
+            StaticJavaParser.getParserConfiguration().setSymbolResolver(new JavaSymbolSolver(new ReflectionTypeSolver()));
+            CompilationUnit compilationUnit = StaticJavaParser.parse(this.content);
+            compilationUnit.accept(new MyVoidVisitor(this, compilationUnit), null);
+        } catch (ParseProblemException e)
+        {
+            System.err.println("Parsing error!");
+        }
+    }
+
+    public String getName()
+    {
+        return this.className.substring(this.className.lastIndexOf('.') + 1);
+    }
+
+    public String getDecompiler()
+    {
+        return getName().substring(6);
+    }
+
+    public String getParentContainer()
+    {
+        return this.parentContainer;
+    }
+
+    public void putField(String key, ClassFieldLocation value)
+    {
+        this.fieldMembers.computeIfAbsent(key, v -> new ArrayList<>()).add(value);
+    }
+
+    public List<ClassFieldLocation> getFieldLocationsFor(String fieldName)
+    {
+        return fieldMembers.getOrDefault(fieldName, new ArrayList<>());
+    }
+
+    public void putParameter(String key, ClassParameterLocation value)
+    {
+        this.methodParameterMembers.computeIfAbsent(key, v -> new ArrayList<>()).add(value);
+    }
+
+    public List<ClassParameterLocation> getParameterLocationsFor(String key)
+    {
+        return methodParameterMembers.getOrDefault(key, new ArrayList<>());
+    }
+
+    public void putLocalVariable(String key, ClassLocalVariableLocation value)
+    {
+        this.methodLocalMembers.computeIfAbsent(key, v -> new ArrayList<>()).add(value);
+    }
+
+    public List<ClassLocalVariableLocation> getLocalLocationsFor(String key)
+    {
+        return methodLocalMembers.getOrDefault(key, new ArrayList<>());
+    }
+
+    public void putMethod(String key, ClassMethodLocation value)
+    {
+        this.methodMembers.computeIfAbsent(key, v -> new ArrayList<>()).add(value);
+    }
+
+    public List<ClassMethodLocation> getMethodLocationsFor(String key)
+    {
+        return methodMembers.getOrDefault(key, new ArrayList<>());
+    }
+
+    public void putImport(String key, String value)
+    {
+        this.imports.put(key, value);
+    }
+
+    public String getImport(String key)
+    {
+        String value = this.imports.get(key);
+        return value + "/" + key;
+    }
 }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
index 04ccfb5e8..ed4c6c242 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
@@ -20,6 +20,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
+ * Our custom visitor that allows us to get the information from JavaParser we need.
+ * <p>
  * Created by Bl3nd.
  * Date: 9/5/2024
  */
@@ -1315,7 +1317,7 @@ public void visit(ConditionalExpr n, Object arg)
     /**
      * Visit all {@link LambdaExpr}'s.
      *
-     * @param n The current {@code LambdaExpr}
+     * @param n   The current {@code LambdaExpr}
      * @param arg Don't worry about it.
      */
     @Override

From 7b7f8976eae47aa61694615e00b04958fa273de8 Mon Sep 17 00:00:00 2001
From: Cody <6558800+Bl3nd@users.noreply.github.com>
Date: Wed, 18 Sep 2024 22:28:13 -0600
Subject: [PATCH 09/11] Bug: Fixed imports with '.*'. - Also added a resolver
 to help resolve classes within the jar.

---
 .../gui/util/BytecodeViewPanelUpdater.java    |  2 +-
 .../classcontainer/ClassFileContainer.java    | 17 +++++++++---
 .../classcontainer/parser/MyVoidVisitor.java  | 27 ++++++++++---------
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
index 2aaa80e94..9d59d87ed 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
@@ -116,7 +116,7 @@ public void processDisplay()
                     //perform decompiling inside of this thread
                     final String decompiledSource = decompiler.getDecompiler().decompileClassNode(viewer.resource.getResourceClassNode(), classBytes);
 
-                    ClassFileContainer container = new ClassFileContainer(viewer.resource.workingName + "-" + decompiler.getDecompilerName(), decompiledSource, viewer.resource.container.name);
+                    ClassFileContainer container = new ClassFileContainer(viewer.resource.workingName + "-" + decompiler.getDecompilerName(), decompiledSource, viewer.resource.container);
                     if (!container.hasBeenParsed)
                     {
                         container.parse();
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
index 9c53c137c..78265f241 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
@@ -3,14 +3,19 @@
 import com.github.javaparser.ParseProblemException;
 import com.github.javaparser.StaticJavaParser;
 import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.resolution.TypeSolver;
 import com.github.javaparser.symbolsolver.JavaSymbolSolver;
+import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
+import com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver;
 import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
+import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassFieldLocation;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassLocalVariableLocation;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassMethodLocation;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassParameterLocation;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.parser.MyVoidVisitor;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NavigableMap;
@@ -34,12 +39,14 @@ public class ClassFileContainer
     public final String className;
     private final String content;
     private final String parentContainer;
+    private final String path;
 
-    public ClassFileContainer(String className, String content, String parentContainer)
+    public ClassFileContainer(String className, String content, ResourceContainer resourceContainer)
     {
         this.className = className;
         this.content = content;
-        this.parentContainer = parentContainer;
+        this.parentContainer = resourceContainer.name;
+        this.path = resourceContainer.file.getAbsolutePath();
     }
 
     /**
@@ -49,12 +56,16 @@ public void parse()
     {
         try
         {
-            StaticJavaParser.getParserConfiguration().setSymbolResolver(new JavaSymbolSolver(new ReflectionTypeSolver()));
+            TypeSolver typeSolver = new CombinedTypeSolver(new ReflectionTypeSolver(), new JarTypeSolver(path));
+            StaticJavaParser.getParserConfiguration().setSymbolResolver(new JavaSymbolSolver(typeSolver));
             CompilationUnit compilationUnit = StaticJavaParser.parse(this.content);
             compilationUnit.accept(new MyVoidVisitor(this, compilationUnit), null);
         } catch (ParseProblemException e)
         {
             System.err.println("Parsing error!");
+        } catch (IOException e)
+        {
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
index ed4c6c242..99b6dfba1 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
@@ -6,10 +6,10 @@
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.stmt.*;
-import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
 import com.github.javaparser.resolution.UnsolvedSymbolException;
 import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
+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.ClassLocalVariableLocation;
@@ -75,11 +75,14 @@ public void visit(FieldDeclaration n, Object arg)
     public void visit(ImportDeclaration n, Object arg)
     {
         super.visit(n, arg);
-        Name class_ = n.getName();
-        String className = class_.getIdentifier();
-        String package_ = Objects.requireNonNull(class_.getQualifier().orElse(null)).asString();
-        package_ = package_.replace('.', '/');
-        this.classFileContainer.putImport(className, package_);
+        if (!n.isAsterisk())
+        {
+            Name class_ = n.getName();
+            String className = class_.getIdentifier();
+            String package_ = Objects.requireNonNull(class_.getQualifier().orElse(null)).asString();
+            package_ = package_.replace('.', '/');
+            this.classFileContainer.putImport(className, package_);
+        }
     }
 
     /**
@@ -137,6 +140,11 @@ public void visit(FieldAccessExpr n, Object arg)
                         }
                     } catch (UnsolvedSymbolException ignore)
                     {
+                        ResolvedType resolvedType = n.getSymbolResolver().calculateType(nameExpr);
+                        String qualifiedName = resolvedType.asReferenceType().getQualifiedName();
+                        String className = qualifiedName.substring(qualifiedName.lastIndexOf('.') + 1);
+                        String packageName = qualifiedName.substring(0, qualifiedName.lastIndexOf('.'));
+                        this.classFileContainer.putImport(className, packageName.replace('.', '/'));
                         this.classFileContainer.putField(fieldName, new ClassFieldLocation(name1, "reference", line, columnStart, columnEnd + 1));
                     }
                 }
@@ -144,13 +152,6 @@ public void visit(FieldAccessExpr n, Object arg)
         }
     }
 
-    @Override
-    public void visit(ClassOrInterfaceType n, Object arg)
-    {
-        super.visit(n, arg);
-//        System.err.println(n.getName().getIdentifier());
-    }
-
     /**
      * Visit all {@link ConstructorDeclaration}s.
      * <p>

From 9a08a5f100ad70455ea0d1631d992a897f055c4f Mon Sep 17 00:00:00 2001
From: Cody <6558800+Bl3nd@users.noreply.github.com>
Date: Sat, 21 Sep 2024 23:15:58 -0600
Subject: [PATCH 10/11] Token parsing updates.

- Fixed a few bugs
- Added methods and classes (highlighting and go-to)
---
 .../gui/components/actions/GoToAction.java    | 295 ++++++++++++++----
 .../gui/util/BytecodeViewPanelUpdater.java    | 150 +++++----
 .../classcontainer/ClassFileContainer.java    |  38 ++-
 .../locations/ClassMethodLocation.java        |   4 +-
 .../locations/ClassReferenceLocation.java     |  33 ++
 .../classcontainer/parser/MyVoidVisitor.java  | 208 +++++++-----
 .../classcontainer/parser/TokenUtil.java      |   1 +
 7 files changed, 500 insertions(+), 229 deletions(-)
 create mode 100644 src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassReferenceLocation.java

diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java
index a71e625cd..75f0198e1 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java
@@ -1,6 +1,7 @@
 package the.bytecode.club.bytecodeviewer.gui.components.actions;
 
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+import org.fife.ui.rsyntaxtextarea.Token;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.BytecodeViewPanel;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ClassViewer;
@@ -8,6 +9,9 @@
 import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
 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.ClassMethodLocation;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassReferenceLocation;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.parser.TokenUtil;
 
 import javax.swing.*;
 import javax.swing.event.CaretEvent;
@@ -45,7 +49,7 @@ public void actionPerformed(ActionEvent e)
                 // Open the class that is associated with the field's owner.
                 if (!field.owner.equals(container.getName()))
                 {
-                    openFieldClass(field, textArea);
+                    open(textArea, false, true, false);
                     return;
                 }
 
@@ -98,88 +102,247 @@ public void actionPerformed(ActionEvent e)
                 }
             }
         }));
+
+        container.methodMembers.values().forEach(methods -> methods.forEach(method -> {
+            if (method.line == line && method.columnStart - 1 <= column && method.columnEnd >= column)
+            {
+                Element root = textArea.getDocument().getDefaultRootElement();
+                if (method.decRef.equalsIgnoreCase("declaration"))
+                {
+                    int startOffset = root.getElement(method.line - 1).getStartOffset() + (method.columnStart - 1);
+                    textArea.setCaretPosition(startOffset);
+                } else
+                {
+                    methods.stream().filter(classMethodLocation -> classMethodLocation.owner.equals(method.owner)).forEach(classMethodLocation -> {
+                        if (classMethodLocation.decRef.equalsIgnoreCase("declaration"))
+                        {
+                            int startOffset = root.getElement(classMethodLocation.line - 1).getStartOffset() + (classMethodLocation.columnStart - 1);
+                            textArea.setCaretPosition(startOffset);
+                        }
+                    });
+
+
+                    open(textArea, false, false, true);
+                }
+            }
+        }));
+
+        container.classReferences.values().forEach(classes -> classes.forEach(clazz -> {
+            String name;
+            if (clazz.line == line && clazz.columnStart - 1 <= column && clazz.columnEnd - 1 >= column)
+            {
+                name = clazz.owner;
+                Element root = textArea.getDocument().getDefaultRootElement();
+                if (clazz.type.equals("declaration"))
+                {
+                    int startOffset = root.getElement(clazz.line - 1).getStartOffset() + (clazz.columnStart - 1);
+                    textArea.setCaretPosition(startOffset);
+                } else
+                {
+                    classes.stream().filter(classReferenceLocation -> classReferenceLocation.owner.equals(name)).forEach(classReferenceLocation -> {
+                        if (classReferenceLocation.type.equals("declaration"))
+                        {
+                            int startOffset = root.getElement(classReferenceLocation.line - 1).getStartOffset() + (classReferenceLocation.columnStart - 1);
+                            textArea.setCaretPosition(startOffset);
+                        }
+                    });
+
+                    // Should not really do anything when the class is already open
+                    open(textArea, true, false, false);
+                }
+            }
+        }));
     }
 
-    /**
-     * Open a class that contains the declaration of a field.
-     *
-     * @param field    The field to jump to
-     * @param textArea The text area of the current class (not the class we are opening)
-     */
-    private void openFieldClass(ClassFieldLocation field, RSyntaxTextArea textArea)
+    private ClassFileContainer openClass(String lexeme, boolean field, boolean method)
     {
-        String token = textArea.modelToToken(textArea.getCaretPosition()).getLexeme();
+        if (lexeme.equals(container.getName()))
+            return null;
+
         ResourceContainer resourceContainer = BytecodeViewer.getFileContainer(container.getParentContainer());
-        if (resourceContainer != null)
+        if (resourceContainer == null)
+            return null;
+
+        if (field)
         {
-            String className = container.getImport(field.owner);
+            String className = container.getClassForField(lexeme);
             BytecodeViewer.viewer.workPane.addClassResource(resourceContainer, className + ".class");
             ClassViewer activeResource = (ClassViewer) BytecodeViewer.viewer.workPane.getActiveResource();
             HashMap<String, ClassFileContainer> classFiles = BytecodeViewer.viewer.workPane.classFiles;
-            Thread thread = new Thread(() -> {
-                try
-                {
-                    BytecodeViewer.updateBusyStatus(true);
-                    Thread.sleep(1000);
-                } catch (InterruptedException e)
-                {
-                    throw new RuntimeException(e);
-                } finally
-                {
-                    BytecodeViewer.updateBusyStatus(false);
-                }
+            return wait(classFiles, activeResource);
+        } else if (method)
+        {
+            ClassMethodLocation classMethodLocation = container.getMethodLocationsFor(lexeme).get(0);
+            ClassReferenceLocation classReferenceLocation = null;
+            try
+            {
+                classReferenceLocation = container.getClassReferenceLocationsFor(classMethodLocation.owner).get(0);
+            } catch (Exception ignored)
+            {
+            }
 
-                String containerName = activeResource.resource.workingName + "-" + this.container.getDecompiler();
-                ClassFileContainer classFileContainer = classFiles.get(containerName);
-                classFileContainer.fieldMembers.forEach((field1, field2) -> {
-                    if (field1.equals(token))
+            if (classReferenceLocation == null)
+                return null;
+
+            String packagePath = classReferenceLocation.packagePath;
+            if (packagePath.startsWith("java") || packagePath.startsWith("javax") || packagePath.startsWith("com.sun"))
+                return null;
+
+            String resourceName = packagePath + "/" + classMethodLocation.owner;
+            if (resourceContainer.resourceClasses.containsKey(resourceName))
+            {
+                BytecodeViewer.viewer.workPane.addClassResource(resourceContainer, resourceName + ".class");
+                ClassViewer activeResource = (ClassViewer) BytecodeViewer.viewer.workPane.getActiveResource();
+                HashMap<String, ClassFileContainer> classFiles = BytecodeViewer.viewer.workPane.classFiles;
+                return wait(classFiles, activeResource);
+            }
+        } else
+        {
+            ClassReferenceLocation classReferenceLocation = container.getClassReferenceLocationsFor(lexeme).get(0);
+            String packagePath = classReferenceLocation.packagePath;
+            if (packagePath.startsWith("java") || packagePath.startsWith("javax") || packagePath.startsWith("com.sun"))
+                return null;
+
+            String resourceName = packagePath + "/" + lexeme;
+            if (resourceContainer.resourceClasses.containsKey(resourceName))
+            {
+                BytecodeViewer.viewer.workPane.addClassResource(resourceContainer, resourceName + ".class");
+                ClassViewer activeResource = (ClassViewer) BytecodeViewer.viewer.workPane.getActiveResource();
+                HashMap<String, ClassFileContainer> classFiles = BytecodeViewer.viewer.workPane.classFiles;
+                return wait(classFiles, activeResource);
+            }
+        }
+
+        return null;
+    }
+
+    private void open(RSyntaxTextArea textArea, boolean isClass, boolean isField, boolean isMethod)
+    {
+        Thread thread = new Thread(() -> {
+            Token token = textArea.modelToToken(textArea.getCaretPosition());
+            token = TokenUtil.getToken(textArea, token);
+            String lexeme = token.getLexeme();
+            ClassFileContainer classFileContainer;
+            if (isClass)
+            {
+                classFileContainer = openClass(lexeme, false, false);
+                if (classFileContainer == null)
+                    return;
+
+                classFileContainer.classReferences.forEach((className, classReference) -> {
+                    if (className.equals(lexeme))
+                    {
+                        classReference.forEach(classReferenceLocation -> {
+                            if (classReferenceLocation.type.equals("declaration"))
+                            {
+                                moveCursor(classReferenceLocation.line, classReferenceLocation.columnStart);
+                            }
+                        });
+                    }
+                });
+            } else if (isField)
+            {
+                classFileContainer = openClass(lexeme, true, false);
+                if (classFileContainer == null)
+                    return;
+
+                classFileContainer.fieldMembers.forEach((fieldName, fields) -> {
+                    if (fieldName.equals(lexeme))
                     {
-                        field2.forEach(classFieldLocation -> {
+                        fields.forEach(classFieldLocation -> {
                             if (classFieldLocation.type.equals("declaration"))
                             {
-                                for (int i = 0; i < 3; i++)
-                                {
-                                    BytecodeViewPanel panel = activeResource.getPanel(i);
-                                    if (panel.textArea != null)
-                                    {
-                                        if (panel.decompiler.getDecompilerName().equals(this.container.getDecompiler()))
-                                        {
-                                            Element root = panel.textArea.getDocument().getDefaultRootElement();
-                                            int startOffset = root.getElement(classFieldLocation.line - 1).getStartOffset() + (classFieldLocation.columnStart - 1);
-                                            panel.textArea.setCaretPosition(startOffset);
-                                            for (CaretListener caretListener : panel.textArea.getCaretListeners())
-                                            {
-                                                if (caretListener instanceof BytecodeViewPanelUpdater.MarkerCaretListener)
-                                                {
-                                                    BytecodeViewPanelUpdater.MarkerCaretListener markerCaretListener = (BytecodeViewPanelUpdater.MarkerCaretListener) caretListener;
-                                                    markerCaretListener.caretUpdate(new CaretEvent(panel.textArea)
-                                                    {
-                                                        @Override
-                                                        public int getDot()
-                                                        {
-                                                            return panel.textArea.getCaret().getDot();
-                                                        }
-
-                                                        @Override
-                                                        public int getMark()
-                                                        {
-                                                            return 0;
-                                                        }
-                                                    });
-                                                }
-                                            }
-
-                                            panel.textArea.requestFocusInWindow();
-                                            break;
-                                        }
-                                    }
-                                }
+                                moveCursor(classFieldLocation.line, classFieldLocation.columnStart);
                             }
                         });
                     }
                 });
+            } else if (isMethod)
+            {
+                classFileContainer = openClass(lexeme, false, true);
+                if (classFileContainer == null)
+                    return;
+
+                classFileContainer.methodMembers.forEach((methodName, methods) -> {
+                    if (methodName.equals(lexeme))
+                    {
+                        methods.forEach(method -> {
+                            if (method.decRef.equalsIgnoreCase("declaration"))
+                            {
+                                moveCursor(method.line, method.columnStart);
+                            }
+                        });
+                    }
+                });
+            }
+        }, "Open Class");
+        thread.start();
+    }
+
+    private ClassFileContainer wait(HashMap<String, ClassFileContainer> classFiles, ClassViewer activeResource)
+    {
+        String containerName = activeResource.resource.workingName + "-" + this.container.getDecompiler();
+        try
+        {
+            BytecodeViewer.updateBusyStatus(true);
+            Thread.getAllStackTraces().forEach((name, stackTrace) -> {
+                if (name.getName().equals("Pane Update"))
+                {
+                    try
+                    {
+                        name.join();
+                    } catch (InterruptedException e)
+                    {
+                        throw new RuntimeException(e);
+                    }
+                }
             });
-            thread.start();
+        } catch (Exception e)
+        {
+            throw new RuntimeException(e);
+        } finally
+        {
+            BytecodeViewer.updateBusyStatus(false);
+        }
+
+        return classFiles.get(containerName);
+    }
+
+    private void moveCursor(int line, int columnStart)
+    {
+        for (int i = 0; i < 3; i++)
+        {
+            BytecodeViewPanel panel = ((ClassViewer) BytecodeViewer.viewer.workPane.getActiveResource()).getPanel(i);
+            if (panel.decompiler.getDecompilerName().equals(this.container.getDecompiler()))
+            {
+                Element root = panel.textArea.getDocument().getDefaultRootElement();
+                int startOffset = root.getElement(line - 1).getStartOffset() + (columnStart - 1);
+                panel.textArea.setCaretPosition(startOffset);
+                for (CaretListener caretListener : panel.textArea.getCaretListeners())
+                {
+                    if (caretListener instanceof BytecodeViewPanelUpdater.MarkerCaretListener)
+                    {
+                        BytecodeViewPanelUpdater.MarkerCaretListener markerCaretListener = (BytecodeViewPanelUpdater.MarkerCaretListener) caretListener;
+                        markerCaretListener.caretUpdate(new CaretEvent(panel.textArea)
+                        {
+                            @Override
+                            public int getDot()
+                            {
+                                return panel.textArea.getCaret().getDot();
+                            }
+
+                            @Override
+                            public int getMark()
+                            {
+                                return 0;
+                            }
+                        });
+                    }
+                }
+
+                panel.textArea.requestFocusInWindow();
+                break;
+            }
         }
     }
 }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
index 9d59d87ed..cf6f73ebd 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
@@ -34,9 +34,7 @@
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.BytecodeViewPanel;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ClassViewer;
 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.ClassLocalVariableLocation;
-import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassParameterLocation;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.*;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.parser.TokenUtil;
 import the.bytecode.club.bytecodeviewer.util.MethodParser;
 
@@ -117,7 +115,7 @@ public void processDisplay()
                     final String decompiledSource = decompiler.getDecompiler().decompileClassNode(viewer.resource.getResourceClassNode(), classBytes);
 
                     ClassFileContainer container = new ClassFileContainer(viewer.resource.workingName + "-" + decompiler.getDecompilerName(), decompiledSource, viewer.resource.container);
-                    if (!container.hasBeenParsed)
+                    if (!BytecodeViewer.viewer.workPane.classFiles.containsKey(viewer.resource.workingName + "-" + decompiler.getDecompilerName()))
                     {
                         container.parse();
                         BytecodeViewer.viewer.workPane.classFiles.put(viewer.resource.workingName + "-" + decompiler.getDecompilerName(), container);
@@ -446,9 +444,13 @@ private void markOccurrences(RSyntaxTextArea textArea, ClassFileContainer classF
         Token token = textArea.modelToToken(textArea.getCaretPosition());
         if (token == null)
         {
-            highlighterEx.clearMarkOccurrencesHighlights();
-            errorStripe.refreshMarkers();
-            return;
+            token = textArea.modelToToken(textArea.getCaretPosition() - 1);
+            if (token == null)
+            {
+                highlighterEx.clearMarkOccurrencesHighlights();
+                errorStripe.refreshMarkers();
+                return;
+            }
         }
 
         token = TokenUtil.getToken(textArea, token);
@@ -468,6 +470,11 @@ private void markOccurrences(RSyntaxTextArea textArea, ClassFileContainer classF
 		 */
         markField(textArea, classFileContainer, line, column, finalToken, highlighterEx);
 
+        /*
+        Methods
+         */
+        markMethod(textArea, classFileContainer, line, column, finalToken, highlighterEx);
+
 		/*
 		Method parameters
 		 */
@@ -478,6 +485,11 @@ private void markOccurrences(RSyntaxTextArea textArea, ClassFileContainer classF
 		 */
         markMethodLocalVariable(textArea, classFileContainer, line, column, finalToken, highlighterEx);
 
+        /*
+        Class references
+         */
+        markClasses(textArea, classFileContainer, line, column, finalToken, highlighterEx);
+
         errorStripe.refreshMarkers();
     }
 
@@ -489,20 +501,11 @@ private void markField(RSyntaxTextArea textArea, ClassFileContainer classFileCon
                 try
                 {
                     Element root = textArea.getDocument().getDefaultRootElement();
-                    for (
-                            ClassFieldLocation location :
-                            classFileContainer.getFieldLocationsFor(finalToken.getLexeme())
-                    )
+                    for (ClassFieldLocation location : classFileContainer.getFieldLocationsFor(finalToken.getLexeme()))
                     {
-                        int startOffset = root
-                                .getElement(location.line - 1)
-                                .getStartOffset() + (location.columnStart - 1);
-                        int endOffset = root
-                                .getElement(location.line - 1)
-                                .getStartOffset() + (location.columnEnd - 1);
-                        highlighterEx.addMarkedOccurrenceHighlight(
-                                startOffset, endOffset, new SmartHighlightPainter()
-                        );
+                        int startOffset = root.getElement(location.line - 1).getStartOffset() + (location.columnStart - 1);
+                        int endOffset = root.getElement(location.line - 1).getStartOffset() + (location.columnEnd - 1);
+                        highlighterEx.addMarkedOccurrenceHighlight(startOffset, endOffset, new SmartHighlightPainter());
                     }
                 } catch (BadLocationException ex)
                 {
@@ -512,6 +515,35 @@ startOffset, endOffset, new SmartHighlightPainter()
         }));
     }
 
+    private void markMethod(RSyntaxTextArea textArea, ClassFileContainer classFileContainer, int line, int column, Token finalToken, RSyntaxTextAreaHighlighterEx highlighterEx)
+    {
+        classFileContainer.methodMembers.values().forEach(methods -> methods.forEach(method -> {
+            String owner;
+            String parameters;
+            if (method.line == line && method.columnStart - 1 <= column && method.columnEnd >= column)
+            {
+                owner = method.owner;
+                parameters = method.methodParameterTypes;
+                Element root = textArea.getDocument().getDefaultRootElement();
+                for (ClassMethodLocation location : classFileContainer.getMethodLocationsFor(finalToken.getLexeme()))
+                {
+                    try
+                    {
+                        if (Objects.equals(owner, location.owner) && Objects.equals(parameters, location.methodParameterTypes))
+                        {
+                            int startOffset = root.getElement(location.line - 1).getStartOffset() + (location.columnStart - 1);
+                            int endOffset = root.getElement(location.line - 1).getStartOffset() + (location.columnEnd - 1);
+                            highlighterEx.addMarkedOccurrenceHighlight(startOffset, endOffset, new SmartHighlightPainter());
+                        }
+                    } catch (BadLocationException e)
+                    {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }
+        }));
+    }
+
     /**
      * Search through the text area and mark all occurrences that match the selected token.
      *
@@ -522,14 +554,7 @@ startOffset, endOffset, new SmartHighlightPainter()
      * @param finalToken         the token
      * @param highlighterEx      the highlighter
      */
-    private static void markMethodParameter(
-            RSyntaxTextArea textArea,
-            ClassFileContainer classFileContainer,
-            int line,
-            int column,
-            Token finalToken,
-            RSyntaxTextAreaHighlighterEx highlighterEx
-    )
+    private static void markMethodParameter(RSyntaxTextArea textArea, ClassFileContainer classFileContainer, int line, int column, Token finalToken, RSyntaxTextAreaHighlighterEx highlighterEx)
     {
         classFileContainer.methodParameterMembers.values().forEach(parameters -> parameters.forEach(parameter -> {
             String method;
@@ -539,23 +564,14 @@ private static void markMethodParameter(
                 try
                 {
                     Element root = textArea.getDocument().getDefaultRootElement();
-                    for (
-                            ClassParameterLocation location :
-                            classFileContainer.getParameterLocationsFor(finalToken.getLexeme())
-                    )
+                    for (ClassParameterLocation location : classFileContainer.getParameterLocationsFor(finalToken.getLexeme()))
                     {
                         if (Objects.equals(method, location.method))
                         {
-                            int startOffset = root
-                                    .getElement(location.line - 1)
-                                    .getStartOffset() + (location.columnStart - 1);
-                            int endOffset = root
-                                    .getElement(location.line - 1)
-                                    .getStartOffset() + (location.columnEnd - 1);
-
-                            highlighterEx.addMarkedOccurrenceHighlight(
-                                    startOffset, endOffset, new SmartHighlightPainter()
-                            );
+                            int startOffset = root.getElement(location.line - 1).getStartOffset() + (location.columnStart - 1);
+                            int endOffset = root.getElement(location.line - 1).getStartOffset() + (location.columnEnd - 1);
+
+                            highlighterEx.addMarkedOccurrenceHighlight(startOffset, endOffset, new SmartHighlightPainter());
                         }
                     }
                 } catch (BadLocationException ex)
@@ -576,14 +592,7 @@ startOffset, endOffset, new SmartHighlightPainter()
      * @param finalToken         the token
      * @param highlighterEx      the highlighter
      */
-    private static void markMethodLocalVariable(
-            RSyntaxTextArea textArea,
-            ClassFileContainer classFileContainer,
-            int line,
-            int column,
-            Token finalToken,
-            RSyntaxTextAreaHighlighterEx highlighterEx
-    )
+    private static void markMethodLocalVariable(RSyntaxTextArea textArea, ClassFileContainer classFileContainer, int line, int column, Token finalToken, RSyntaxTextAreaHighlighterEx highlighterEx)
     {
         classFileContainer.methodLocalMembers.values().forEach(localVariables -> localVariables.forEach(localVariable -> {
             String method;
@@ -593,23 +602,14 @@ private static void markMethodLocalVariable(
                 try
                 {
                     Element root = textArea.getDocument().getDefaultRootElement();
-                    for (
-                            ClassLocalVariableLocation location :
-                            classFileContainer.getLocalLocationsFor(finalToken.getLexeme())
-                    )
+                    for (ClassLocalVariableLocation location : classFileContainer.getLocalLocationsFor(finalToken.getLexeme()))
                     {
                         if (Objects.equals(method, location.method))
                         {
-                            int startOffset = root
-                                    .getElement(location.line - 1)
-                                    .getStartOffset() + (location.columnStart - 1);
-                            int endOffset = root
-                                    .getElement(location.line - 1)
-                                    .getStartOffset() + (location.columnEnd - 1);
-
-                            highlighterEx.addMarkedOccurrenceHighlight(
-                                    startOffset, endOffset, new SmartHighlightPainter()
-                            );
+                            int startOffset = root.getElement(location.line - 1).getStartOffset() + (location.columnStart - 1);
+                            int endOffset = root.getElement(location.line - 1).getStartOffset() + (location.columnEnd - 1);
+
+                            highlighterEx.addMarkedOccurrenceHighlight(startOffset, endOffset, new SmartHighlightPainter());
                         }
                     }
                 } catch (BadLocationException ex)
@@ -620,9 +620,29 @@ startOffset, endOffset, new SmartHighlightPainter()
         }));
     }
 
-    public class MarkerCaretListener implements CaretListener
+    private void markClasses(RSyntaxTextArea textArea, ClassFileContainer classFileContainer, int line, int column, Token finalToken, RSyntaxTextAreaHighlighterEx highlighterEx)
     {
+        classFileContainer.classReferences.values().forEach(classes -> classes.forEach(clazz -> {
+            if (clazz.line == line && clazz.columnStart - 1 <= column && clazz.columnEnd - 1 >= column)
+            {
+                try
+                {
+                    Element root = textArea.getDocument().getDefaultRootElement();
+                    for (ClassReferenceLocation location : classFileContainer.getClassReferenceLocationsFor(finalToken.getLexeme()))
+                    {
+                        int startOffset = root.getElement(location.line - 1).getStartOffset() + (location.columnStart - 1);
+                        int endOffset = root.getElement(location.line - 1).getStartOffset() + (location.columnEnd - 1);
+                        highlighterEx.addMarkedOccurrenceHighlight(startOffset, endOffset, new SmartHighlightPainter());
+                    }
+                } catch (Exception ignored)
+                {
+                }
+            }
+        }));
+    }
 
+    public class MarkerCaretListener implements CaretListener
+    {
         private final String classContainerName;
 
         public MarkerCaretListener(String classContainerName)
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
index 78265f241..f9b68eb5f 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
@@ -9,10 +9,7 @@
 import com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver;
 import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
 import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
-import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassFieldLocation;
-import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassLocalVariableLocation;
-import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassMethodLocation;
-import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassParameterLocation;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.*;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.parser.MyVoidVisitor;
 
 import java.io.IOException;
@@ -20,6 +17,7 @@
 import java.util.List;
 import java.util.NavigableMap;
 import java.util.TreeMap;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * This is a container for a specific class. The container name is based on the actual class name and the decompiler used.
@@ -33,7 +31,7 @@ public class ClassFileContainer
     public transient NavigableMap<String, ArrayList<ClassParameterLocation>> methodParameterMembers = new TreeMap<>();
     public transient NavigableMap<String, ArrayList<ClassLocalVariableLocation>> methodLocalMembers = new TreeMap<>();
     public transient NavigableMap<String, ArrayList<ClassMethodLocation>> methodMembers = new TreeMap<>();
-    public transient NavigableMap<String, String> imports = new TreeMap<>();
+    public transient NavigableMap<String, ArrayList<ClassReferenceLocation>> classReferences = new TreeMap<>();
 
     public boolean hasBeenParsed = false;
     public final String className;
@@ -56,7 +54,7 @@ public void parse()
     {
         try
         {
-            TypeSolver typeSolver = new CombinedTypeSolver(new ReflectionTypeSolver(), new JarTypeSolver(path));
+            TypeSolver typeSolver = new CombinedTypeSolver(new ReflectionTypeSolver(false), new JarTypeSolver(path));
             StaticJavaParser.getParserConfiguration().setSymbolResolver(new JavaSymbolSolver(typeSolver));
             CompilationUnit compilationUnit = StaticJavaParser.parse(this.content);
             compilationUnit.accept(new MyVoidVisitor(this, compilationUnit), null);
@@ -71,12 +69,12 @@ public void parse()
 
     public String getName()
     {
-        return this.className.substring(this.className.lastIndexOf('.') + 1);
+        return this.className.substring(this.className.lastIndexOf('/') + 1, this.className.lastIndexOf('.'));
     }
 
     public String getDecompiler()
     {
-        return getName().substring(6);
+        return this.className.substring(this.className.lastIndexOf('-') + 1);
     }
 
     public String getParentContainer()
@@ -124,14 +122,28 @@ public List<ClassMethodLocation> getMethodLocationsFor(String key)
         return methodMembers.getOrDefault(key, new ArrayList<>());
     }
 
-    public void putImport(String key, String value)
+    public void putClassReference(String key, ClassReferenceLocation value)
     {
-        this.imports.put(key, value);
+        this.classReferences.computeIfAbsent(key, v -> new ArrayList<>()).add(value);
     }
 
-    public String getImport(String key)
+    public List<ClassReferenceLocation> getClassReferenceLocationsFor(String key)
     {
-        String value = this.imports.get(key);
-        return value + "/" + key;
+        return classReferences.getOrDefault(key, null);
+    }
+
+    public String getClassForField(String fieldName)
+    {
+        AtomicReference<String> className = new AtomicReference<>("");
+        this.classReferences.forEach((s, v) -> {
+            v.forEach(classReferenceLocation -> {
+                if (classReferenceLocation.fieldName.equals(fieldName))
+                {
+                    className.set(classReferenceLocation.packagePath + "/" + s);
+                }
+            });
+        });
+
+        return className.get();
     }
 }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassMethodLocation.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassMethodLocation.java
index 34b821d44..38b474e1b 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassMethodLocation.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassMethodLocation.java
@@ -7,15 +7,17 @@
 public class ClassMethodLocation
 {
 	public final String owner;
+	public final String signature;
 	public final String methodParameterTypes;
 	public final String decRef;
 	public final int line;
 	public final int columnStart;
 	public final int columnEnd;
 
-	public ClassMethodLocation(String owner, String methodParameterTypes, String decRef, int line, int columnStart, int columnEnd)
+	public ClassMethodLocation(String owner, String signature, String methodParameterTypes, String decRef, int line, int columnStart, int columnEnd)
 	{
 		this.owner = owner;
+		this.signature = signature;
 		this.methodParameterTypes = methodParameterTypes;
 		this.decRef = decRef;
 		this.line = line;
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassReferenceLocation.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassReferenceLocation.java
new file mode 100644
index 000000000..620e3b2db
--- /dev/null
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/locations/ClassReferenceLocation.java
@@ -0,0 +1,33 @@
+package the.bytecode.club.bytecodeviewer.resources.classcontainer.locations;
+
+/**
+ * Created by Bl3nd.
+ * Date: 9/20/2024
+ */
+public class ClassReferenceLocation
+{
+    public final String owner;
+    public final String packagePath;
+    public final String fieldName;
+    public final String type;
+    public final int line;
+    public final int columnStart;
+    public final int columnEnd;
+
+    public ClassReferenceLocation(String owner, String packagePath, String fieldName, String type, int line, int columnStart, int columnEnd)
+    {
+        this.owner = owner;
+        this.packagePath = packagePath;
+        this.fieldName = fieldName;
+        this.type = type;
+        this.line = line;
+        this.columnStart = columnStart;
+        this.columnEnd = columnEnd;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "ClassClassLocation{" + "owner='" + owner + '\'' + ", fieldName='" + fieldName + '\'' + ", type='" + type + '\'' + ", line=" + line + ", columnStart=" + columnStart + ", columnEnd=" + columnEnd + '}';
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
index 99b6dfba1..ae5a2ec8a 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/MyVoidVisitor.java
@@ -2,22 +2,19 @@
 
 import com.github.javaparser.Range;
 import com.github.javaparser.ast.CompilationUnit;
-import com.github.javaparser.ast.ImportDeclaration;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.stmt.*;
+import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
 import com.github.javaparser.resolution.UnsolvedSymbolException;
+import com.github.javaparser.resolution.declarations.ResolvedConstructorDeclaration;
+import com.github.javaparser.resolution.declarations.ResolvedMethodDeclaration;
+import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration;
 import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
 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.ClassLocalVariableLocation;
-import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassMethodLocation;
-import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassParameterLocation;
-
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicInteger;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.*;
 
 /**
  * Our custom visitor that allows us to get the information from JavaParser we need.
@@ -47,6 +44,19 @@ private String getMethod(CallableDeclaration<?> method)
         return method.getDeclarationAsString(false, false);
     }
 
+    @Override
+    public void visit(ClassOrInterfaceDeclaration n, Object arg)
+    {
+        super.visit(n, arg);
+        SimpleName name = n.getName();
+        Range range = name.getRange().get();
+        ResolvedReferenceTypeDeclaration resolve = n.resolve();
+        int line = range.begin.line;
+        int columnStart = range.begin.column;
+        int columnEnd = range.end.column;
+        this.classFileContainer.putClassReference(resolve.getName(), new ClassReferenceLocation(getOwner(), resolve.getPackageName(), "", "declaration", line, columnStart, columnEnd + 1));
+    }
+
     /**
      * Visit all {@link FieldDeclaration}s.
      * <p>
@@ -72,16 +82,21 @@ public void visit(FieldDeclaration n, Object arg)
     }
 
     @Override
-    public void visit(ImportDeclaration n, Object arg)
+    public void visit(ClassOrInterfaceType n, Object arg)
     {
         super.visit(n, arg);
-        if (!n.isAsterisk())
+        try
         {
-            Name class_ = n.getName();
-            String className = class_.getIdentifier();
-            String package_ = Objects.requireNonNull(class_.getQualifier().orElse(null)).asString();
-            package_ = package_.replace('.', '/');
-            this.classFileContainer.putImport(className, package_);
+            ResolvedType resolve = n.resolve();
+            String nameAsString = n.getNameAsString();
+            String qualifiedName = resolve.asReferenceType().getQualifiedName();
+            String packagePath = qualifiedName.substring(0, qualifiedName.lastIndexOf('.')).replace('.', '/');
+            Range range = n.getName().getRange().get();
+            int line = range.begin.line;
+            int columnStart = range.begin.column;
+            int columnEnd = range.end.column;
+            this.classFileContainer.putClassReference(nameAsString, new ClassReferenceLocation(getOwner(), packagePath, "", "reference", line, columnStart, columnEnd + 1));
+        } catch (Exception e) {
         }
     }
 
@@ -144,9 +159,17 @@ public void visit(FieldAccessExpr n, Object arg)
                         String qualifiedName = resolvedType.asReferenceType().getQualifiedName();
                         String className = qualifiedName.substring(qualifiedName.lastIndexOf('.') + 1);
                         String packageName = qualifiedName.substring(0, qualifiedName.lastIndexOf('.'));
-                        this.classFileContainer.putImport(className, packageName.replace('.', '/'));
+                        this.classFileContainer.putClassReference(className, new ClassReferenceLocation(getOwner(), packageName.replace('.', '/'), fieldName, "reference", line1, columnStart1, columnEnd1 + 1));
                         this.classFileContainer.putField(fieldName, new ClassFieldLocation(name1, "reference", line, columnStart, columnEnd + 1));
                     }
+                } else if (scope instanceof ThisExpr) {
+                    ThisExpr thisExpr = (ThisExpr) scope;
+                    ResolvedType resolvedType = n.getSymbolResolver().calculateType(thisExpr);
+                    String qualifiedName = resolvedType.asReferenceType().getQualifiedName();
+                    String className = qualifiedName.substring(qualifiedName.lastIndexOf('.') + 1);
+                    String packageName = qualifiedName.substring(0, qualifiedName.lastIndexOf('.'));
+                    this.classFileContainer.putClassReference(className, new ClassReferenceLocation(getOwner(), packageName.replace('.', '/'), fieldName, "reference", line, columnStart, columnEnd + 1));
+                    this.classFileContainer.putField(fieldName, new ClassFieldLocation(className, "reference", line, columnStart, columnEnd + 1));
                 }
             }
         }
@@ -165,8 +188,6 @@ public void visit(FieldAccessExpr n, Object arg)
     public void visit(ConstructorDeclaration n, Object arg)
     {
         super.visit(n, arg);
-        StringBuilder parameterTypes = new StringBuilder();
-        AtomicInteger count = new AtomicInteger();
         n.getParameters().forEach(parameter -> {
             SimpleName name = parameter.getName();
             String parameterName = name.getIdentifier();
@@ -174,25 +195,24 @@ public void visit(ConstructorDeclaration n, Object arg)
             int line = range.begin.line;
             int columnStart = range.begin.column;
             int columnEnd = range.end.column;
-            this.classFileContainer.putParameter(parameterName, new ClassParameterLocation(getOwner(), n.getDeclarationAsString(false, false),
-                    "declaration", line, columnStart, columnEnd + 1));
-            count.getAndIncrement();
-            parameterTypes.append(parameter.getTypeAsString());
-            if (n.getParameters().size() > 1 && count.get() != n.getParameters().size())
-            {
-                parameterTypes.append(", ");
-            }
+            this.classFileContainer.putParameter(parameterName, new ClassParameterLocation(getOwner(), n.getDeclarationAsString(false, false), "declaration", line, columnStart, columnEnd + 1));
         });
 
+        ResolvedConstructorDeclaration resolve = n.resolve();
+        String signature = resolve.getQualifiedSignature();
+        String parameters = "";
+        if (resolve.getNumberOfParams() != 0)
+        {
+            parameters = signature.substring(signature.indexOf('(') + 1, signature.lastIndexOf(')'));
+        }
+
         SimpleName simpleName = n.getName();
         String constructorName = simpleName.getIdentifier();
         Range range = simpleName.getRange().get();
         int line = range.begin.line;
         int columnStart = range.begin.column;
         int columnEnd = range.end.column;
-        this.classFileContainer.putMethod(constructorName, new ClassMethodLocation(getOwner(), parameterTypes.toString(), "declaration", line,
-                columnStart,
-                columnEnd + 1));
+        this.classFileContainer.putMethod(constructorName, new ClassMethodLocation(resolve.getClassName(), signature, parameters, "declaration", line, columnStart, columnEnd + 1));
     }
 
     /**
@@ -261,33 +281,31 @@ public void visit(ExplicitConstructorInvocationStmt n, Object arg)
     public void visit(MethodDeclaration n, Object arg)
     {
         super.visit(n, arg);
-        StringBuilder parameterTypes = new StringBuilder();
-        AtomicInteger count = new AtomicInteger();
-        n.getParameters().forEach(parameter -> {
-            SimpleName name = parameter.getName();
-            String parameterName = name.getIdentifier();
-            Range range = name.getRange().get();
-            int line = range.begin.line;
-            int columnStart = range.begin.column;
-            int columnEnd = range.end.column;
-            this.classFileContainer.putParameter(parameterName, new ClassParameterLocation(getOwner(), n.getDeclarationAsString(false, false),
-                    "declaration", line, columnStart, columnEnd + 1));
-            count.getAndIncrement();
-            parameterTypes.append(parameter.getTypeAsString());
-            if (n.getParameters().size() > 1 && count.get() != n.getParameters().size())
-            {
-                parameterTypes.append(", ");
-            }
-        });
+        ResolvedMethodDeclaration resolve = n.resolve();
+        String signature = resolve.getQualifiedSignature();
+        String parameters = "";
+        if (resolve.getNumberOfParams() != 0)
+        {
+            parameters = signature.substring(signature.indexOf('(') + 1, signature.lastIndexOf(')'));
+        }
 
         SimpleName methodSimpleName = n.getName();
-        String methodName = methodSimpleName.getIdentifier();
         Range range = methodSimpleName.getRange().get();
         int line = range.begin.line;
         int columnStart = range.begin.column;
         int columnEnd = range.end.column;
-        this.classFileContainer.putMethod(methodName, new ClassMethodLocation(getOwner(), parameterTypes.toString(), "declaration", line, columnStart,
-                columnEnd + 1));
+        this.classFileContainer.putMethod(methodSimpleName.getIdentifier(), new ClassMethodLocation(resolve.getClassName(), signature, parameters, "declaration", line, columnStart, columnEnd + 1));
+
+        n.getParameters().forEach(parameter -> {
+            SimpleName name = parameter.getName();
+            String parameterName = name.getIdentifier();
+            Range range1 = name.getRange().get();
+            int line1 = range1.begin.line;
+            int columnStart1 = range1.begin.column;
+            int columnEnd1 = range1.end.column;
+            this.classFileContainer.putParameter(parameterName, new ClassParameterLocation(getOwner(), n.getDeclarationAsString(false, false),
+                    "declaration", line1, columnStart1, columnEnd1 + 1));
+        });
     }
 
     /**
@@ -311,6 +329,26 @@ public void visit(MethodCallExpr n, Object arg)
             }
         }
 
+        try
+        {
+            ResolvedMethodDeclaration resolve = n.resolve();
+            String signature = resolve.getQualifiedSignature();
+            String parameters = "";
+            if (resolve.getNumberOfParams() != 0)
+            {
+                parameters = signature.substring(signature.indexOf('(') + 1, signature.lastIndexOf(')'));
+            }
+
+            SimpleName methodSimpleName = n.getName();
+            Range range = methodSimpleName.getRange().get();
+            int line = range.begin.line;
+            int columnStart = range.begin.column;
+            int columnEnd = range.end.column;
+            this.classFileContainer.putMethod(methodSimpleName.getIdentifier(), new ClassMethodLocation(resolve.getClassName(), signature, parameters, "reference", line, columnStart, columnEnd + 1));
+        } catch (Exception e)
+        {
+        }
+
         if (method != null)
         {
             if (n.hasScope())
@@ -319,28 +357,32 @@ public void visit(MethodCallExpr n, Object arg)
                 if (scope instanceof NameExpr)
                 {
                     NameExpr nameExpr = (NameExpr) scope;
+                    SimpleName simpleName = nameExpr.getName();
+                    String name = simpleName.getIdentifier();
+                    Range range1 = simpleName.getRange().get();
+                    int line1 = range1.begin.line;
+                    int columnStart1 = range1.begin.column;
+                    int columnEnd1 = range1.end.column;
                     try
                     {
                         ResolvedValueDeclaration vd = nameExpr.resolve();
-                        SimpleName simpleName = nameExpr.getName();
-                        String name = simpleName.getIdentifier();
-                        Range range = simpleName.getRange().get();
-                        int line = range.begin.line;
-                        int columnStart = range.begin.column;
-                        int columnEnd = range.end.column;
                         if (vd.isField())
                         {
-                            this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                            this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line1, columnStart1, columnEnd1 + 1));
                         } else if (vd.isVariable())
                         {
-                            this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                            this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(method), "reference", line1, columnStart1, columnEnd1 + 1));
                         } else if (vd.isParameter())
                         {
-                            this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line, columnStart, columnEnd + 1));
+                            this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(method), "reference", line1, columnStart1, columnEnd1 + 1));
                         }
                     } catch (UnsolvedSymbolException ignored)
                     {
-
+                        ResolvedType resolvedType = n.getSymbolResolver().calculateType(nameExpr);
+                        String qualifiedName = resolvedType.asReferenceType().getQualifiedName();
+                        String className = qualifiedName.substring(qualifiedName.lastIndexOf('.') + 1);
+                        String packageName = qualifiedName.substring(0, qualifiedName.lastIndexOf('.'));
+                        this.classFileContainer.putClassReference(className, new ClassReferenceLocation(getOwner(), packageName.replace('.', '/'), "", "reference", line1, columnStart1, columnEnd1 + 1));
                     }
                 }
             }
@@ -353,19 +395,19 @@ public void visit(MethodCallExpr n, Object arg)
                     ResolvedValueDeclaration vd = nameExpr.resolve();
                     SimpleName simpleName = nameExpr.getName();
                     String name = simpleName.getIdentifier();
-                    Range range = simpleName.getRange().get();
-                    int line = range.begin.line;
-                    int columnStart = range.begin.column;
-                    int columnEnd = range.end.column;
+                    Range range1 = simpleName.getRange().get();
+                    int line1 = range1.begin.line;
+                    int columnStart1 = range1.begin.column;
+                    int columnEnd1 = range1.end.column;
                     if (vd.isField())
                     {
-                        this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                        this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line1, columnStart1, columnEnd1 + 1));
                     } else if (vd.isVariable())
                     {
-                        this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(finalMethod), "reference", line, columnStart, columnEnd + 1));
+                        this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), getMethod(finalMethod), "reference", line1, columnStart1, columnEnd1 + 1));
                     } else if (vd.isParameter())
                     {
-                        this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(finalMethod), "reference", line, columnStart, columnEnd + 1));
+                        this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), getMethod(finalMethod), "reference", line1, columnStart1, columnEnd1 + 1));
                     }
                 }
             });
@@ -382,19 +424,19 @@ public void visit(MethodCallExpr n, Object arg)
                         ResolvedValueDeclaration vd = nameExpr.resolve();
                         SimpleName simpleName = nameExpr.getName();
                         String name = simpleName.getIdentifier();
-                        Range range = simpleName.getRange().get();
-                        int line = range.begin.line;
-                        int columnStart = range.begin.column;
-                        int columnEnd = range.end.column;
+                        Range range1 = simpleName.getRange().get();
+                        int line1 = range1.begin.line;
+                        int columnStart1 = range1.begin.column;
+                        int columnEnd1 = range1.end.column;
                         if (vd.isField())
                         {
-                            this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                            this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line1, columnStart1, columnEnd1 + 1));
                         } else if (vd.isVariable())
                         {
-                            this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+                            this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line1, columnStart1, columnEnd1 + 1));
                         } else if (vd.isParameter())
                         {
-                            this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+                            this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), "static", "reference", line1, columnStart1, columnEnd1 + 1));
                         }
                     } catch (UnsolvedSymbolException ignored)
                     {
@@ -410,19 +452,19 @@ public void visit(MethodCallExpr n, Object arg)
                     ResolvedValueDeclaration vd = nameExpr.resolve();
                     SimpleName simpleName = nameExpr.getName();
                     String name = simpleName.getIdentifier();
-                    Range range = simpleName.getRange().get();
-                    int line = range.begin.line;
-                    int columnStart = range.begin.column;
-                    int columnEnd = range.end.column;
+                    Range range1 = simpleName.getRange().get();
+                    int line1 = range1.begin.line;
+                    int columnStart1 = range1.begin.column;
+                    int columnEnd1 = range1.end.column;
                     if (vd.isField())
                     {
-                        this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line, columnStart, columnEnd + 1));
+                        this.classFileContainer.putField(name, new ClassFieldLocation(getOwner(), "reference", line1, columnStart1, columnEnd1 + 1));
                     } else if (vd.isVariable())
                     {
-                        this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+                        this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line1, columnStart1, columnEnd1 + 1));
                     } else if (vd.isParameter())
                     {
-                        this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
+                        this.classFileContainer.putParameter(name, new ClassParameterLocation(getOwner(), "static", "reference", line1, columnStart1, columnEnd1 + 1));
                     }
                 }
             });
@@ -640,9 +682,7 @@ public void visit(AssignExpr n, Object arg)
                     } else if (vd.isVariable())
                     {
                         this.classFileContainer.putLocalVariable(name, new ClassLocalVariableLocation(getOwner(), "static", "reference", line, columnStart, columnEnd + 1));
-                    }/* else if (vd.isParameter()) {
-						System.err.println("AssignExpr - parameter2");
-					}*/
+                    }
                 } catch (UnsolvedSymbolException e)
                 {
                     System.err.println(nameExpr.getName().getIdentifier() + " not resolved. " + e.getMessage());
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/TokenUtil.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/TokenUtil.java
index 5bb5b8ae0..0860efd7a 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/TokenUtil.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/parser/TokenUtil.java
@@ -24,6 +24,7 @@ public static Token getToken(final RSyntaxTextArea textArea, final @NotNull Toke
 				|| lexeme.equals(" ")
 				|| lexeme.equals(";")
 				|| lexeme.equals(",")
+				|| lexeme.equals(">")
 				? textArea.modelToToken(textArea.getCaretPosition() - 1)
 				: token;
 	}

From 06e61171752dcf6e66d6759431cf3ece0c2e2ff0 Mon Sep 17 00:00:00 2001
From: Cody <6558800+Bl3nd@users.noreply.github.com>
Date: Mon, 23 Sep 2024 21:59:51 -0600
Subject: [PATCH 11/11] Add ability to use 'CTRL' + LMB for go to action.

---
 .../gui/util/BytecodeViewPanelUpdater.java    | 45 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
index cf6f73ebd..33e790481 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java
@@ -46,8 +46,7 @@
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Element;
 import java.awt.*;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
+import java.awt.event.*;
 import java.util.Objects;
 import java.util.regex.Matcher;
 
@@ -434,6 +433,48 @@ else if (isPanelEditable && decompiler == Decompiler.KRAKATAU_DISASSEMBLER)
         bytecodeViewPanel.textArea.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_B, InputEvent.CTRL_DOWN_MASK), "goToAction");
         bytecodeViewPanel.textArea.getActionMap().put("goToAction", new GoToAction(classFileContainer));
 
+        bytecodeViewPanel.textArea.addMouseMotionListener(new MouseMotionAdapter()
+        {
+            @Override
+            public void mouseMoved(MouseEvent e)
+            {
+                if (e.isControlDown())
+                {
+                    RSyntaxTextArea textArea = (RSyntaxTextArea) e.getSource();
+                    Token token = textArea.viewToToken(e.getPoint());
+                    if (token != null)
+                    {
+                        String lexeme = token.getLexeme();
+                        if (classFileContainer.fieldMembers.containsKey(lexeme) || classFileContainer.methodMembers.containsKey(lexeme)
+                                || classFileContainer.methodLocalMembers.containsKey(lexeme) || classFileContainer.methodParameterMembers.containsKey(lexeme)
+                                || classFileContainer.classReferences.containsKey(lexeme))
+                        {
+                            textArea.setCursor(new Cursor(Cursor.HAND_CURSOR));
+                        }
+                    }
+                } else
+                {
+                    if (bytecodeViewPanel.textArea.getCursor().getType() != Cursor.TEXT_CURSOR)
+                    {
+                        bytecodeViewPanel.textArea.setCursor(new Cursor(Cursor.TEXT_CURSOR));
+                    }
+                }
+            }
+        });
+
+        bytecodeViewPanel.textArea.addMouseListener(new MouseAdapter()
+        {
+            @Override
+            public void mouseClicked(MouseEvent e)
+            {
+                if (e.isControlDown())
+                {
+                    RSyntaxTextArea textArea = (RSyntaxTextArea) e.getSource();
+                    textArea.getActionMap().get("goToAction").actionPerformed(new ActionEvent(textArea, ActionEvent.ACTION_PERFORMED, "goToAction"));
+                }
+            }
+        });
+
         markerCaretListener = new MarkerCaretListener(classContainerName);
         bytecodeViewPanel.textArea.addCaretListener(markerCaretListener);
     }