package renamed

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexConfigure.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.api.index;
+package com.intellij.compiler.classFilesIndex.api.index;
 
 import com.intellij.openapi.project.Project;
 import org.jetbrains.jps.classFilesIndex.indexer.api.ClassFileIndexerFactory;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexFeature.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.api.index;
+package com.intellij.compiler.classFilesIndex.api.index;
 
-import com.intellij.compiler.compilerOutputIndex.impl.MethodsUsageIndexConfigure;
+import com.intellij.compiler.classFilesIndex.impl.MethodsUsageIndexConfigure;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.registry.RegistryValue;
 import org.jetbrains.annotations.NotNull;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexFeaturesHolder.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.api.index;
+package com.intellij.compiler.classFilesIndex.api.index;
 
-import com.intellij.compiler.compilerOutputIndex.impl.MethodsUsageIndexConfigure;
+import com.intellij.compiler.classFilesIndex.impl.MethodsUsageIndexConfigure;
 import com.intellij.openapi.compiler.CompileContext;
 import com.intellij.openapi.compiler.CompileTask;
 import com.intellij.openapi.compiler.CompilerManager;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexReaderBase.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.api.index;
+package com.intellij.compiler.classFilesIndex.api.index;
 
 import com.intellij.compiler.server.BuildManager;
 import com.intellij.openapi.diagnostic.Logger;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexerBuilderParametersProvider.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.api.index;
+package com.intellij.compiler.classFilesIndex.api.index;
 
 import com.intellij.compiler.server.BuildProcessParametersProvider;
 import com.intellij.openapi.util.text.StringUtil;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/CachedRelevantStaticMethodSearcher.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch;
+package com.intellij.compiler.classFilesIndex.chainsSearch;
 
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.context.ChainCompletionContext;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.context.ContextRelevantStaticMethod;
-import com.intellij.compiler.compilerOutputIndex.impl.MethodsUsageIndexReader;
-import com.intellij.compiler.compilerOutputIndex.impl.UsageIndexValue;
+import com.intellij.compiler.classFilesIndex.chainsSearch.context.ChainCompletionContext;
+import com.intellij.compiler.classFilesIndex.chainsSearch.context.ContextRelevantStaticMethod;
+import com.intellij.compiler.classFilesIndex.impl.MethodsUsageIndexReader;
+import com.intellij.compiler.classFilesIndex.impl.UsageIndexValue;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/ChainCompletionStringUtil.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch;
+package com.intellij.compiler.classFilesIndex.chainsSearch;
 
 import com.intellij.openapi.util.text.StringUtilRt;
 import com.intellij.psi.CommonClassNames;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/ChainRelevance.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch;
+package com.intellij.compiler.classFilesIndex.chainsSearch;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/ChainsSearcher.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch;
+package com.intellij.compiler.classFilesIndex.chainsSearch;
 
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.context.ChainCompletionContext;
-import com.intellij.compiler.compilerOutputIndex.impl.MethodsUsageIndexReader;
-import com.intellij.compiler.compilerOutputIndex.impl.UsageIndexValue;
+import com.intellij.compiler.classFilesIndex.chainsSearch.context.ChainCompletionContext;
+import com.intellij.compiler.classFilesIndex.impl.MethodsUsageIndexReader;
+import com.intellij.compiler.classFilesIndex.impl.UsageIndexValue;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.util.Pair;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/MaxSizeTreeSet.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch;
+package com.intellij.compiler.classFilesIndex.chainsSearch;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/MethodChainsSearchUtil.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch;
+package com.intellij.compiler.classFilesIndex.chainsSearch;
 
 import com.intellij.psi.*;
 import org.jetbrains.annotations.NotNull;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/MethodsChain.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch;
+package com.intellij.compiler.classFilesIndex.chainsSearch;
 
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiManager;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/MethodsChainLookupRangingHelper.java

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch;
+package com.intellij.compiler.classFilesIndex.chainsSearch;
 
 import com.intellij.codeInsight.NullableNotNullManager;
 import com.intellij.codeInsight.completion.JavaChainLookupElement;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.context.ChainCompletionContext;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.context.ContextRelevantStaticMethod;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.context.ContextRelevantVariableGetter;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.ChainCompletionNewVariableLookupElement;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.WeightableChainLookupElement;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.sub.GetterLookupSubLookupElement;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.sub.SubLookupElement;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.sub.VariableSubLookupElement;
