mfussenegger
diff --git a/‎com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/InitializeRequestHandler.java‎
Lines changed: 1 addition & 0 deletions b/‎com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/InitializeRequestHandler.java‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ScopesRequestHandler.java‎
Lines changed: 1 addition & 1 deletion b/‎com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ScopesRequestHandler.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/ResolveClasspathsHandler.java‎
Lines changed: 39 additions & 2 deletions b/‎com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/ResolveClasspathsHandler.java‎
Lines changed: 39 additions & 2 deletions
@@ -53,6 +53,7 @@ public CompletableFuture<Messages.Response> handle(Requests.Command command, Req
         caps.supportsCompletionsRequest = true;
         caps.supportsRestartFrame = true;
         caps.supportsLogPoints = true;
+        caps.supportsEvaluateForHovers = true;
         Types.ExceptionBreakpointFilter[] exceptionFilters = {
             Types.ExceptionBreakpointFilter.UNCAUGHT_EXCEPTION_FILTER,
             Types.ExceptionBreakpointFilter.CAUGHT_EXCEPTION_FILTER,
 
@@ -47,7 +47,7 @@ public CompletableFuture<Response> handle(Command command, Arguments arguments,
         ThreadReference thread = stackFrameReference.getThread();
         VariableProxy localScope = new VariableProxy(thread, "Local", stackFrameReference);
         int localScopeId = context.getRecyclableIdPool().addObject(thread.uniqueID(), localScope);
-        scopes.add(new Types.Scope(localScope.getScope(), localScopeId, false));
+        scopes.add(new Types.Scope(localScope.getScope(), localScopeId, context.isAttached()));
 
         response.body = new Responses.ScopesResponseBody(scopes);
         return CompletableFuture.completedFuture(response);
 
@@ -13,13 +13,16 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.jdt.core.IClasspathAttribute;
+import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.search.IJavaSearchConstants;
@@ -29,6 +32,7 @@
 import org.eclipse.jdt.core.search.SearchParticipant;
 import org.eclipse.jdt.core.search.SearchPattern;
 import org.eclipse.jdt.core.search.SearchRequestor;
+import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
 import org.eclipse.jdt.launching.JavaRuntime;
 
 import com.microsoft.java.debug.core.Configuration;
@@ -162,12 +166,45 @@ private static String[][] computeClassPath(IJavaProject javaProject) throws Core
         }
         String[][] result = new String[2][];
         if (JavaRuntime.isModularProject(javaProject)) {
-            result[0] = JavaRuntime.computeDefaultRuntimeClassPath(javaProject);
+            result[0] = computeDefaultRuntimeClassPath(javaProject);
             result[1] = new String[0];
         } else {
             result[0] = new String[0];
-            result[1] = JavaRuntime.computeDefaultRuntimeClassPath(javaProject);
+            result[1] = computeDefaultRuntimeClassPath(javaProject);
         }
         return result;
     }
+
+    private static String[] computeDefaultRuntimeClassPath(IJavaProject jproject) throws CoreException {
+        IRuntimeClasspathEntry[] unresolved = JavaRuntime.computeUnresolvedRuntimeClasspath(jproject);
+        List<String> resolved = new ArrayList<>(unresolved.length);
+        for (int i = 0; i < unresolved.length; i++) {
+            IRuntimeClasspathEntry entry = unresolved[i];
+            if (entry.getClasspathProperty() == IRuntimeClasspathEntry.USER_CLASSES) {
+                IRuntimeClasspathEntry[] entries = JavaRuntime.resolveRuntimeClasspathEntry(entry, jproject);
+                for (int j = 0; j < entries.length; j++) {
+                    if (entries[j].getClasspathEntry().getPath().equals(jproject.getOutputLocation())) {
+                        continue;
+                    }
+                    if (isTest(entries[j].getClasspathEntry())) {
+                        continue;
+                    }
+                    String location = entries[j].getLocation();
+                    if (location != null) {
+                        resolved.add(location);
+                    }
+                }
+            }
+        }
+        return resolved.toArray(new String[resolved.size()]);
+    }
+
+    private static boolean isTest(final IClasspathEntry classpathEntry) {
+        for (final IClasspathAttribute classpathAttribute : classpathEntry.getExtraAttributes()) {
+            if (Objects.equals(classpathAttribute.getName(), "test")) {
+                return Objects.equals(classpathAttribute.getValue(), "true");
+            }
+        }
+        return false;
+    }
 }