MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Java: Highlight identical branches in 'switch' statement, small optimization (IDEA-181304)

Browse Source
This commit is contained in:
Pavel Dolgov
2018-11-12 15:07:00 +03:00
parent ac8f3431da
commit e6de539e52
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/DuplicateBranchesInSwitchInspection.java
+12 -4
View File
@@ -14,6 +14,7 @@ import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.ContainerUtil;
import com.siyeh.ig.psiutils.CommentTracker;
import com.siyeh.ig.psiutils.ControlFlowUtils;
import gnu.trove.TIntObjectHashMap;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
@@ -93,7 +94,7 @@ public class DuplicateBranchesInSwitchInspection extends LocalInspectionTool {
Comments comments = new Comments();
Branch previousBranch = null;
Map<Integer, List<Branch>> branchesByLength = new HashMap<>();
TIntObjectHashMap<List<Branch>> branchesByLength = new TIntObjectHashMap<>();
for (PsiElement child = body.getFirstChild(); child != null; child = child.getNextSibling()) {
if (child instanceof PsiSwitchLabelStatement) {
PsiSwitchLabelStatement switchLabel = (PsiSwitchLabelStatement)child;
@@ -116,11 +117,14 @@ public class DuplicateBranchesInSwitchInspection extends LocalInspectionTool {
}
addBranchToMap(branchesByLength, statementList, true, comments, previousBranch);
return branchesByLength.values();
Collection<List<Branch>> result = new ArrayList<>();
branchesByLength.forEachValue(result::add); // mini-hack: ArrayList.add() always returns true
return result;
}
@Nullable
private static Branch addBranchToMap(@NotNull Map<Integer, List<Branch>> branchesByLength,
private static Branch addBranchToMap(@NotNull TIntObjectHashMap<List<Branch>> branchesByLength,
@Nullable List<PsiStatement> statementList,
boolean hasImplicitBreak,
@NotNull Comments comments,
@@ -130,7 +134,10 @@ public class DuplicateBranchesInSwitchInspection extends LocalInspectionTool {
}
Branch branch = new Branch(statementList, hasImplicitBreak, comments.fetchTexts());
if (previousBranch == null || !previousBranch.canFallThrough()) {
List<Branch> branches = branchesByLength.computeIfAbsent(branch.length(), unused -> new ArrayList<>());
List<Branch> branches = branchesByLength.get(branch.length());
if (branches == null) {
branchesByLength.put(branch.length(), branches = new ArrayList<>());
}
branches.add(branch);
}
return branch;
@@ -323,6 +330,7 @@ public class DuplicateBranchesInSwitchInspection extends LocalInspectionTool {
if (switchLabel.isDefaultCase()) {
return PsiKeyword.DEFAULT;
}
//todo support multi-value label
PsiExpression value = switchLabel.getCaseValue();
if (value != null) {
return PsiKeyword.CASE + ' ' + value.getText();