+import com.intellij.compiler.classFilesIndex.chainsSearch.context.ChainCompletionContext;
+import com.intellij.compiler.classFilesIndex.chainsSearch.context.ContextRelevantStaticMethod;
+import com.intellij.compiler.classFilesIndex.chainsSearch.context.ContextRelevantVariableGetter;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.ChainCompletionNewVariableLookupElement;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.WeightableChainLookupElement;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.sub.GetterLookupSubLookupElement;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.sub.SubLookupElement;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.sub.VariableSubLookupElement;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.VariableLookupItem;
 import com.intellij.psi.*;
@@ -38,7 +38,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import static com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.ChainCompletionLookupElementUtil.createLookupElement;
+import static com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.ChainCompletionLookupElementUtil.createLookupElement;
 import static com.intellij.psi.CommonClassNames.JAVA_LANG_STRING;
 
 /**

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/ParametersMatcher.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch;
+package com.intellij.compiler.classFilesIndex.chainsSearch;
 
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.context.ChainCompletionContext;
+import com.intellij.compiler.classFilesIndex.chainsSearch.context.ChainCompletionContext;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiParameter;
 import com.intellij.psi.PsiPrimitiveType;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/SearchInitializer.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch;
+package com.intellij.compiler.classFilesIndex.chainsSearch;
 
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.context.ChainCompletionContext;
-import com.intellij.compiler.compilerOutputIndex.impl.UsageIndexValue;
+import com.intellij.compiler.classFilesIndex.chainsSearch.context.ChainCompletionContext;
+import com.intellij.compiler.classFilesIndex.impl.UsageIndexValue;
 import com.intellij.openapi.util.Pair;
 import com.intellij.psi.PsiMethod;
 import org.jetbrains.jps.classFilesIndex.indexer.impl.MethodIncompleteSignature;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/WeightAware.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.compiler.classFilesIndex.chainsSearch;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Dmitry Batkovich
+ */
+public class WeightAware<V> implements Comparable<WeightAware<V>> {
+  private final V myUnderlying;
+  private final int myWeight;
+
+  public WeightAware(final V underlying, final int weight) {
+    myUnderlying = underlying;
+    myWeight = weight;
+  }
+
+  public V getUnderlying() {
+    return myUnderlying;
+  }
+
+  public int getWeight() {
+    return myWeight;
+  }
+
+  @Override
+  public int compareTo(@NotNull final WeightAware<V> that) {
+    final int sub = -getWeight() + that.getWeight();
+    if (sub != 0) {
+      return sub;
+    }
+    return myUnderlying.hashCode() - that.myUnderlying.hashCode();
+  }
+}

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/CompletionContributorPatternUtil.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.completion;
+package com.intellij.compiler.classFilesIndex.chainsSearch.completion;
 
 import com.intellij.codeInsight.completion.CompletionInitializationContext;
 import com.intellij.patterns.ElementPattern;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/MethodsChainsCompletionContributor.java

@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.completion;
+package com.intellij.compiler.classFilesIndex.chainsSearch.completion;
 
 import com.intellij.codeInsight.completion.*;
-import com.intellij.compiler.compilerOutputIndex.api.index.ClassFilesIndexFeature;
-import com.intellij.compiler.compilerOutputIndex.api.index.ClassFilesIndexFeaturesHolder;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.ChainCompletionStringUtil;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.ChainsSearcher;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.MethodsChain;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.MethodsChainLookupRangingHelper;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.context.ChainCompletionContext;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.context.ContextUtil;
+import com.intellij.compiler.classFilesIndex.api.index.ClassFilesIndexFeature;
+import com.intellij.compiler.classFilesIndex.api.index.ClassFilesIndexFeaturesHolder;
+import com.intellij.compiler.classFilesIndex.chainsSearch.ChainCompletionStringUtil;
+import com.intellij.compiler.classFilesIndex.chainsSearch.ChainsSearcher;
+import com.intellij.compiler.classFilesIndex.chainsSearch.MethodsChain;
+import com.intellij.compiler.classFilesIndex.chainsSearch.MethodsChainLookupRangingHelper;
+import com.intellij.compiler.classFilesIndex.chainsSearch.context.ChainCompletionContext;
+import com.intellij.compiler.classFilesIndex.chainsSearch.context.ContextUtil;
 import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.compiler.compilerOutputIndex.impl.MethodsUsageIndexReader;
+import com.intellij.compiler.classFilesIndex.impl.MethodsUsageIndexReader;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.patterns.ElementPattern;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/MethodsChainsWeigher.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.completion;
+package com.intellij.compiler.classFilesIndex.chainsSearch.completion;
 
 import com.intellij.codeInsight.completion.CompletionLocation;
 import com.intellij.codeInsight.completion.CompletionWeigher;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.WeightableChainLookupElement;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.ChainRelevance;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.WeightableChainLookupElement;
