Revert "Bump version to 0.33.0 (#386)"

This reverts commit cb56e1b.
microsoft · SaadAissa · Jul 19, 2019 · Jul 19, 2019 · Jul 22, 2019 · Jul 31, 2019
commit 9d88e12e3997d2e5782bce3c5de98533861c770f
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
diff --git a/com.microsoft.java.debug.core/.classpath b/com.microsoft.java.debug.core/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

@@ -4,7 +4,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ch.epfl.scala</groupId>
     <artifactId>com-microsoft-java-debug-core</artifactId>
-    <packaging>jar</packaging>
     <name>${base.name} :: Debugger Core</name>
     <description>The Java Debug Server is an implementation of Visual Studio Code (VSCode) Debug Protocol. It can be used in Visual Studio Code to debug Java programs.</description>
     <url>https://github.com/Microsoft/java-debug</url>
@@ -80,8 +79,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.7.0</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -127,7 +126,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.9</version>
+            <version>2.7</version>
         </dependency>
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
@@ -142,7 +141,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.10.0</version>
+            <version>2.5</version>
         </dependency>
         <!-- Dependencies for test -->
         <dependency>

diff --git a/...t.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ProcessConsole.java b/...t.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ProcessConsole.java
@@ -129,7 +129,7 @@ public void stop() {
         }
 
         private void monitor(InputStream input, PublishSubject<String> subject) {
-            BufferedReader reader = new BufferedReader(encoding == null ? new InputStreamReader(input) : new InputStreamReader(input, encoding));
+            BufferedReader reader = new BufferedReader(new InputStreamReader(input, encoding));
             final int BUFFERSIZE = 4096;
             char[] buffer = new char[BUFFERSIZE];
             while (true) {

diff --git a/....core/src/main/java/com/microsoft/java/debug/core/adapter/handler/CompletionsHandler.java b/....core/src/main/java/com/microsoft/java/debug/core/adapter/handler/CompletionsHandler.java
@@ -11,8 +11,8 @@
 
 package com.microsoft.java.debug.core.adapter.handler;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
@@ -46,7 +46,7 @@ public CompletableFuture<Response> handle(Command command, Arguments arguments,
         // completions should be illegal when frameId is zero, it is sent when the program is running, while during running we cannot resolve
         // the completion candidates
         if (completionsArgs.frameId == 0) {
-            response.body = new Responses.CompletionsResponseBody(Collections.emptyList());
+            response.body = new ArrayList<>();
             return CompletableFuture.completedFuture(response);
         }
 

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2017-2021 Microsoft Corporation and others.
+* Copyright (c) 2017-2020 Microsoft Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -14,6 +14,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
@@ -105,58 +106,31 @@ public CompletableFuture<Response> handle(Command command, Arguments arguments,
                                     indexedVariables = ((IntegerValue) sizeValue).value();
                                 }
                             }
-                        } catch (Exception e) {
-                            logger.log(Level.INFO, "Failed to get the logical size of the variable", e);
+                        } catch (CancellationException | IllegalArgumentException | InterruptedException
+                                | ExecutionException | UnsupportedOperationException e) {
+                            logger.log(Level.INFO,
+                                    String.format("Failed to get the logical size for the type %s.", value.type().name()), e);
                         }
                     }
                     int referenceId = 0;
                     if (indexedVariables > 0 || (indexedVariables < 0 && value instanceof ObjectReference)) {
                         referenceId = context.getRecyclableIdPool().addObject(threadId, varProxy);
                     }
 
-                    boolean hasErrors = false;
-                    String valueString = null;
-                    try {
-                        valueString = variableFormatter.valueToString(value, options);
-                    } catch (OutOfMemoryError e) {
-                        hasErrors = true;
-                        logger.log(Level.SEVERE, "Failed to convert the value of a large object to a string", e);
-                        valueString = "<Unable to display the value of a large object>";
-                    }  catch (Exception e) {
-                        hasErrors = true;
-                        logger.log(Level.SEVERE, "Failed to resolve the variable value", e);
-                        valueString = "<Failed to resolve the variable value due to \"" + e.getMessage() + "\">";
-                    }
-
+                    String valueString = variableFormatter.valueToString(value, options);
                     String detailsString = null;
-                    if (hasErrors) {
-                        // If failed to resolve the variable value, skip the details info as well.
-                    } else if (sizeValue != null) {
+                    if (sizeValue != null) {
                         detailsString = "size=" + variableFormatter.valueToString(sizeValue, options);
                     } else if (DebugSettings.getCurrent().showToString) {
-                        try {
-                            detailsString = VariableDetailUtils.formatDetailsValue(value, stackFrameReference.getThread(), variableFormatter, options, engine);
-                        } catch (OutOfMemoryError e) {
-                            logger.log(Level.SEVERE, "Failed to compute the toString() value of a large object", e);
-                            detailsString = "<Unable to display the details of a large object>";
-                        } catch (Exception e) {
-                            logger.log(Level.SEVERE, "Failed to compute the toString() value", e);
-                            detailsString = "<Failed to resolve the variable details due to \"" + e.getMessage() + "\">";
-                        }
+                        detailsString = VariableDetailUtils.formatDetailsValue(value, stackFrameReference.getThread(), variableFormatter, options, engine);
                     }
 
                     if ("clipboard".equals(evalArguments.context) && detailsString != null) {
                         response.body = new Responses.EvaluateResponseBody(detailsString, -1, "String", 0);
                     } else {
-                        String typeString = "";
-                        try {
-                            typeString = variableFormatter.typeToString(value == null ? null : value.type(), options);
-                        } catch (Exception e) {
-                            logger.log(Level.SEVERE, "Failed to resolve the variable type", e);
-                            typeString = "";
-                        }
                         response.body = new Responses.EvaluateResponseBody((detailsString == null) ? valueString : valueString + " " + detailsString,
-                                referenceId, typeString, Math.max(indexedVariables, 0));
+                                referenceId, variableFormatter.typeToString(value == null ? null : value.type(), options),
+                                Math.max(indexedVariables, 0));
                     }
                     return response;
                 }

@@ -16,6 +16,7 @@
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -90,21 +91,23 @@ protected CompletableFuture<Response> handleLaunchCommand(Arguments arguments, R
                 "Failed to launch debuggee VM. Missing mainClass or modulePaths/classPaths options in launch configuration.",
                 ErrorCode.ARGUMENT_MISSING);
         }
