Skip to content

Commit 017f362

Browse files
committed
fix bug with debug information with new compiler
1 parent 23f0aee commit 017f362

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

java-compiler-impl/src/main/java/com/intellij/compiler/impl/javaCompiler/javac/JavacSettingsBuilder.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import java.nio.charset.Charset;
2424
import java.util.ArrayList;
25-
import java.util.Collection;
2625
import java.util.List;
2726
import java.util.StringTokenizer;
2827

@@ -37,8 +36,8 @@ protected JpsJavaCompilerOptions getOptions() {
3736
return myOptions;
3837
}
3938

40-
public Collection<String> getOptions(Chunk<Module> chunk) {
41-
List<String> options = new ArrayList<String>();
39+
public List<String> getOptions(Chunk<Module> chunk) {
40+
List<String> options = new ArrayList<>();
4241
if (getOptions().DEBUGGING_INFO) {
4342
options.add("-g");
4443
}

java-compiler-impl/src/main/java/consulo/java/compiler/impl/javaCompiler/NewBackendCompilerProcessBuilder.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.intellij.compiler.impl.CompilerUtil;
44
import com.intellij.compiler.impl.ModuleChunk;
55
import com.intellij.compiler.impl.javaCompiler.javac.JavacCompiler;
6+
import com.intellij.compiler.impl.javaCompiler.javac.JavacSettingsBuilder;
67
import com.intellij.compiler.impl.javaCompiler.javac.JpsJavaCompilerOptions;
78
import com.intellij.execution.CantRunException;
89
import com.intellij.execution.ExecutionException;
@@ -147,6 +148,10 @@ private GeneralCommandLine createNewStartupCommand(ModuleChunk chunk,
147148

148149
ParametersList params = javaParameters.getProgramParametersList();
149150

151+
JavacSettingsBuilder javacSettingsBuilder = new JavacSettingsBuilder(myJavaCompilerOptions);
152+
153+
params.addAll(javacSettingsBuilder.getOptions(chunk));
154+
150155
JavacCompiler.addCommandLineOptions(compileContext, chunk, params, outputPath, jdk, version, myTempFiles, true, myAnnotationProcessorsEnabled);
151156

152157
File sourcesFile = File.createTempFile("javac", ".tmp");

0 commit comments

Comments
 (0)