+import com.intellij.compiler.classFilesIndex.chainsSearch.ChainRelevance;
 import com.intellij.codeInsight.lookup.LookupElement;
 import org.jetbrains.annotations.NotNull;
 

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/ChainCompletionLookupElementUtil.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup;
+package com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup;
 
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.sub.SubLookupElement;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.sub.SubLookupElement;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.psi.PsiKeyword;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/ChainCompletionMethodCallLookupElement.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup;
+package com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup;
 
 import com.intellij.codeInsight.completion.InsertionContext;
 import com.intellij.codeInsight.completion.JavaMethodCallElement;
 import com.intellij.codeInsight.completion.StaticallyImportable;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.sub.SubLookupElement;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.sub.SubLookupElement;
 import com.intellij.codeInsight.lookup.AutoCompletionPolicy;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.application.ApplicationManager;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/ChainCompletionNewVariableLookupElement.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup;
+package com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup;
 
 import com.intellij.codeInsight.completion.InsertionContext;
 import com.intellij.codeInsight.lookup.LookupElement;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/WeightableChainLookupElement.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup;
+package com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup;
 
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.ChainRelevance;
+import com.intellij.compiler.classFilesIndex.chainsSearch.ChainRelevance;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementDecorator;
 import org.jetbrains.annotations.NotNull;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/sub/GetterLookupSubLookupElement.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.sub;
+package com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.sub;
 
 import com.intellij.psi.PsiJavaFile;
 import org.jetbrains.annotations.Nullable;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/sub/StaticMethodSubLookupElement.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.sub;
+package com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.sub;
 
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.ChainCompletionLookupElementUtil;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.ChainCompletionLookupElementUtil;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiJavaFile;
 import com.intellij.psi.PsiMethod;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/sub/SubLookupElement.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.sub;
+package com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.sub;
 
 import com.intellij.psi.PsiJavaFile;
 

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/sub/VariableSubLookupElement.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.sub;
+package com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.sub;
 
 import com.intellij.psi.PsiJavaFile;
 import com.intellij.psi.PsiVariable;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ChainCompletionContext.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.context;
+package com.intellij.compiler.classFilesIndex.chainsSearch.context;
 
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.CachedRelevantStaticMethodSearcher;
+import com.intellij.compiler.classFilesIndex.chainsSearch.CachedRelevantStaticMethodSearcher;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.NotNullLazyValue;
 import com.intellij.openapi.util.UserDataHolder;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ChainCompletionContextStringUtil.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.context;
+package com.intellij.compiler.classFilesIndex.chainsSearch.context;
 
 import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ContextRelevantStaticMethod.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.context;
+package com.intellij.compiler.classFilesIndex.chainsSearch.context;
 
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.sub.StaticMethodSubLookupElement;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.sub.SubLookupElement;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.sub.VariableSubLookupElement;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.sub.StaticMethodSubLookupElement;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.sub.SubLookupElement;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.sub.VariableSubLookupElement;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiVariable;
 import gnu.trove.TIntObjectHashMap;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ContextRelevantVariableGetter.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.context;
+package com.intellij.compiler.classFilesIndex.chainsSearch.context;
 
 import com.intellij.codeInsight.completion.JavaChainLookupElement;
 import com.intellij.codeInsight.completion.JavaMethodCallElement;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.sub.GetterLookupSubLookupElement;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.sub.SubLookupElement;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.sub.GetterLookupSubLookupElement;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.sub.SubLookupElement;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.VariableLookupItem;
 import com.intellij.psi.PsiMethod;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ContextUtil.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.context;
+package com.intellij.compiler.classFilesIndex.chainsSearch.context;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/MethodIncompleteSignatureResolver.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.chainsSearch.context;
+package com.intellij.compiler.classFilesIndex.chainsSearch.context;
 
 import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/impl/MethodsUsageIndexConfigure.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.impl;
+package com.intellij.compiler.classFilesIndex.impl;
 
-import com.intellij.compiler.compilerOutputIndex.api.index.ClassFilesIndexConfigure;
-import com.intellij.compiler.compilerOutputIndex.api.index.ClassFilesIndexReaderBase;
+import com.intellij.compiler.classFilesIndex.api.index.ClassFilesIndexConfigure;
+import com.intellij.compiler.classFilesIndex.api.index.ClassFilesIndexReaderBase;
 import com.intellij.openapi.project.Project;
 import gnu.trove.TObjectIntHashMap;
 import org.jetbrains.jps.classFilesIndex.indexer.api.ClassFileIndexerFactory;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/impl/MethodsUsageIndexReader.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.impl;