-        if (StringUtils.isNotBlank(launchArguments.encoding)) {
+        if (StringUtils.isBlank(launchArguments.encoding)) {
+            context.setDebuggeeEncoding(StandardCharsets.UTF_8);
+        } else {
             if (!Charset.isSupported(launchArguments.encoding)) {
                 throw AdapterUtils.createCompletionException(
                     "Failed to launch debuggee VM. 'encoding' options in the launch configuration is not recognized.",
                     ErrorCode.INVALID_ENCODING);
             }
             context.setDebuggeeEncoding(Charset.forName(launchArguments.encoding));
-            if (StringUtils.isBlank(launchArguments.vmArgs)) {
-                launchArguments.vmArgs = String.format("-Dfile.encoding=%s", context.getDebuggeeEncoding().name());
-            } else {
-                // if vmArgs already has the file.encoding settings, duplicate options for jvm will not cause an error, the right most value wins
-                launchArguments.vmArgs = String.format("%s -Dfile.encoding=%s", launchArguments.vmArgs, context.getDebuggeeEncoding().name());
-            }
         }
 
+        if (StringUtils.isBlank(launchArguments.vmArgs)) {
+            launchArguments.vmArgs = String.format("-Dfile.encoding=%s", context.getDebuggeeEncoding().name());
+        } else {
+            // if vmArgs already has the file.encoding settings, duplicate options for jvm will not cause an error, the right most value wins
+            launchArguments.vmArgs = String.format("%s -Dfile.encoding=%s", launchArguments.vmArgs, context.getDebuggeeEncoding().name());
+        }
         context.setLaunchMode(launchArguments.noDebug ? LaunchMode.NO_DEBUG : LaunchMode.DEBUG);
 
         activeLaunchHandler.preLaunch(launchArguments, context);

diff --git a/...a.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchUtils.java b/...a.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchUtils.java
@@ -73,11 +73,11 @@ public static synchronized Path generateClasspathJar(String[] classPaths) throws
     public static synchronized Path generateArgfile(String[] classPaths, String[] modulePaths) throws IOException {
         String argfile = "";
         if (ArrayUtils.isNotEmpty(classPaths)) {
-            argfile = "-cp \"" + String.join(File.pathSeparator, classPaths) + "\"";
+            argfile = "-classpath \"" + String.join(File.pathSeparator, classPaths) + "\"";
         }
 
         if (ArrayUtils.isNotEmpty(modulePaths)) {
-            argfile += " --module-path \"" + String.join(File.pathSeparator, modulePaths) + "\"";
+            argfile = " --module-path \"" + String.join(File.pathSeparator, modulePaths) + "\"";
         }
 
         argfile = argfile.replace("\\", "\\\\");

@@ -145,22 +145,20 @@ public CompletableFuture<Response> handle(Command command, Arguments arguments,
     private void handleDebugEvent(DebugEvent debugEvent, IDebugSession debugSession, IDebugAdapterContext context,
             ThreadState threadState) {
         Event event = debugEvent.event;
-        EventRequestManager eventRequestManager = debugSession.getVM().eventRequestManager();
 
         // When a breakpoint occurs, abort any pending step requests from the same thread.
         if (event instanceof BreakpointEvent || event instanceof ExceptionEvent) {
             long threadId = ((LocatableEvent) event).thread().uniqueID();
             if (threadId == threadState.threadId && threadState.pendingStepRequest != null) {
-                threadState.deleteStepRequest(eventRequestManager);
-                threadState.deleteMethodExitRequest(eventRequestManager);
+                threadState.deleteStepRequests(debugSession.getVM().eventRequestManager());
                 context.getStepResultManager().removeMethodResult(threadId);
                 if (threadState.eventSubscription != null) {
                     threadState.eventSubscription.dispose();
                 }
             }
         } else if (event instanceof StepEvent) {
             ThreadReference thread = ((StepEvent) event).thread();
-            threadState.deleteStepRequest(eventRequestManager);
+            threadState.deleteStepRequests(debugSession.getVM().eventRequestManager());
             if (isStepFiltersConfigured(context.getStepFilters())) {
                 try {
                     if (threadState.pendingStepType == Command.STEPIN) {
@@ -183,7 +181,6 @@ private void handleDebugEvent(DebugEvent debugEvent, IDebugSession debugSession,
                     // ignore.
                 }
             }
-            threadState.deleteMethodExitRequest(eventRequestManager);
             if (threadState.eventSubscription != null) {
                 threadState.eventSubscription.dispose();
             }
@@ -283,13 +280,10 @@ class ThreadState {
         Location stepLocation = null;
         Disposable eventSubscription = null;
 
-        public void deleteMethodExitRequest(EventRequestManager manager) {
+        public void deleteStepRequests(EventRequestManager manager) {
+            DebugUtility.deleteEventRequestSafely(manager, this.pendingStepRequest);
             DebugUtility.deleteEventRequestSafely(manager, this.pendingMethodExitRequest);
             this.pendingMethodExitRequest = null;
-        }
-
-        public void deleteStepRequest(EventRequestManager manager) {
-            DebugUtility.deleteEventRequestSafely(manager, this.pendingStepRequest);
             this.pendingStepRequest = null;
         }
     }