Merge pull request #7038 from sdedic/sdedic/fix-gradle-nbls-debugging

Debugging fixes
apache · Feb 7, 2024 · 1ad003c · 1ad003c
2 parents 8a08acc + 80b2d73
commit 1ad003c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/extide/gradle/netbeans-gradle-tooling/build.gradle b/extide/gradle/netbeans-gradle-tooling/build.gradle
@@ -23,6 +23,7 @@ mainClassName = 'org.netbeans.modules.gradle.DebugTooling'
 
 sourceCompatibility = '1.8'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+[compileJava, compileTestJava]*.options*.debug = true
 
 repositories {
     mavenCentral()

diff --git a/extide/gradle/netbeans-gradle-tooling/build.xml b/extide/gradle/netbeans-gradle-tooling/build.xml
@@ -42,7 +42,7 @@
     </target>
     <target name="compile" depends="prepare-libs">
         <mkdir dir="build/classes/java/main"/>
-        <javac srcdir="src/main/java" destdir="build/classes/java/main" classpathref="compile.classpath" release="8" includeantruntime="false"/>
+        <javac srcdir="src/main/java" destdir="build/classes/java/main" classpathref="compile.classpath" release="8" includeantruntime="false" debug="true"/>
     </target>
 
     <target name="jar" depends="compile">

diff --git a/java/java.lsp.server/vscode/src/nbcode.ts b/java/java.lsp.server/vscode/src/nbcode.ts
@@ -70,8 +70,8 @@ export function launch(
         ideArgs.push('-J-Dnetbeans.logger.console=true');
     }
     ideArgs.push(`-J-Dnetbeans.extra.dirs=${clusterPath}`)
-    if (env['netbeans.extra.options']) {
-        ideArgs.push(...env['netbeans.extra.options'].split(' '));
+    if (env['netbeans_extra_options']) {
+        ideArgs.push(...env['netbeans_extra_options'].split(' '));
     }
     ideArgs.push(...extraArgs);
     if (env['netbeans_debug'] && extraArgs && extraArgs.find(s => s.includes("--list"))) {

diff --git a/java/java.lsp.server/vscode/src/test/runTest.ts b/java/java.lsp.server/vscode/src/test/runTest.ts
@@ -52,7 +52,7 @@ async function main() {
             extensionTestsPath,
             extensionTestsEnv: {
                 'ENABLE_CONSOLE_LOG' : 'true',
-                "netbeans.extra.options" : `-J-Dproject.limitScanRoot=${outRoot} -J-Dnetbeans.logger.console=true`
+                "netbeans_extra_options" : `-J-Dproject.limitScanRoot=${outRoot} -J-Dnetbeans.logger.console=true`
             },
             launchArgs: [
                 '--disable-extensions',