From 8a2fe4dd716fe636e9a04fd536e8fa0e32443410 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Tue, 18 Feb 2020 22:50:52 +0700 Subject: [PATCH] SplitSwitchBranchWithSeveralCaseValuesAction: turn off for misplaced label statements GitOrigin-RevId: e3a4ab606e214d7fba87cb4d62b95429dabcc446 --- .../impl/SplitSwitchBranchWithSeveralCaseValuesAction.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitSwitchBranchWithSeveralCaseValuesAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitSwitchBranchWithSeveralCaseValuesAction.java index a063fb58dd35..be30faff73f2 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitSwitchBranchWithSeveralCaseValuesAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitSwitchBranchWithSeveralCaseValuesAction.java @@ -39,6 +39,7 @@ public class SplitSwitchBranchWithSeveralCaseValuesAction extends PsiElementBase @Override public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) { PsiSwitchLabelStatementBase labelStatement = findLabelStatement(editor, element); + if (labelStatement == null || labelStatement.getEnclosingSwitchBlock() == null) return false; if (labelStatement instanceof PsiSwitchLabelStatement) { if (isMultiValueCase(labelStatement)) { // mixed syntax "case 1, 2: some code"