Merge pull request #521 from Bl3nd/go-to-enhancement

A small update to parsing
Konloch · Oct 8, 2024 · edadceb · edadceb
2 parents 3f1fd5a + 9860c9d
commit edadceb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 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
@@ -513,6 +513,7 @@ private void markOccurrences(RSyntaxTextArea textArea, ClassFileContainer classF
             if (token == null)
             {
                 highlighterEx.clearMarkOccurrencesHighlights();
+                errorStripe.refreshMarkers();
                 return;
             }
         }

diff --git a/...in/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java b/...in/java/the/bytecode/club/bytecodeviewer/resources/classcontainer/ClassFileContainer.java
@@ -56,7 +56,7 @@ public boolean parse()
         {
             if (shouldParse())
             {
-                TypeSolver typeSolver = new CombinedTypeSolver(new ReflectionTypeSolver(false), new JarTypeSolver(path));
+                TypeSolver typeSolver = new CombinedTypeSolver(new ReflectionTypeSolver(true), new JarTypeSolver(path));
                 JavaParser parser = new JavaParser();
                 parser.getParserConfiguration().setSymbolResolver(new JavaSymbolSolver(typeSolver));
                 ParseResult<CompilationUnit> parse = parser.parse(this.content);

diff --git a/.../bytecode/club/bytecodeviewer/resources/classcontainer/parser/visitors/MyVoidVisitor.java b/.../bytecode/club/bytecodeviewer/resources/classcontainer/parser/visitors/MyVoidVisitor.java
@@ -347,7 +347,7 @@ public void visit(ClassOrInterfaceType n, Object arg)
                     new ClassReferenceLocation(getOwner(classFileContainer),
                             packagePath, "", "reference", classValue.line, classValue.columnStart, classValue.columnEnd + 1));
         }
-        catch (ClassCastException | UnsupportedOperationException | IllegalArgumentException e)
+        catch (Exception e)
         {
             printException(n, e);
         }
@@ -401,7 +401,7 @@ public void visit(ConstructorDeclaration n, Object arg)
             if (node instanceof ObjectCreationExpr)
             {
                 NodeList<BodyDeclaration<?>> bodyDeclarations =
-                        ((ObjectCreationExpr) node).getAnonymousClassBody().orElse(null);
+                    ((ObjectCreationExpr) node).getAnonymousClassBody().orElse(null);
                 if (bodyDeclarations != null)
                 {
                     if (Objects.requireNonNull(bodyDeclarations.getFirst().orElse(null)).equals(n))
@@ -421,10 +421,10 @@ public void visit(ConstructorDeclaration n, Object arg)
 
             Value constructor = new Value(n.getName(), range);
             this.classFileContainer.putMethod(constructor.name, new ClassMethodLocation(resolve.getClassName(),
-                    signature, parameters, "declaration", constructor.line, constructor.columnStart,
-                    constructor.columnEnd + 1));
+                signature, parameters, "declaration", constructor.line, constructor.columnStart,
+                constructor.columnEnd + 1));
         }
-        catch (RuntimeException e)
+        catch (Exception e)
         {
             printException(n, e);
         }
@@ -566,7 +566,7 @@ public void visit(FieldDeclaration n, Object arg)
             Value field = new Value(variableDeclarator.getName(), range);
 
             this.classFileContainer.putField(field.name, new ClassFieldLocation(getOwner(classFileContainer),
-                    "declaration", field.line, field.columnStart, field.columnEnd + 1));
+                "declaration", field.line, field.columnStart, field.columnEnd + 1));
         });
     }
 
@@ -828,8 +828,8 @@ public void visit(MethodCallExpr n, Object arg)
 
             Value methodCall = new Value(n.getName(), methodRange);
             this.classFileContainer.putMethod(methodCall.name,
-                    new ClassMethodLocation(resolve.getClassName(), signature, parameters, "reference", methodCall.line,
-                            methodCall.columnStart, methodCall.columnEnd + 1));
+                new ClassMethodLocation(resolve.getClassName(), signature, parameters, "reference", methodCall.line,
+                    methodCall.columnStart, methodCall.columnEnd + 1));
 
             if (method != null)
             {
@@ -875,7 +875,7 @@ public void visit(MethodDeclaration n, Object arg)
 
             Value method = new Value(n.getName(), methodRange);
             this.classFileContainer.putMethod(method.name, new ClassMethodLocation(resolve.getClassName(), signature,
-                    parameters, "declaration", method.line, method.columnStart, method.columnEnd + 1));
+                parameters, "declaration", method.line, method.columnStart, method.columnEnd + 1));
         }
         catch (Exception e)
         {