From 449a920c9c37ac35df4b3ff3226c2befcb1a2300 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 11 Sep 2012 13:12:55 +0400
Subject: [PATCH] SmartListMultiMap refactor

---
 .../psi/impl/search/PsiSearchHelperImpl.java        |  9 ++-------
 .../src/com/intellij/util/containers/MultiMap.java  | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
index a04c09f1ac69..e3c85524f331 100644
--- a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
+++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
@@ -38,7 +38,6 @@ import com.intellij.psi.search.*;
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.util.CommonProcessors;
 import com.intellij.util.Processor;
-import com.intellij.util.SmartList;
 import com.intellij.util.codeInsight.CommentUtilCore;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.MultiMap;
@@ -659,12 +658,8 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
   }
 
   private static MultiMap<VirtualFile, RequestWithProcessor> createMultiMap() {
-    return new MultiMap<VirtualFile, RequestWithProcessor>(){
-      @Override
-      protected Collection<RequestWithProcessor> createCollection() {
-        return new SmartList<RequestWithProcessor>(); // usually there is just one request
-      }
-    };
+    // usually there is just one request
+    return MultiMap.createSmartList();
   }
 
   private static GlobalSearchScope uniteScopes(Collection<RequestWithProcessor> requests) {
diff --git a/platform/util/src/com/intellij/util/containers/MultiMap.java b/platform/util/src/com/intellij/util/containers/MultiMap.java
index 4b1db80477cb..cc73bb671586 100644
--- a/platform/util/src/com/intellij/util/containers/MultiMap.java
+++ b/platform/util/src/com/intellij/util/containers/MultiMap.java
@@ -16,6 +16,7 @@
 
 package com.intellij.util.containers;
 
+import com.intellij.util.SmartList;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.Serializable;
@@ -230,6 +231,16 @@ public class MultiMap<K, V> implements Serializable {
     return new MultiMap<K, V>();
   }
 
+  @NotNull
+  public static <K, V> MultiMap<K, V> createSmartList() {
+    return new MultiMap<K, V>() {
+      @Override
+      protected Collection<V> createCollection() {
+        return new SmartList<V>();
+      }
+    };
+  }
+
   @NotNull
   public static <K, V> MultiMap<K, V> create(int i, float v) {
     return new MultiMap<K, V>(i, v);
@@ -251,4 +262,4 @@ public class MultiMap<K, V> implements Serializable {
   public String toString() {
     return myMap.toString();
   }
-}
+}
\ No newline at end of file