From b8ecedc7cad84109e94f034f969dd0b955aaede5 Mon Sep 17 00:00:00 2001 From: Jinbo Wang Date: Fri, 30 Jun 2023 10:45:51 +0800 Subject: [PATCH] Enable debug support on decompiled source by default & prepare 0.52.0 release (#1358) --- CHANGELOG.md | 4 ++++ README.md | 1 + package-lock.json | 4 ++-- package.json | 7 +++---- package.nls.json | 2 +- package.nls.zh-cn.json | 2 +- src/configurationProvider.ts | 5 ----- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28effdb1..82d70c71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to the "vscode-java-debugger" extension will be documented i The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 0.52.0 - 2023-06-30 +### Added +- Use the setting `java.debug.settings.debugSupportOnDecompiledSource` to enable/disable debugging support on the decompiled source code. This feature requires [Language Support for Java by Red Hat](https://marketplace.visualstudio.com/items?itemName=redhat.java)@1.20.0 or higher. See [#1356](https://github.com/microsoft/vscode-java-debug/pull/1356). + ## 0.51.0 - 2023-05-31 ### Fixed - NPE when adding lambda breakpoints in reactive projects. See [java-debug#477](https://github.com/microsoft/java-debug/issues/477). Thanks to [Gayan Perera](https://github.com/gayanper) for contribution. diff --git a/README.md b/README.md index bd95280c..68b35b50 100644 --- a/README.md +++ b/README.md @@ -157,6 +157,7 @@ Please also check the documentation of [Language Support for Java by Red Hat](ht - `on` - `off` - `java.debug.settings.vmArgs`: The default VM arguments to launch the Java program. Eg. Use '-Xmx1G -ea' to increase the heap size to 1GB and enable assertions. If you want to customize the VM arguments for a specific debug session, please modify the 'vmArgs' config in launch.json. +- `java.debug.settings.debugSupportOnDecompiledSource`: [Experimental]: Enable debugging support on the decompiled source code. Be aware that this feature may affect the loading speed of Call Stack Viewlet. You also need [Language Support for Java by Red Hat](https://marketplace.visualstudio.com/items?itemName=redhat.java)@1.20.0 or higher to use this feature. - `java.silentNotification`: Controls whether notifications can be used to report progress. If true, use status bar to report progress instead. Defaults to `false`. > Pro Tip: The documentation [Configuration.md](https://github.com/microsoft/vscode-java-debug/blob/master/Configuration.md) provides lots of samples to demonstrate how to use these debug configurations, recommend to take a look. diff --git a/package-lock.json b/package-lock.json index c30140f0..f1f7a9f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-java-debug", - "version": "0.51.0", + "version": "0.52.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-java-debug", - "version": "0.51.0", + "version": "0.52.0", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "compare-versions": "^4.1.4", diff --git a/package.json b/package.json index ad86596c..3c310ebf 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-java-debug", "displayName": "Debugger for Java", "description": "A lightweight Java debugger for Visual Studio Code", - "version": "0.51.0", + "version": "0.52.0", "publisher": "vscjava", "preview": true, "aiKey": "67d4461e-ccba-418e-8082-1bd0acfe8516", @@ -52,7 +52,7 @@ } ], "javaExtensions": [ - "./server/com.microsoft.java.debug.plugin-0.46.0.jar" + "./server/com.microsoft.java.debug.plugin-0.47.0.jar" ], "commands": [ { @@ -970,12 +970,11 @@ "java.debug.settings.debugSupportOnDecompiledSource": { "type": "string", "enum": [ - "auto", "on", "off" ], "description": "%java.debugger.configuration.debugSupportOnDecompiledSource.description%", - "default": "auto" + "default": "on" }, "java.silentNotification": { "type": "boolean", diff --git a/package.nls.json b/package.nls.json index 46fa7078..e9f9af0a 100644 --- a/package.nls.json +++ b/package.nls.json @@ -73,5 +73,5 @@ "java.debugger.configuration.vmArgs.description": "The default VM arguments to launch the Java program. Eg. Use '-Xmx1G -ea' to increase the heap size to 1GB and enable assertions. If you want to customize the VM arguments for a specific debug session, please modify the 'vmArgs' config in launch.json.", "java.debugger.configuration.silentNotification": "Controls whether notifications can be used to report progress. If true, use status bar to report progress instead.", "java.debugger.configuration.jdwp.async.description": "Experimental: Controls whether the debugger is allowed to send JDWP commands asynchronously. Async mode can improve remote debugging response speed on high-latency networks.", - "java.debugger.configuration.debugSupportOnDecompiledSource.description": "[Experimental]: Enable debugging support on the decompiled source code. When set to 'auto', this feature will be automatically enabled in Visual Studio Code - Insiders. Be aware that this feature may affect the loading speed of Call Stack Viewlet." + "java.debugger.configuration.debugSupportOnDecompiledSource.description": "[Experimental]: Enable debugging support on the decompiled source code. Be aware that this feature may affect the loading speed of Call Stack Viewlet." } diff --git a/package.nls.zh-cn.json b/package.nls.zh-cn.json index 051f69b6..3b46d645 100644 --- a/package.nls.zh-cn.json +++ b/package.nls.zh-cn.json @@ -70,5 +70,5 @@ "java.debugger.configuration.vmArgs.description": "启动Java程序的默认VM参数。例如，使用'-Xmx1G -ea'将堆大小增加到1GB并启用断言。如果要为特定的调试会话定制VM参数，请修改launch.json中的'vmArgs'配置。", "java.debugger.configuration.silentNotification": "控制是否可以使用通知来报告进度。如果为真，则使用状态栏来报告进度。", "java.debugger.configuration.jdwp.async.description": "实验性的：控制是否允许调试器以异步方式发送JDWP命令。异步模式可以提高高延迟网络上的远程调试响应速度。", - "java.debugger.configuration.debugSupportOnDecompiledSource.description": "[实验性的]: 在反编译的源代码上启用调试支持。当设置为'auto'时，该功能将在Visual Studio Code - Insiders中自动启用。请注意，该功能可能会影响Call Stack试图的加载速度。" + "java.debugger.configuration.debugSupportOnDecompiledSource.description": "[实验性的]: 在反编译的源代码上启用调试支持。请注意，该功能可能会影响Call Stack试图的加载速度。" } \ No newline at end of file diff --git a/src/configurationProvider.ts b/src/configurationProvider.ts index 7aca3ced..7d7ef910 100644 --- a/src/configurationProvider.ts +++ b/src/configurationProvider.ts @@ -785,10 +785,6 @@ async function updateDebugSettings(event?: vscode.ConfigurationChangeEvent) { }; const asyncJDWP: string = debugSettingsRoot.settings.jdwp.async; - let debugSupportOnDecompiledSource: string = debugSettingsRoot.settings.debugSupportOnDecompiledSource; - if (debugSupportOnDecompiledSource === 'auto') { - debugSupportOnDecompiledSource = vscode.version.includes("insider") ? "on" : "off"; - } const settings = await commands.executeJavaLanguageServerCommand(commands.JAVA_UPDATE_DEBUG_SETTINGS, JSON.stringify( { ...debugSettingsRoot.settings, @@ -803,7 +799,6 @@ async function updateDebugSettings(event?: vscode.ConfigurationChangeEvent) { limitOfVariablesPerJdwpRequest: Math.max(debugSettingsRoot.settings.jdwp.limitOfVariablesPerJdwpRequest, 1), jdwpRequestTimeout: Math.max(debugSettingsRoot.settings.jdwp.requestTimeout, 100), asyncJDWP, - debugSupportOnDecompiledSource, })); if (logLevel === "FINE") { // tslint:disable-next-line:no-console