From b559ead9ad9738c7acba568bebe36046708e22a2 Mon Sep 17 00:00:00 2001
From: Svata Dedic <svatopluk.dedic@oracle.com>
Date: Wed, 7 Feb 2024 11:14:42 +0100
Subject: [PATCH 1/2] Re-enable debug/line information into gradle tooling
 plugin

---
 extide/gradle/netbeans-gradle-tooling/build.gradle | 1 +
 extide/gradle/netbeans-gradle-tooling/build.xml    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/extide/gradle/netbeans-gradle-tooling/build.gradle b/extide/gradle/netbeans-gradle-tooling/build.gradle
index 6ed7b10e7357..b6a0cade9db9 100644
--- 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
index c9a38495b174..7c994be3b7f3 100644
--- 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">

From 80b2d73899e6f0f7a46439cf86e48283a48ee913 Mon Sep 17 00:00:00 2001
From: Svata Dedic <svatopluk.dedic@oracle.com>
Date: Wed, 7 Feb 2024 11:15:18 +0100
Subject: [PATCH 2/2] Use just shell-permitted characters in debug env vars

---
 java/java.lsp.server/vscode/src/nbcode.ts       | 4 ++--
 java/java.lsp.server/vscode/src/test/runTest.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/java.lsp.server/vscode/src/nbcode.ts b/java/java.lsp.server/vscode/src/nbcode.ts
index 3344324ef8ce..0450aa5bd126 100644
--- 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
index cb972cd719f1..97e25bd60915 100644
--- 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',