From 55eb306562427bb0ebe8b9e1ed82ed812fb589d5 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Thu, 5 Dec 2013 17:36:09 +0400 Subject: [PATCH] package renamed --- .../api/index/ClassFilesIndexConfigure.java | 2 +- .../api/index/ClassFilesIndexFeature.java | 4 +- .../index/ClassFilesIndexFeaturesHolder.java | 4 +- .../api/index/ClassFilesIndexReaderBase.java | 2 +- ...FilesIndexerBuilderParametersProvider.java | 2 +- .../CachedRelevantStaticMethodSearcher.java | 10 ++-- .../ChainCompletionStringUtil.java | 2 +- .../chainsSearch/ChainRelevance.java | 2 +- .../chainsSearch/ChainsSearcher.java | 8 ++-- .../chainsSearch/MaxSizeTreeSet.java | 2 +- .../chainsSearch/MethodChainsSearchUtil.java | 2 +- .../chainsSearch/MethodsChain.java | 2 +- .../MethodsChainLookupRangingHelper.java | 20 ++++---- .../chainsSearch/ParametersMatcher.java | 4 +- .../chainsSearch/SearchInitializer.java | 6 +-- .../chainsSearch/WeightAware.java | 48 +++++++++++++++++++ .../CompletionContributorPatternUtil.java | 2 +- .../MethodsChainsCompletionContributor.java | 20 ++++---- .../completion/MethodsChainsWeigher.java | 6 +-- .../ChainCompletionLookupElementUtil.java | 4 +- ...hainCompletionMethodCallLookupElement.java | 4 +- ...ainCompletionNewVariableLookupElement.java | 2 +- .../lookup/WeightableChainLookupElement.java | 4 +- .../sub/GetterLookupSubLookupElement.java | 2 +- .../sub/StaticMethodSubLookupElement.java | 4 +- .../lookup/sub/SubLookupElement.java | 2 +- .../lookup/sub/VariableSubLookupElement.java | 2 +- .../context/ChainCompletionContext.java | 4 +- .../ChainCompletionContextStringUtil.java | 2 +- .../context/ContextRelevantStaticMethod.java | 8 ++-- .../ContextRelevantVariableGetter.java | 6 +-- .../chainsSearch/context/ContextUtil.java | 2 +- .../MethodIncompleteSignatureResolver.java | 2 +- .../impl/MethodsUsageIndexConfigure.java | 6 +-- .../impl/MethodsUsageIndexReader.java | 6 +-- .../impl/UsageIndexValue.java | 2 +- .../MethodChainsCompletionTest.java | 12 ++--- resources/src/META-INF/IdeaPlugin.xml | 6 +-- resources/src/idea/RichPlatformPlugin.xml | 2 +- 39 files changed, 139 insertions(+), 91 deletions(-) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/api/index/ClassFilesIndexConfigure.java (95%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/api/index/ClassFilesIndexFeature.java (93%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/api/index/ClassFilesIndexFeaturesHolder.java (97%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/api/index/ClassFilesIndexReaderBase.java (98%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/api/index/ClassFilesIndexerBuilderParametersProvider.java (97%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/CachedRelevantStaticMethodSearcher.java (93%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/ChainCompletionStringUtil.java (98%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/ChainRelevance.java (98%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/ChainsSearcher.java (98%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/MaxSizeTreeSet.java (98%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/MethodChainsSearchUtil.java (97%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/MethodsChain.java (98%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/MethodsChainLookupRangingHelper.java (91%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/ParametersMatcher.java (95%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/SearchInitializer.java (95%) create mode 100644 java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/WeightAware.java rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/completion/CompletionContributorPatternUtil.java (96%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/completion/MethodsChainsCompletionContributor.java (92%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/completion/MethodsChainsWeigher.java (82%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/completion/lookup/ChainCompletionLookupElementUtil.java (93%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/completion/lookup/ChainCompletionMethodCallLookupElement.java (95%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/completion/lookup/ChainCompletionNewVariableLookupElement.java (98%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/completion/lookup/WeightableChainLookupElement.java (88%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/completion/lookup/sub/GetterLookupSubLookupElement.java (94%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/completion/lookup/sub/StaticMethodSubLookupElement.java (91%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/completion/lookup/sub/SubLookupElement.java (90%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/completion/lookup/sub/VariableSubLookupElement.java (92%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/context/ChainCompletionContext.java (97%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/context/ChainCompletionContextStringUtil.java (95%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/context/ContextRelevantStaticMethod.java (82%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/context/ContextRelevantVariableGetter.java (84%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/context/ContextUtil.java (99%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/chainsSearch/context/MethodIncompleteSignatureResolver.java (97%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/impl/MethodsUsageIndexConfigure.java (88%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/impl/MethodsUsageIndexReader.java (93%) rename java/compiler/impl/src/com/intellij/compiler/{compilerOutputIndex => classFilesIndex}/impl/UsageIndexValue.java (97%) diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/api/index/ClassFilesIndexConfigure.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexConfigure.java similarity index 95% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/api/index/ClassFilesIndexConfigure.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexConfigure.java index 0fe4f51f7b41..fd15019d9295 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/api/index/ClassFilesIndexConfigure.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/api/index/ClassFilesIndexFeature.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexFeature.java similarity index 93% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/api/index/ClassFilesIndexFeature.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexFeature.java index c882349b78f2..139f487936ba 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/api/index/ClassFilesIndexFeature.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/api/index/ClassFilesIndexFeaturesHolder.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexFeaturesHolder.java similarity index 97% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/api/index/ClassFilesIndexFeaturesHolder.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexFeaturesHolder.java index 5d5ff0c11c98..1b17eaaf1423 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/api/index/ClassFilesIndexFeaturesHolder.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/api/index/ClassFilesIndexReaderBase.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexReaderBase.java similarity index 98% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/api/index/ClassFilesIndexReaderBase.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexReaderBase.java index 934e106f6ab8..0cb2dd4d839c 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/api/index/ClassFilesIndexReaderBase.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/api/index/ClassFilesIndexerBuilderParametersProvider.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexerBuilderParametersProvider.java similarity index 97% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/api/index/ClassFilesIndexerBuilderParametersProvider.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexerBuilderParametersProvider.java index 11e6fe456656..eba69fd2bfd9 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/api/index/ClassFilesIndexerBuilderParametersProvider.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/CachedRelevantStaticMethodSearcher.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/CachedRelevantStaticMethodSearcher.java similarity index 93% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/CachedRelevantStaticMethodSearcher.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/CachedRelevantStaticMethodSearcher.java index e8c3d4e3b347..ac6df7346449 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/CachedRelevantStaticMethodSearcher.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/ChainCompletionStringUtil.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/ChainCompletionStringUtil.java similarity index 98% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/ChainCompletionStringUtil.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/ChainCompletionStringUtil.java index a46ddae23a4b..8a2c1d1c3859 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/ChainCompletionStringUtil.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/ChainRelevance.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/ChainRelevance.java similarity index 98% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/ChainRelevance.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/ChainRelevance.java index 0ba1289fee7a..c3e9e0a46fa1 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/ChainRelevance.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/ChainsSearcher.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/ChainsSearcher.java similarity index 98% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/ChainsSearcher.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/ChainsSearcher.java index 0270631d1df3..339428525e7e 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/ChainsSearcher.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/MaxSizeTreeSet.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/MaxSizeTreeSet.java similarity index 98% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/MaxSizeTreeSet.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/MaxSizeTreeSet.java index dc278970864c..2266506c5fe8 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/MaxSizeTreeSet.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/MethodChainsSearchUtil.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/MethodChainsSearchUtil.java similarity index 97% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/MethodChainsSearchUtil.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/MethodChainsSearchUtil.java index 4d7a73296780..f40c76f5d4a3 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/MethodChainsSearchUtil.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/MethodsChain.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/MethodsChain.java similarity index 98% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/MethodsChain.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/MethodsChain.java index 8da26d3c3617..1811162ab6ec 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/MethodsChain.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/MethodsChainLookupRangingHelper.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/MethodsChainLookupRangingHelper.java similarity index 91% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/MethodsChainLookupRangingHelper.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/MethodsChainLookupRangingHelper.java index 56667cd92f7c..46724834d765 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/MethodsChainLookupRangingHelper.java +++ b/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; /** diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/ParametersMatcher.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/ParametersMatcher.java similarity index 95% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/ParametersMatcher.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/ParametersMatcher.java index a25bde60f9b8..3cdc760c5ff3 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/ParametersMatcher.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/SearchInitializer.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/SearchInitializer.java similarity index 95% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/SearchInitializer.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/SearchInitializer.java index 7b1fd2b90f21..89becb4cd151 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/SearchInitializer.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/WeightAware.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/WeightAware.java new file mode 100644 index 000000000000..9430a65d3918 --- /dev/null +++ b/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 implements Comparable> { + 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 that) { + final int sub = -getWeight() + that.getWeight(); + if (sub != 0) { + return sub; + } + return myUnderlying.hashCode() - that.myUnderlying.hashCode(); + } +} diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/CompletionContributorPatternUtil.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/CompletionContributorPatternUtil.java similarity index 96% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/CompletionContributorPatternUtil.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/CompletionContributorPatternUtil.java index 3ac278fc3e17..0ddade8c358c 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/CompletionContributorPatternUtil.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/MethodsChainsCompletionContributor.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/MethodsChainsCompletionContributor.java similarity index 92% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/MethodsChainsCompletionContributor.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/MethodsChainsCompletionContributor.java index a7be2c7cc2a7..609f560749e3 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/MethodsChainsCompletionContributor.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/MethodsChainsWeigher.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/MethodsChainsWeigher.java similarity index 82% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/MethodsChainsWeigher.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/MethodsChainsWeigher.java index 7b6551fb2b0a..9142c82fe304 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/MethodsChainsWeigher.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/ChainCompletionLookupElementUtil.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/ChainCompletionLookupElementUtil.java similarity index 93% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/ChainCompletionLookupElementUtil.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/ChainCompletionLookupElementUtil.java index a8315728aaf3..3a6becb7a78d 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/ChainCompletionLookupElementUtil.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/ChainCompletionMethodCallLookupElement.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/ChainCompletionMethodCallLookupElement.java similarity index 95% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/ChainCompletionMethodCallLookupElement.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/ChainCompletionMethodCallLookupElement.java index 8a1b641905ff..d49ac3e04cfd 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/ChainCompletionMethodCallLookupElement.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/ChainCompletionNewVariableLookupElement.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/ChainCompletionNewVariableLookupElement.java similarity index 98% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/ChainCompletionNewVariableLookupElement.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/ChainCompletionNewVariableLookupElement.java index 3f1343349e77..6e941d2dfb28 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/ChainCompletionNewVariableLookupElement.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/WeightableChainLookupElement.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/WeightableChainLookupElement.java similarity index 88% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/WeightableChainLookupElement.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/WeightableChainLookupElement.java index 68fb531edfa0..ca30c1359ff8 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/WeightableChainLookupElement.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/sub/GetterLookupSubLookupElement.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/sub/GetterLookupSubLookupElement.java similarity index 94% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/sub/GetterLookupSubLookupElement.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/sub/GetterLookupSubLookupElement.java index 03fc9349c8d3..bb1cdf6ab102 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/sub/GetterLookupSubLookupElement.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/sub/StaticMethodSubLookupElement.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/sub/StaticMethodSubLookupElement.java similarity index 91% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/sub/StaticMethodSubLookupElement.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/sub/StaticMethodSubLookupElement.java index 1807db61bd02..b96b8c29254d 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/sub/StaticMethodSubLookupElement.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/sub/SubLookupElement.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/sub/SubLookupElement.java similarity index 90% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/sub/SubLookupElement.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/sub/SubLookupElement.java index 5840af7398c4..b13e7cdfa9d5 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/sub/SubLookupElement.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/sub/VariableSubLookupElement.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/sub/VariableSubLookupElement.java similarity index 92% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/sub/VariableSubLookupElement.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/lookup/sub/VariableSubLookupElement.java index 38e0e2e5790a..aa4cd03efbca 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/completion/lookup/sub/VariableSubLookupElement.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/ChainCompletionContext.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ChainCompletionContext.java similarity index 97% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/ChainCompletionContext.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ChainCompletionContext.java index 8d7903639518..815cfdbd7df8 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/ChainCompletionContext.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/ChainCompletionContextStringUtil.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ChainCompletionContextStringUtil.java similarity index 95% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/ChainCompletionContextStringUtil.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ChainCompletionContextStringUtil.java index 41ed087d3b71..19466ded6a70 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/ChainCompletionContextStringUtil.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/ContextRelevantStaticMethod.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ContextRelevantStaticMethod.java similarity index 82% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/ContextRelevantStaticMethod.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ContextRelevantStaticMethod.java index 561c9d9144f8..a10bf35a4b9e 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/ContextRelevantStaticMethod.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/ContextRelevantVariableGetter.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ContextRelevantVariableGetter.java similarity index 84% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/ContextRelevantVariableGetter.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ContextRelevantVariableGetter.java index 8fa1e5a40193..601d26344d27 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/ContextRelevantVariableGetter.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/ContextUtil.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ContextUtil.java similarity index 99% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/ContextUtil.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ContextUtil.java index fe7a49c85be5..1ea1bf49ebba 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/ContextUtil.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/MethodIncompleteSignatureResolver.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/MethodIncompleteSignatureResolver.java similarity index 97% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/MethodIncompleteSignatureResolver.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/MethodIncompleteSignatureResolver.java index 3a659baef1d6..e48f07272457 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/chainsSearch/context/MethodIncompleteSignatureResolver.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/impl/MethodsUsageIndexConfigure.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/impl/MethodsUsageIndexConfigure.java similarity index 88% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/impl/MethodsUsageIndexConfigure.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/impl/MethodsUsageIndexConfigure.java index 087d195d1bc0..e64dd1b0657e 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/impl/MethodsUsageIndexConfigure.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/impl/MethodsUsageIndexReader.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/impl/MethodsUsageIndexReader.java similarity index 93% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/impl/MethodsUsageIndexReader.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/impl/MethodsUsageIndexReader.java index 11ccf7ede0ad..bfcaefeb55ae 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/impl/MethodsUsageIndexReader.java +++ b/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; diff --git a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/impl/UsageIndexValue.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/impl/UsageIndexValue.java similarity index 97% rename from java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/impl/UsageIndexValue.java rename to java/compiler/impl/src/com/intellij/compiler/classFilesIndex/impl/UsageIndexValue.java index 2af22971d5a3..e04f64e82ffa 100644 --- a/java/compiler/impl/src/com/intellij/compiler/compilerOutputIndex/impl/UsageIndexValue.java +++ b/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; diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/MethodChainsCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/MethodChainsCompletionTest.java index 680625c38ebf..74e46e08eea0 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/MethodChainsCompletionTest.java +++ b/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; diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml index 8edad7802cdf..7d8c282777dc 100644 --- a/resources/src/META-INF/IdeaPlugin.xml +++ b/resources/src/META-INF/IdeaPlugin.xml @@ -44,7 +44,7 @@ - com.intellij.compiler.compilerOutputIndex.api.index.ClassFilesIndexFeaturesHolder + com.intellij.compiler.classFilesIndex.api.index.ClassFilesIndexFeaturesHolder @@ -1460,9 +1460,9 @@ + implementationClass="com.intellij.compiler.classFilesIndex.chainsSearch.completion.MethodsChainsCompletionContributor"/> + implementationClass="com.intellij.compiler.classFilesIndex.chainsSearch.completion.MethodsChainsWeigher"/> diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml index 0e8ee2995e76..6b724378ba54 100644 --- a/resources/src/idea/RichPlatformPlugin.xml +++ b/resources/src/idea/RichPlatformPlugin.xml @@ -393,7 +393,7 @@ - +