From 87fb336de193cd7ad24219923359fb1ffd31fcd3 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 23 Sep 2014 18:41:11 +0400 Subject: [PATCH] reverted --- .../completion/CompletionContributor.java | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java index 8c9f7b48133a..2329e07f7401 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java +++ b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java @@ -23,7 +23,6 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.util.Computable; -import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.KeyedExtensionCollector; import com.intellij.openapi.util.Pair; import com.intellij.patterns.ElementPattern; @@ -31,9 +30,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.Consumer; -import com.intellij.util.Function; import com.intellij.util.ProcessingContext; -import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; import gnu.trove.THashSet; import org.jetbrains.annotations.NonNls; @@ -244,28 +241,7 @@ public abstract class CompletionContributor { @NotNull public static List forLanguage(@NotNull Language language) { - List contributors = MyExtensionPointManager.INSTANCE.forKey(language); - if (ApplicationManager.getApplication().isUnitTestMode()) { - final List classes = ContainerUtil.map(contributors, new Function() { - @Override - public Class fun(CompletionContributor contributor) { - return contributor.getClass(); - } - }); - final Set uniques = new THashSet(classes); - if (uniques.size() != classes.size()) { - Class duplicate = ContainerUtil.find(classes, new Condition() { - @Override - public boolean value(Class aClass) { - return !uniques.remove(aClass); - } - }); - if (duplicate != null) { - throw new AssertionError("Duplicate completion contributor registered: "+duplicate); - } - } - } - return contributors; + return MyExtensionPointManager.INSTANCE.forKey(language); } private static class MyExtensionPointManager extends KeyedExtensionCollector {