From fcf688ffa3fcdecc5a106195614be07aa04d241c Mon Sep 17 00:00:00 2001 From: Sergey Stoyanovsky Date: Tue, 15 Sep 2020 03:10:51 +0300 Subject: [PATCH] RUBY-26995 Add support for local SDKs with custom commandline configurators This is a re-commit of the reverted original ones 7d5123a135f2080a72809babe8d9a3c649604e6b 997629443f33f7f4e28ea0f222401fa0bf818e60 supplemented with a few javadocs GitOrigin-RevId: 9c01f0cb1afb146da085507934b2d18c562fa04c --- .../openapi/projectRoots/impl/SdkConfigurationUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java index 6fc4d16cfd11..d6b4c56a90b5 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java @@ -327,8 +327,7 @@ public final class SdkConfigurationUtil { return result; } - @Nullable - private static Sdk findByPath(@NotNull SdkType sdkType, Sdk @NotNull [] sdks, @NotNull String sdkHome) { + private static @Nullable Sdk findByPath(@NotNull SdkType sdkType, Sdk @NotNull [] sdks, @NotNull String sdkHome) { for (Sdk sdk : sdks) { final String path = sdk.getHomePath(); if (sdk.getSdkType() == sdkType && path != null &&