From c02ea9bbeb03c69156d6221197ed944ba93b459f Mon Sep 17 00:00:00 2001 From: anna Date: Thu, 14 Feb 2013 16:58:36 +0100 Subject: [PATCH] no need to check for duplicates list of one item --- .../psi/scope/conflictResolvers/DuplicateConflictResolver.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/DuplicateConflictResolver.java b/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/DuplicateConflictResolver.java index f0e92a3d148c..ee4b98c9cf12 100644 --- a/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/DuplicateConflictResolver.java +++ b/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/DuplicateConflictResolver.java @@ -40,6 +40,7 @@ public class DuplicateConflictResolver implements PsiConflictResolver{ @Override public CandidateInfo resolveConflict(List conflicts){ + if (conflicts.size() == 1) return conflicts.get(0); final Map uniqueItems = new HashMap(); for (CandidateInfo info : conflicts) { final PsiElement element = info.getElement();