diff options
Diffstat (limited to 'plugins/devkit/src/projectRoots/IdeaJdk.java')
-rw-r--r-- | plugins/devkit/src/projectRoots/IdeaJdk.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/plugins/devkit/src/projectRoots/IdeaJdk.java b/plugins/devkit/src/projectRoots/IdeaJdk.java index 1539a893dbad..a5fabf928c5d 100644 --- a/plugins/devkit/src/projectRoots/IdeaJdk.java +++ b/plugins/devkit/src/projectRoots/IdeaJdk.java @@ -86,6 +86,15 @@ public class IdeaJdk extends JavaDependentSdkType implements JavaSdkType { return PathManager.getHomePath().replace(File.separatorChar, '/'); } + @Override + public String adjustSelectedSdkHome(String homePath) { + if (SystemInfo.isMac) { + File home = new File(homePath, "Contents"); + if (home.exists()) return home.getPath(); + } + return super.adjustSelectedSdkHome(homePath); + } + public boolean isValidSdkHome(String path) { if (isFromIDEAProject(path)) { return true; @@ -153,6 +162,9 @@ public class IdeaJdk extends JavaDependentSdkType implements JavaSdkType { else if (new File(sdkHome, "license/AppCode_license.txt").exists()) { productName = "AppCode "; } + else if (new File(sdkHome, "license/CLion_Preview_License.txt").exists()) { + productName = "CLion "; + } else { productName = "IDEA "; } |