From 1f3ac8da092dd28e0ad95dc301bb8b302e7c650c Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 4 Sep 2018 11:00:50 +0200
Subject: [PATCH] Don't give any preference to LTS JDK versions because LTS is
 not really a thing (IDEA-CR-31972)

---
 .../impl/DefaultJdkConfigurator.java          | 13 ++------
 .../openapi/projectRoots/JavaSdkVersion.java  | 32 ++++++++-----------
 2 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/DefaultJdkConfigurator.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/DefaultJdkConfigurator.java
index 369d117dbe76..7a9e50165a62 100644
--- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/DefaultJdkConfigurator.java
+++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/DefaultJdkConfigurator.java
@@ -5,10 +5,8 @@ import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.BaseComponent;
 import com.intellij.openapi.projectRoots.JavaSdk;
-import com.intellij.openapi.projectRoots.JavaSdkVersion;
 import com.intellij.openapi.projectRoots.ProjectJdkTable;
 import com.intellij.openapi.projectRoots.Sdk;
-import com.intellij.util.containers.ContainerUtil;
 
 import java.util.Collection;
 import java.util.List;
@@ -31,23 +29,16 @@ public class DefaultJdkConfigurator implements BaseComponent {
     if (jdks.isEmpty()) {
       Collection<String> homePaths = myJavaSdk.suggestHomePaths();
       if (homePaths.isEmpty()) return;
-      String homePath = ContainerUtil.find(homePaths, path -> isLTS(path));
-      if (homePath == null) homePath = homePaths.iterator().next();
+      String homePath = homePaths.iterator().next();
       if (homePath != null && myJavaSdk.isValidSdkHome(homePath)) {
         String suggestedName = myJavaSdk.suggestSdkName(null, homePath);
         if (suggestedName != null) {
-          String finalHomePath = homePath;
           ApplicationManager.getApplication().runWriteAction(() ->
-            myProjectJdkTable.addJdk(myJavaSdk.createJdk(suggestedName, finalHomePath, false))
+            myProjectJdkTable.addJdk(myJavaSdk.createJdk(suggestedName, homePath, false))
           );
         }
       }
     }
     myPropertiesComponent.setValue("defaultJdkConfigured", true);
   }
-
-  private static boolean isLTS(String path) {
-    JavaSdkVersion version = JavaSdkVersion.fromVersionString(path);
-    return version != null && version.isLongTermSupport();
-  }
 }
diff --git a/java/java-psi-api/src/com/intellij/openapi/projectRoots/JavaSdkVersion.java b/java/java-psi-api/src/com/intellij/openapi/projectRoots/JavaSdkVersion.java
index 9d1a916918fd..52fc09272b57 100644
--- a/java/java-psi-api/src/com/intellij/openapi/projectRoots/JavaSdkVersion.java
+++ b/java/java-psi-api/src/com/intellij/openapi/projectRoots/JavaSdkVersion.java
@@ -15,25 +15,23 @@ import java.util.Arrays;
  * @see LanguageLevel
  */
 public enum JavaSdkVersion {
-  JDK_1_0(LanguageLevel.JDK_1_3, false),
-  JDK_1_1(LanguageLevel.JDK_1_3, false),
-  JDK_1_2(LanguageLevel.JDK_1_3, false),
-  JDK_1_3(LanguageLevel.JDK_1_3, false),
-  JDK_1_4(LanguageLevel.JDK_1_4, false),
-  JDK_1_5(LanguageLevel.JDK_1_5, false),
-  JDK_1_6(LanguageLevel.JDK_1_6, false),
-  JDK_1_7(LanguageLevel.JDK_1_7, false),
-  JDK_1_8(LanguageLevel.JDK_1_8, true),
-  JDK_1_9(LanguageLevel.JDK_1_9, false),
-  JDK_10(LanguageLevel.JDK_10, false),
-  JDK_11(LanguageLevel.JDK_11, true);
+  JDK_1_0(LanguageLevel.JDK_1_3),
+  JDK_1_1(LanguageLevel.JDK_1_3),
+  JDK_1_2(LanguageLevel.JDK_1_3),
+  JDK_1_3(LanguageLevel.JDK_1_3),
+  JDK_1_4(LanguageLevel.JDK_1_4),
+  JDK_1_5(LanguageLevel.JDK_1_5),
+  JDK_1_6(LanguageLevel.JDK_1_6),
+  JDK_1_7(LanguageLevel.JDK_1_7),
+  JDK_1_8(LanguageLevel.JDK_1_8),
+  JDK_1_9(LanguageLevel.JDK_1_9),
+  JDK_10(LanguageLevel.JDK_10),
+  JDK_11(LanguageLevel.JDK_11);
 
   private final LanguageLevel myMaxLanguageLevel;
-  private final boolean myLongTermSupport;
 
-  JavaSdkVersion(LanguageLevel maxLanguageLevel, boolean longTermSupport) {
+  JavaSdkVersion(LanguageLevel maxLanguageLevel) {
     myMaxLanguageLevel = maxLanguageLevel;
-    myLongTermSupport = longTermSupport;
   }
 
   @NotNull
@@ -41,10 +39,6 @@ public enum JavaSdkVersion {
     return myMaxLanguageLevel;
   }
 
-  public boolean isLongTermSupport() {
-    return myLongTermSupport;
-  }
-
   @NotNull
   public String getDescription() {
     int feature = ordinal();