microsoft · andxu · Aug 22, 2018 · andxu · Aug 22, 2018 · andxu
diff --git a/...lugin/src/main/java/com/microsoft/java/debug/plugin/internal/eval/JdtEvaluationProvider.java b/...lugin/src/main/java/com/microsoft/java/debug/plugin/internal/eval/JdtEvaluationProvider.java
@@ -135,6 +137,13 @@ public void initialize(IDebugAdapterContext context, Map<String, Object> props)
                compiledExpression = engine.getCompiledExpression(expression, stackframe);
            }

+            if (compiledExpression.hasErrors()) {
+                completableFuture.completeExceptionally(AdapterUtils.createUserErrorDebugException(
+                        String.format("Cannot evalution expression because of compilation error(s): %s.",
diff --git a/...re/src/main/java/com/microsoft/java/debug/core/adapter/handler/InitializeRequestHandler.java b/...re/src/main/java/com/microsoft/java/debug/core/adapter/handler/InitializeRequestHandler.java
@@ -53,6 +53,7 @@
        caps.supportsCompletionsRequest = true;
        caps.supportsRestartFrame = true;
        caps.supportsLogPoints = true;
+        caps.supportsEvaluateForHovers = true;
diff --git a/...core/src/main/java/com/microsoft/java/debug/core/adapter/handler/EvaluateRequestHandler.java b/...core/src/main/java/com/microsoft/java/debug/core/adapter/handler/EvaluateRequestHandler.java
                throw AdapterUtils.createCompletionException(
-                    String.format("Cannot evalution expression because of %s.", cause.toString()),
+                    String.format("Cannot evaluation expression because of %s.", cause.toString()),
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugException.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugException.java
+     * Create a debug exception with userError flag.
+     * @param message the error message
+     * @param errorCode the error code
+     * @param userError the boolean value of whether this exception is caused by a known user error
diff --git a/...core/src/main/java/com/microsoft/java/debug/core/adapter/handler/EvaluateRequestHandler.java b/...core/src/main/java/com/microsoft/java/debug/core/adapter/handler/EvaluateRequestHandler.java
-                ErrorCode.EVALUATE_FAILURE);
+            // stackFrameReference is null means the given thread is running
+            throw new CompletionException(AdapterUtils.createUserErrorDebugException(
+                    "Failed to evaluate. Reason: Cannot evaluate because the thread is resumed.",
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugException.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugException.java
@@ -15,6 +15,8 @@
    private static final long serialVersionUID = 1L;
    private int errorCode;

+    private boolean userError = false;
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugException.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugException.java
    public DebugException(String message, Throwable cause, int errorCode) {
        super(message, cause);
        this.errorCode = errorCode;
    }

+
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/UsageDataSession.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/UsageDataSession.java
@@ -39,6 +40,7 @@
    private Map<String, Integer> commandCountMap = new HashMap<>();
    private Map<String, Integer> breakpointCountMap = new HashMap<>();
    private Map<Integer, RequestEvent> requestEventMap = new HashMap<>();
+    private  Map<String, Integer> userErrorCount = new HashMap<>();
diff --git a/check_style.xml b/check_style.xml
@@ -134,6 +134,8 @@
        <module name="ModifierOrder"/>
        <module name="EmptyLineSeparator">
            <property name="allowNoEmptyLineBetweenFields" value="true"/>
+            <property name="allowMultipleEmptyLines" value="false"/>
diff --git a/...microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ErrorCode.java b/...microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ErrorCode.java
-    COMPLETIONS_FAILURE(1017);
+    COMPLETIONS_FAILURE(1017),
+    EVALUATION_COMPILE_ERROR(2001),
+    EVALUATE_NOT_SUSPEND(2002);