Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debugging fixes #7038

Merged
merged 2 commits into from
Feb 7, 2024
Merged

Debugging fixes #7038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b559ead
Re-enable debug/line information into gradle tooling plugin
sdedic Feb 7, 2024
80b2d73
Use just shell-permitted characters in debug env vars
sdedic Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions extide/gradle/netbeans-gradle-tooling/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion extide/gradle/netbeans-gradle-tooling/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions java/java.lsp.server/vscode/src/nbcode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))) {
Expand Down
2 changes: 1 addition & 1 deletion java/java.lsp.server/vscode/src/test/runTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading