prioritize lookup the project source code during debugging (#463)

* prioritize lookup the project source code during debugging * fix null check
microsoft · Jan 12, 2023 · e0f2bd2 · e0f2bd2
1 parent 42f9ac7
commit e0f2bd2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...bug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/InlineValueHandler.java b/...bug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/InlineValueHandler.java
@@ -166,7 +166,7 @@ private static IMethod findMethodInLocalTypes(IMethod enclosingMethod, int stopp
      */
     private static Position getPosition(IBuffer buffer, int offset) {
         int[] result = JsonRpcHelpers.toLine(buffer, offset);
-        if (result == null && result.length < 1) {
+        if (result == null || result.length < 1) {
             return new Position(-1, -1);
         }
 

diff --git a/...ft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JdtUtils.java b/...ft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JdtUtils.java
@@ -213,10 +213,10 @@ public static ISourceContainer[] getSourceContainers(String projectName) {
         projects.stream().distinct().map(project -> JdtUtils.getJavaProject(project))
             .filter(javaProject -> javaProject != null && javaProject.exists())
             .forEach(javaProject -> {
-                // Add source containers associated with the project's runtime classpath entries.
-                containers.addAll(Arrays.asList(getSourceContainers(javaProject, calculated)));
                 // Add source containers associated with the project's source folders.
                 containers.add(new JavaProjectSourceContainer(javaProject));
+                // Add source containers associated with the project's runtime classpath entries.
+                containers.addAll(Arrays.asList(getSourceContainers(javaProject, calculated)));
             });
 
         return containers.toArray(new ISourceContainer[0]);