Prototype for eclipse-jdt#1448

akurtakov · Jun 27, 2024 · 3fdfb39 · 3fdfb39
1 parent 5162902
commit 3fdfb39
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathSupport.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathSupport.java
@@ -39,6 +39,7 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 
+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
 import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
 import org.eclipse.jdt.internal.corext.util.Messages;
 
@@ -422,6 +423,16 @@ public static Map<String, String> getEEOptions(IExecutionEnvironment ee) {
 		String complianceOption= eeOptions.get(JavaCore.COMPILER_COMPLIANCE);
 		if (complianceOption == null)
 			return null;
+		String latestCompilerVersion= CompilerOptions.getLatestVersion();
+		if (Integer.parseInt(latestCompilerVersion) < Integer.parseInt(complianceOption)) {
+			eeOptions.put(JavaCore.COMPILER_COMPLIANCE, latestCompilerVersion);
+			if(eeOptions.containsKey(JavaCore.COMPILER_SOURCE)) {
+				eeOptions.put(JavaCore.COMPILER_SOURCE, latestCompilerVersion);
+			}
+			if(eeOptions.containsKey(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM)) {
+				eeOptions.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, latestCompilerVersion);
+			}
+		}
 
 		// eeOptions can miss some options, make sure they are complete:
 		HashMap<String, String> options= new HashMap<>();