Support specifying the exception types you want to break on (#1333)

* Support specifying the exception types you want to break on

Author: testforstephen

.github/CODEOWNERS

@@ -1 +1 @@
-* @testforstephen @jdneo @Eskibear @CsCherrYY
+* @testforstephen @jdneo

README.md

@@ -135,6 +135,8 @@ Please also check the documentation of [Language Support for Java by Red Hat](ht
   - `internalConsole` - VS Code debug console (input stream not supported).
   - `integratedTerminal` - VS Code integrated terminal.
   - `externalTerminal` - External terminal that can be configured in user settings.
+- `java.debug.settings.exceptionBreakpoint.exceptionTypes`: Specifies a set of exception types you want to break on, e.g. `java.lang.NullPointerException`. A specific exception type and its subclasses can be selected for caught exceptions, uncaught exceptions, or both can be selected.
+- `java.debug.settings.exceptionBreakpoint.allowClasses`: Specifies the allowed locations where the exception breakpoint can break on. Wildcard is supported, e.g. `java.*`, `*.Foo`.
 - `java.debug.settings.exceptionBreakpoint.skipClasses`: Skip the specified classes when breaking on exception.
   - `$JDK` - Skip the JDK classes from the default system bootstrap classpath, such as rt.jar, jrt-fs.jar.
   - `$Libraries` - Skip the classes from application libraries, such as Maven, Gradle dependencies.

package.json

@@ -861,6 +861,22 @@
           "description": "%java.debugger.configuration.console%",
           "default": "integratedTerminal"
         },
+        "java.debug.settings.exceptionBreakpoint.exceptionTypes": {
+          "type": "array",
+          "description": "%java.debugger.configuration.exceptionBreakpoint.exceptionTypes%",
+          "items": {
+            "type": "string"
+          },
+          "default": []
+        },
+        "java.debug.settings.exceptionBreakpoint.allowClasses": {
+          "type": "array",
+          "description": "%java.debugger.configuration.exceptionBreakpoint.allowClasses%",
+          "items": {
+            "type": "string"
+          },
+          "default": []
+        },
         "java.debug.settings.exceptionBreakpoint.skipClasses": {
           "type": "array",
           "description": "%java.debugger.configuration.exceptionBreakpoint.skipClasses%",

package.nls.json

@@ -65,6 +65,8 @@
     "java.debugger.configuration.forceBuildBeforeLaunch": "Force building the workspace before launching java program. If 'java.autobuild.enabled' is disabled, this setting will be ignored and still force a build job before launching.",
     "java.debugger.configuration.onBuildFailureProceed": "Force to proceed when build fails",
     "java.debugger.configuration.console": "The specified console to launch Java program. If you want to customize the console for a specific debug session, please modify the 'console' config in launch.json.",
+    "java.debugger.configuration.exceptionBreakpoint.exceptionTypes": "Specifies a set of exception types you want to break on, e.g. java.lang.NullPointerException. A specific exception type and its subclasses can be selected for caught exceptions, uncaught exceptions, or both can be selected.",
+    "java.debugger.configuration.exceptionBreakpoint.allowClasses": "Specifies the allowed locations where the exception breakpoint can break on. Wildcard is supported, e.g. java.*, *.Foo",
     "java.debugger.configuration.exceptionBreakpoint.skipClasses": "Skip the specified classes when breaking on exception. You could use the built-in variables such as '$JDK' and '$Libraries' to skip a group of classes, or add a specific class name expression, e.g. java.*, *.Foo",
     "java.debugger.configuration.jdwp.limitOfVariablesPerJdwpRequest.description": "The maximum number of variables or fields that can be requested in one JDWP request. The higher the value, the less frequently debuggee will be requested when expanding the variable view. Also a large number can cause JDWP request timeout.",
     "java.debugger.configuration.jdwp.requestTimeout.description": "The timeout (ms) of JDWP request when the debugger communicates with the target JVM.",

package.nls.zh-cn.json

@@ -62,6 +62,8 @@
     "java.debugger.configuration.enableRunDebugCodeLens.description": "在main方法上启用CodeLens标记。",
     "java.debugger.configuration.forceBuildBeforeLaunch": "在启动java程序之前强制编译整个工作空间。如果“java.autobuild.enabled”被禁掉，则会忽略该设置，在运行之前强制执行一次编译。",
     "java.debugger.configuration.console": "指定的控制台用于启动Java程序。如果要为特定的调试会话自定义控制台，请修改launch.json中的“console”配置。",
+    "java.debugger.configuration.exceptionBreakpoint.exceptionTypes": "指定要中断的一组异常类型，例如 java.lang.NullPointerException。可以为捕获的异常、未捕获的异常或两者都选择一个特定的异常类型及其子类。",
+    "java.debugger.configuration.exceptionBreakpoint.allowClasses": "指定允许异常断点中断的位置。支持通配符，例如 java.，.Foo",
     "java.debugger.configuration.exceptionBreakpoint.skipClasses": "当发生异常时，跳过指定的类。你可以使用内置变量，如'$JDK'和'$Libraries'来跳过一组类，或者添加一个特定的类名表达式，如java.*，*.Foo。",
     "java.debugger.configuration.jdwp.limitOfVariablesPerJdwpRequest.description": "一次JDWP请求中可以请求的变量或字段的最大数量。该值越高，在展开变量视图时，请求debuggee的频率就越低。同时数量过大也会导致JDWP请求超时。",
     "java.debugger.configuration.jdwp.requestTimeout.description": "调试器与目标JVM通信时JDWP请求的超时时间（ms）。",

src/configurationProvider.ts

@@ -779,6 +779,8 @@ async function updateDebugSettings(event?: vscode.ConfigurationChangeEvent) {
                 skipConstructors: debugSettingsRoot.settings.stepping.skipConstructors,
             };
             const exceptionFilters = {
+                exceptionTypes: debugSettingsRoot.settings.exceptionBreakpoint.exceptionTypes,
+                allowClasses: debugSettingsRoot.settings.exceptionBreakpoint.allowClasses,
                 skipClasses: await substituteFilterVariables(debugSettingsRoot.settings.exceptionBreakpoint.skipClasses),
             };
 
@@ -793,7 +795,10 @@ async function updateDebugSettings(event?: vscode.ConfigurationChangeEvent) {
                     javaHome,
                     stepFilters,
                     exceptionFilters,
-                    exceptionFiltersUpdated: event && event.affectsConfiguration("java.debug.settings.exceptionBreakpoint.skipClasses"),
+                    exceptionFiltersUpdated: event &&
+                        (event.affectsConfiguration("java.debug.settings.exceptionBreakpoint.skipClasses")
+                        || event.affectsConfiguration("java.debug.settings.exceptionBreakpoint.allowClasses")
+                        || event.affectsConfiguration("java.debug.settings.exceptionBreakpoint.exceptionTypes")),
                     limitOfVariablesPerJdwpRequest: Math.max(debugSettingsRoot.settings.jdwp.limitOfVariablesPerJdwpRequest, 1),
                     jdwpRequestTimeout: Math.max(debugSettingsRoot.settings.jdwp.requestTimeout, 100),
                     asyncJDWP,