+package com.intellij.compiler.classFilesIndex.impl;
 
-import com.intellij.compiler.compilerOutputIndex.api.index.ClassFilesIndexFeaturesHolder;
-import com.intellij.compiler.compilerOutputIndex.api.index.ClassFilesIndexReaderBase;
+import com.intellij.compiler.classFilesIndex.api.index.ClassFilesIndexFeaturesHolder;
+import com.intellij.compiler.classFilesIndex.api.index.ClassFilesIndexReaderBase;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.io.EnumeratorStringDescriptor;
 import gnu.trove.TObjectIntHashMap;

java/compiler/impl/src/com/intellij/compiler/classFilesIndex/impl/UsageIndexValue.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.compiler.compilerOutputIndex.impl;
+package com.intellij.compiler.classFilesIndex.impl;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.classFilesIndex.indexer.impl.MethodIncompleteSignature;

java/java-tests/testSrc/com/intellij/codeInsight/completion/MethodChainsCompletionTest.java

@@ -2,12 +2,12 @@ package com.intellij.codeInsight.completion;
 
 import com.intellij.JavaTestUtil;
 import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.compiler.compilerOutputIndex.api.index.ClassFilesIndexFeature;
-import com.intellij.compiler.compilerOutputIndex.api.index.ClassFilesIndexFeaturesHolder;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.ChainRelevance;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.MethodsChainsCompletionContributor;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.ChainCompletionMethodCallLookupElement;
-import com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.lookup.WeightableChainLookupElement;
+import com.intellij.compiler.classFilesIndex.api.index.ClassFilesIndexFeature;
+import com.intellij.compiler.classFilesIndex.api.index.ClassFilesIndexFeaturesHolder;
+import com.intellij.compiler.classFilesIndex.chainsSearch.ChainRelevance;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.MethodsChainsCompletionContributor;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.ChainCompletionMethodCallLookupElement;
+import com.intellij.compiler.classFilesIndex.chainsSearch.completion.lookup.WeightableChainLookupElement;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.util.SmartList;
 

resources/src/META-INF/IdeaPlugin.xml

@@ -44,7 +44,7 @@
     </component>
 
     <component>
-      <implementation-class>com.intellij.compiler.compilerOutputIndex.api.index.ClassFilesIndexFeaturesHolder</implementation-class>
+      <implementation-class>com.intellij.compiler.classFilesIndex.api.index.ClassFilesIndexFeaturesHolder</implementation-class>
     </component>
   </project-components>
 
@@ -1460,9 +1460,9 @@
     <gotoDeclarationHandler implementation="com.intellij.codeInsight.navigation.actions.GotoLambdaParameterHandler"/>
 
     <completion.contributor language="JAVA" id="methodsChainsCompletionContributor" order="first"
-                            implementationClass="com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.MethodsChainsCompletionContributor"/>
+                            implementationClass="com.intellij.compiler.classFilesIndex.chainsSearch.completion.MethodsChainsCompletionContributor"/>
     <weigher order="first" key="completion" id="methodsChains"
-             implementationClass="com.intellij.compiler.compilerOutputIndex.chainsSearch.completion.MethodsChainsWeigher"/>
+             implementationClass="com.intellij.compiler.classFilesIndex.chainsSearch.completion.MethodsChainsWeigher"/>
 
     <applicationService serviceInterface="org.jetbrains.generate.tostring.template.TemplatesManager"
                         serviceImplementation="org.jetbrains.generate.tostring.template.TemplatesManager"/>

resources/src/idea/RichPlatformPlugin.xml

@@ -393,7 +393,7 @@
     <projectStructure.sourceRootEditHandler implementation="com.intellij.openapi.roots.ui.configuration.JavaResourceRootEditHandler"/>
     <projectStructure.sourceRootEditHandler implementation="com.intellij.openapi.roots.ui.configuration.JavaTestResourceRootEditHandler"/>
 
-    <buildProcess.parametersProvider implementation="com.intellij.compiler.compilerOutputIndex.api.index.ClassFilesIndexerBuilderParametersProvider"/>
+    <buildProcess.parametersProvider implementation="com.intellij.compiler.classFilesIndex.api.index.ClassFilesIndexerBuilderParametersProvider"/>
   </extensions>
 
   <xi:include href="/META-INF/xdebugger.xml" xpointer="xpointer(/idea-plugin/*)"/>