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

introduce constant

Browse Source 
GitOrigin-RevId: ab312b9537801ac78a6aae5a64b38bb48be22840
This commit is contained in:
Eugene Zhuravlev
2019-05-17 20:02:10 +03:00
committed by intellij-monorepo-bot
parent fab979e66a
commit 9b141c3a5d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
+3 -2
View File
@@ -84,6 +84,7 @@ public class JavaBuilder extends ModuleLevelBuilder {
public static final Key<Boolean> IS_ENABLED = Key.create("_java_compiler_enabled_");
public static final FileFilter JAVA_SOURCES_FILTER = FileFilters.withExtension(JAVA_EXTENSION);
private static final int RETIRE_POLICY_VERSIONS_COUNT = 5;
private static final Key<Boolean> PREFER_TARGET_JDK_COMPILER = GlobalContextKey.create("_prefer_target_jdk_javac_");
private static final Key<JavaCompilingTool> COMPILING_TOOL = Key.create("_java_compiling_tool_");
private static final Key<ConcurrentMap<String, Collection<String>>> COMPILER_USAGE_STATISTICS = Key.create("_java_compiler_usage_stats_");
@@ -603,7 +604,7 @@ public class JavaBuilder extends ModuleLevelBuilder {
// compiler version is 9+ here, so:
// - java 5 and older are not supported for sure
// - applying '5 versions back' policy deduced from the current behavior of those JDKs
return chunkLanguageLevel < 6 || Math.abs(compilerSdkVersion - chunkLanguageLevel) > 5;
return chunkLanguageLevel < 6 || Math.abs(compilerSdkVersion - chunkLanguageLevel) > RETIRE_POLICY_VERSIONS_COUNT;
}
private static boolean isJavac(final JavaCompilingTool compilingTool) {
@@ -1026,7 +1027,7 @@ public class JavaBuilder extends ModuleLevelBuilder {
final Pair<JpsSdk<JpsDummyElement>, Integer> sdkVersionPair = getAssociatedSdk(chunk);
if (sdkVersionPair != null) {
final int sdkVersion = sdkVersionPair.second;
if (sdkVersion >= 6 && (sdkVersion < 9 || Math.abs(sdkVersion - targetLanguageLevel) <= 5)) {
if (sdkVersion >= 6 && (sdkVersion < 9 || Math.abs(sdkVersion - targetLanguageLevel) <= RETIRE_POLICY_VERSIONS_COUNT)) {
// current javac compiler does support required language level
return pair(sdkVersionPair.first.getHomePath(), sdkVersion);
}