MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

instead of filtering user-specified path options, issue a 'possible conflict' warning and apply the option (IDEA-245707)

Browse Source 
GitOrigin-RevId: bc9439247e1d5f02201c9ff631b135bba378b333
This commit is contained in:
Eugene Zhuravlev
2020-07-20 10:11:15 +00:00
committed by intellij-monorepo-bot
parent 7beb9b4cd1
commit bd6468726d
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
+18 -8
View File
@@ -54,7 +54,8 @@ import org.jetbrains.jps.model.serialization.PathMacroUtil;
import org.jetbrains.jps.service.JpsServiceManager;
import org.jetbrains.jps.service.SharedThreadPool;
import javax.tools.*;
import javax.tools.Diagnostic;
import javax.tools.JavaFileObject;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
@@ -92,17 +93,17 @@ public final class JavaBuilder extends ModuleLevelBuilder {
private static final List<String> COMPILABLE_EXTENSIONS = Collections.singletonList(JAVA_EXTENSION);
private static final Set<String> FILTERED_OPTIONS = ContainerUtil.newHashSet(
"-target", "--release",
"--boot-class-path", "-bootclasspath",
"--class-path", "-classpath", "-cp",
"-processorpath", "-sourcepath",
"-d",
"--module-path", "-p", "--module-source-path"
"-target", "--release", "-d"
);
private static final Set<String> FILTERED_SINGLE_OPTIONS = ContainerUtil.newHashSet(
"-g", "-deprecation", "-nowarn", "-verbose", "-proc:none", "-proc:only", "-proceedOnError"
);
private static final Set<String> POSSIBLY_CONFLICTING_OPTIONS = ContainerUtil.newHashSet(
"--boot-class-path", "-bootclasspath",
"--class-path", "-classpath", "-cp",
"-processorpath", "-sourcepath",
"--module-path", "-p", "--module-source-path"
);
private static final List<ClassPostProcessor> ourClassProcessors = new ArrayList<>();
private static final Set<JpsModuleType<?>> ourCompilableModuleTypes = new HashSet<>();
@@ -825,6 +826,9 @@ public final class JavaBuilder extends ModuleLevelBuilder {
}
else {
if (!FILTERED_SINGLE_OPTIONS.contains(userOption)) {
if (POSSIBLY_CONFLICTING_OPTIONS.contains(userOption)) {
notifyOptionPossibleConflicts(context, userOption, chunk);
}
if (userOption.startsWith("-J-")) {
vmOptions.add(userOption.substring("-J".length()));
}
@@ -848,6 +852,12 @@ public final class JavaBuilder extends ModuleLevelBuilder {
return pair(vmOptions, compilationOptions);
}
private static void notifyOptionPossibleConflicts(CompileContext context, String option, ModuleChunk chunk) {
context.processMessage(new CompilerMessage(BUILDER_NAME, BuildMessage.Kind.JPS_INFO,
"User-specified option \"" + option + "\" for \"" + chunk.getPresentableShortName() + "\" may conflict with the corresponding option calculated automatically according to project settings."
));
}
private static void notifyOptionIgnored(CompileContext context, String option, ModuleChunk chunk) {
context.processMessage(new CompilerMessage(BUILDER_NAME, BuildMessage.Kind.JPS_INFO,
"User-specified option \"" + option + "\" is ignored for \"" + chunk.getPresentableShortName() + "\". This compilation parameter is set automatically according to project settings."