From e2e68092742b331fa8e54c50f2f05f610523b4b5 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Wed, 21 Aug 2024 15:13:51 +0200 Subject: [PATCH] Java: avoid infinite loop when creating switch branches for enum with duplicate constants (IDEA-357561) GitOrigin-RevId: e9c84396786baceb58501a56d5d7e529f5ae9276 --- .../fixes/CreateEnumMissingSwitchBranchesFix.java | 4 ++-- .../enumswitch/afterDuplicateEnumConstant.java | 15 +++++++++++++++ .../enumswitch/beforeDuplicateEnumConstant.java | 9 +++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 java/java-tests/testData/ig/com/siyeh/igfixes/controlflow/enumswitch/afterDuplicateEnumConstant.java create mode 100644 java/java-tests/testData/ig/com/siyeh/igfixes/controlflow/enumswitch/beforeDuplicateEnumConstant.java diff --git a/java/java-impl/src/com/siyeh/ig/fixes/CreateEnumMissingSwitchBranchesFix.java b/java/java-impl/src/com/siyeh/ig/fixes/CreateEnumMissingSwitchBranchesFix.java index ae312740093e..ed7fc2dcb466 100644 --- a/java/java-impl/src/com/siyeh/ig/fixes/CreateEnumMissingSwitchBranchesFix.java +++ b/java/java-impl/src/com/siyeh/ig/fixes/CreateEnumMissingSwitchBranchesFix.java @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.fixes; import com.intellij.psi.*; @@ -25,7 +25,7 @@ public final class CreateEnumMissingSwitchBranchesFix extends CreateMissingSwitc @Override protected @NotNull List getAllNames(@NotNull PsiClass aClass, @NotNull PsiSwitchBlock switchBlock) { - return StreamEx.of(aClass.getAllFields()).select(PsiEnumConstant.class).map(PsiField::getName).toList(); + return StreamEx.of(aClass.getFields()).select(PsiEnumConstant.class).map(PsiField::getName).distinct().toList(); } @Override diff --git a/java/java-tests/testData/ig/com/siyeh/igfixes/controlflow/enumswitch/afterDuplicateEnumConstant.java b/java/java-tests/testData/ig/com/siyeh/igfixes/controlflow/enumswitch/afterDuplicateEnumConstant.java new file mode 100644 index 000000000000..081d910156b0 --- /dev/null +++ b/java/java-tests/testData/ig/com/siyeh/igfixes/controlflow/enumswitch/afterDuplicateEnumConstant.java @@ -0,0 +1,15 @@ +// "Create missing branches 'A', 'B', and 'C'" "true" +class Main { + enum E {A, B, C, C} + + public void f(E e) { + switch (e) { + case A -> { + } + case B -> { + } + case C -> { + } + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/ig/com/siyeh/igfixes/controlflow/enumswitch/beforeDuplicateEnumConstant.java b/java/java-tests/testData/ig/com/siyeh/igfixes/controlflow/enumswitch/beforeDuplicateEnumConstant.java new file mode 100644 index 000000000000..9153dd8135ad --- /dev/null +++ b/java/java-tests/testData/ig/com/siyeh/igfixes/controlflow/enumswitch/beforeDuplicateEnumConstant.java @@ -0,0 +1,9 @@ +// "Create missing branches 'A', 'B', and 'C'" "true" +class Main { + enum E {A, B, C, C} + + public void f(E e) { + switch (e) { + } + } +} \ No newline at end of file