From c387faa3f6a6fa51f4a7cc251e80173780adb01d Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Mon, 15 Sep 2025 13:49:05 +0200 Subject: [PATCH] [multiple] Cleanup: use case null GitOrigin-RevId: da8a48447029016c410d7f6886c3888c6bd06171 --- grid/impl/src/datagrid/GridUtil.java | 2 +- .../codeInspection/dataFlow/HardcodedContracts.java | 3 +-- .../codeInspection/dataFlow/TypeConstraints.java | 3 +-- .../SimplifyStreamApiCallChainsInspection.java | 3 +-- .../WrapWithMutableCollectionFix.java | 3 +-- .../controlflow/ExcessiveRangeCheckInspection.java | 3 +-- .../service/execution/ExternalSystemJdkUtil.java | 2 +- .../impl/DefaultIntentionsOrderProvider.java | 3 +-- .../ide/plugins/PluginManagerConfigurable.java | 13 +++++++++---- .../execution/testframework/ui/TestStatusLine.java | 3 +-- .../src/com/intellij/tasks/trac/TracRepository.java | 3 +-- 11 files changed, 19 insertions(+), 22 deletions(-) diff --git a/grid/impl/src/datagrid/GridUtil.java b/grid/impl/src/datagrid/GridUtil.java index 7d22c8aaafe2..46ba74677c1b 100644 --- a/grid/impl/src/datagrid/GridUtil.java +++ b/grid/impl/src/datagrid/GridUtil.java @@ -463,8 +463,8 @@ public class GridUtil extends GridUtilCore { } public static @Nullable CellAttributesKey getMutationCellAttributes(@Nullable MutationType type) { - if (type == null) return null; return switch (type) { + case null -> null; case MODIFY -> CellColors.REPLACE; case INSERT -> CellColors.INSERT; case DELETE -> CellColors.REMOVE; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/HardcodedContracts.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/HardcodedContracts.java index 6ec950df18e8..9b01044010bd 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/HardcodedContracts.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/HardcodedContracts.java @@ -504,7 +504,6 @@ public final class HardcodedContracts { if (!(expr instanceof PsiMethodCallExpression call)) return null; String calledName = call.getMethodExpression().getReferenceName(); PsiExpression[] args = call.getArgumentList().getExpressions(); - if (calledName == null) return null; return switch (calledName) { case "array", "arrayWithSize", "arrayContaining", "arrayContainingInAnyOrder", "contains", "containsInAnyOrder", "containsString", "endsWith", "startsWith", "stringContainsInOrder", "empty", "emptyArray", "emptyCollectionOf", "emptyIterable", "emptyIterableOf", @@ -531,7 +530,7 @@ public final class HardcodedContracts { } yield null; } - default -> null; + case null, default -> null; }; } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/TypeConstraints.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/TypeConstraints.java index 804d5dbfb3f2..b13324e3ee70 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/TypeConstraints.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/TypeConstraints.java @@ -357,7 +357,6 @@ public final class TypeConstraints { @Override public DfType getUnboxedType() { String name = classDef.getQualifiedName(); - if (name == null) return DfType.BOTTOM; return switch (name) { case JAVA_LANG_BOOLEAN -> DfTypes.BOOLEAN; case JAVA_LANG_INTEGER -> DfTypes.INT; @@ -367,7 +366,7 @@ public final class TypeConstraints { case JAVA_LANG_BYTE -> DfTypes.intRange(Objects.requireNonNull(JvmPsiRangeSetUtil.typeRange(PsiTypes.byteType()))); case JAVA_LANG_SHORT -> DfTypes.intRange(Objects.requireNonNull(JvmPsiRangeSetUtil.typeRange(PsiTypes.shortType()))); case JAVA_LANG_CHARACTER -> DfTypes.intRange(Objects.requireNonNull(JvmPsiRangeSetUtil.typeRange(PsiTypes.charType()))); - default -> DfType.BOTTOM; + case null, default -> DfType.BOTTOM; }; } diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java index 998bff3028be..f0219170e996 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java @@ -1584,12 +1584,11 @@ public final class SimplifyStreamApiCallChainsInspection extends AbstractBaseJav private static String getStreamClassName(@NotNull PsiMethodCallExpression call) { String name = MethodCallUtils.getMethodName(call); - if (name == null) return JAVA_UTIL_STREAM_STREAM; return switch (name) { case "mapToInt" -> JAVA_UTIL_STREAM_INT_STREAM; case "mapToLong" -> JAVA_UTIL_STREAM_LONG_STREAM; case "mapToDouble" -> JAVA_UTIL_STREAM_DOUBLE_STREAM; - default -> JAVA_UTIL_STREAM_STREAM; + case null, default -> JAVA_UTIL_STREAM_STREAM; }; } } diff --git a/java/java-impl/src/com/intellij/codeInspection/WrapWithMutableCollectionFix.java b/java/java-impl/src/com/intellij/codeInspection/WrapWithMutableCollectionFix.java index 73c10f0cad9e..548fe45d1238 100644 --- a/java/java-impl/src/com/intellij/codeInspection/WrapWithMutableCollectionFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/WrapWithMutableCollectionFix.java @@ -91,13 +91,12 @@ public class WrapWithMutableCollectionFix extends PsiUpdateModCommandQuickFix { PsiClass aClass = ((PsiClassType)type).resolve(); if (aClass == null) return null; String name = aClass.getQualifiedName(); - if (name == null) return null; return switch (name) { case CommonClassNames.JAVA_LANG_ITERABLE, CommonClassNames.JAVA_UTIL_COLLECTION, CommonClassNames.JAVA_UTIL_LIST -> CommonClassNames.JAVA_UTIL_ARRAY_LIST; case CommonClassNames.JAVA_UTIL_SET -> CommonClassNames.JAVA_UTIL_HASH_SET; case CommonClassNames.JAVA_UTIL_MAP -> CommonClassNames.JAVA_UTIL_HASH_MAP; - default -> null; + case null, default -> null; }; } } diff --git a/java/java-impl/src/com/siyeh/ig/controlflow/ExcessiveRangeCheckInspection.java b/java/java-impl/src/com/siyeh/ig/controlflow/ExcessiveRangeCheckInspection.java index d92ef8c5f7c5..f41321aa2b89 100644 --- a/java/java-impl/src/com/siyeh/ig/controlflow/ExcessiveRangeCheckInspection.java +++ b/java/java-impl/src/com/siyeh/ig/controlflow/ExcessiveRangeCheckInspection.java @@ -168,12 +168,11 @@ public final class ExcessiveRangeCheckInspection extends AbstractBaseJavaLocalIn } @NonNls String getExpressionSuffix() { - if (myField == null) return ""; return switch (myField) { case ARRAY_LENGTH -> ".length"; case STRING_LENGTH -> ".length()"; case COLLECTION_SIZE -> ".size()"; - default -> ""; + case null, default -> ""; }; } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemJdkUtil.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemJdkUtil.java index 29f3ddf7e3eb..5c99a6a2bb16 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemJdkUtil.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemJdkUtil.java @@ -51,8 +51,8 @@ public final class ExternalSystemJdkUtil { @Contract("_, null -> null") public static @Nullable Sdk resolveJdkName(@Nullable Sdk projectSdk, @Nullable String jdkName) throws ExternalSystemJdkException { - if (jdkName == null) return null; return switch (jdkName) { + case null -> null; case USE_INTERNAL_JAVA -> getInternalJdk(); case USE_PROJECT_JDK -> { if (projectSdk == null) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/DefaultIntentionsOrderProvider.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/DefaultIntentionsOrderProvider.java index 92987d7718da..232eda6f86ae 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/DefaultIntentionsOrderProvider.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/DefaultIntentionsOrderProvider.java @@ -50,13 +50,12 @@ public final class DefaultIntentionsOrderProvider implements IntentionsOrderProv } public static int getPriorityWeight(@Nullable Priority priority) { - if (priority == null) return 0; return switch (priority) { case TOP -> 20; case HIGH -> 3; case LOW -> -3; case BOTTOM -> -20; - default -> 0; + case null, default -> 0; }; } } diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java index 6c4ba923e1b5..830601106437 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java @@ -13,7 +13,6 @@ import com.intellij.ide.plugins.enums.PluginsGroupType; import com.intellij.ide.plugins.enums.SortBy; import com.intellij.ide.plugins.marketplace.CheckErrorsResult; import com.intellij.ide.plugins.marketplace.PluginSearchResult; -import com.intellij.ide.plugins.newui.UiPluginManager; import com.intellij.ide.plugins.marketplace.ranking.MarketplaceLocalRanker; import com.intellij.ide.plugins.marketplace.statistics.PluginManagerUsageCollector; import com.intellij.ide.plugins.newui.*; @@ -41,7 +40,10 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopupListener; import com.intellij.openapi.ui.popup.LightweightWindowEvent; -import com.intellij.openapi.updateSettings.impl.*; +import com.intellij.openapi.updateSettings.impl.PluginAutoUpdateListener; +import com.intellij.openapi.updateSettings.impl.PluginAutoUpdateService; +import com.intellij.openapi.updateSettings.impl.UpdateOptions; +import com.intellij.openapi.updateSettings.impl.UpdateSettings; import com.intellij.openapi.updateSettings.impl.pluginsAdvertisement.FUSEventSource; import com.intellij.openapi.updateSettings.impl.pluginsAdvertisement.PluginsAdvertiserStartupActivityKt; import com.intellij.openapi.util.Disposer; @@ -50,7 +52,10 @@ import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.text.HtmlChunk; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.ui.*; +import com.intellij.ui.GotItTooltip; +import com.intellij.ui.JBColor; +import com.intellij.ui.RelativeFont; +import com.intellij.ui.SimpleTextAttributes; import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.components.JBTextField; import com.intellij.ui.components.fields.ExtendableTextComponent; @@ -681,7 +686,6 @@ public final class PluginManagerConfigurable @Override protected @Nullable List getValues(@NotNull String attribute) { SearchWords word = SearchWords.find(attribute); - if (word == null) return null; return switch (word) { case TAG -> { if (myTagsSorted == null || myTagsSorted.isEmpty()) { @@ -723,6 +727,7 @@ public final class PluginManagerConfigurable } case REPOSITORY -> RepositoryHelper.getCustomPluginRepositoryHosts(); case INTERNAL, SUGGESTED, STAFF_PICKS -> null; + case null -> null; }; } diff --git a/platform/testRunner/src/com/intellij/execution/testframework/ui/TestStatusLine.java b/platform/testRunner/src/com/intellij/execution/testframework/ui/TestStatusLine.java index 5906f887cefc..b7fbb6f5b85c 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/ui/TestStatusLine.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/ui/TestStatusLine.java @@ -68,11 +68,10 @@ public class TestStatusLine extends NonOpaquePanel { myConverter = new HtmlToSimpleColoredComponentConverter((tag, attr) -> { final String className = (String) attr.getAttribute(HTML.Attribute.CLASS); - if (className == null) return SimpleTextAttributes.REGULAR_ATTRIBUTES; return switch (className) { case "failed" -> FAILED_ATTRIBUTES; case "ignored" -> IGNORED_ATTRIBUTES; - default -> SimpleTextAttributes.REGULAR_ATTRIBUTES; + case null, default -> SimpleTextAttributes.REGULAR_ATTRIBUTES; }; }); } diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepository.java index 7e93faf791f8..40049014155c 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepository.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepository.java @@ -139,12 +139,11 @@ public class TracRepository extends BaseRepositoryImpl { @Override public @NotNull TaskType getType() { String type = map.get("type"); - if (type == null) return TaskType.OTHER; return switch (type) { case "Feature", "enhancement" -> TaskType.FEATURE; case "Bug", "defect", "error" -> TaskType.BUG; case "Exception" -> TaskType.EXCEPTION; - default -> TaskType.OTHER; + case null, default -> TaskType.OTHER; }; }