diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index ad03e6940aa..3820112ad89 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -247,7 +247,7 @@ + implementationClass="org.jetbrains.jet.plugin.completion.KotlinCompletionContributor"/> - + diff --git a/idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt index 6a39ad72bea..fd3bb457f71 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt @@ -31,7 +31,7 @@ import com.intellij.util.containers.MultiMap import java.util.HashSet import com.intellij.codeInsight.completion.* import org.jetbrains.jet.plugin.completion.handlers.JetFunctionInsertHandler -import org.jetbrains.jet.plugin.completion.handlers.JetKeywordInsertHandler +import org.jetbrains.jet.plugin.completion.handlers.KotlinKeywordInsertHandler import com.intellij.codeInsight.lookup.LookupElementBuilder import java.util.ArrayList @@ -50,7 +50,7 @@ class KeywordCompletion { val element = LookupElementBuilder.create(KeywordLookupObject(keyword), keyword) .bold() .withInsertHandler(if (keyword !in FUNCTION_KEYWORDS) - JetKeywordInsertHandler + KotlinKeywordInsertHandler else JetFunctionInsertHandler.NO_PARAMETERS_HANDLER) collector.addElement(element) diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionCharFilter.kt b/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionCharFilter.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/completion/JetCompletionCharFilter.kt rename to idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionCharFilter.kt index c4b3dd091ec..6f00262178e 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionCharFilter.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionCharFilter.kt @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.psi.JetFile import org.jetbrains.jet.plugin.completion.handlers.JetFunctionInsertHandler import com.intellij.openapi.util.Key -public open class JetCompletionCharFilter() : CharFilter() { +public class KotlinCompletionCharFilter() : CharFilter() { class object { public val ACCEPT_OPENING_BRACE: Key = Key("JetCompletionCharFilter.ACCEPT_OPENNING_BRACE") public val ACCEPT_EQ: Key = Key("JetCompletionCharFilter.ACCEPT_EQ") diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.kt b/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.kt rename to idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt index 4e006e7c987..5303ff8580f 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt @@ -44,7 +44,7 @@ import com.intellij.psi.PsiErrorElement import com.intellij.psi.search.PsiElementProcessor import com.intellij.psi.PsiComment -public class JetCompletionContributor : CompletionContributor() { +public class KotlinCompletionContributor : CompletionContributor() { private val AFTER_NUMBER_LITERAL = psiElement().afterLeafSkipping(psiElement().withText(""), psiElement().withElementType(elementType().oneOf(JetTokens.FLOAT_LITERAL, JetTokens.INTEGER_LITERAL))) private val AFTER_INTEGER_LITERAL_AND_DOT = psiElement().afterLeafSkipping(psiElement().withText("."), psiElement().withElementType(elementType().oneOf(JetTokens.INTEGER_LITERAL))) diff --git a/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.kt b/idea/src/org/jetbrains/jet/plugin/completion/KotlinLookupElementFactory.kt similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.kt rename to idea/src/org/jetbrains/jet/plugin/completion/KotlinLookupElementFactory.kt index 2dfea3f2124..1a4a3a30f66 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/KotlinLookupElementFactory.kt @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.plugin.JetDescriptorIconProvider import org.jetbrains.jet.plugin.completion.handlers.CaretPosition import org.jetbrains.jet.plugin.completion.handlers.GenerateLambdaInfo -import org.jetbrains.jet.plugin.completion.handlers.JetClassInsertHandler +import org.jetbrains.jet.plugin.completion.handlers.KotlinClassInsertHandler import org.jetbrains.jet.plugin.completion.handlers.JetFunctionInsertHandler import org.jetbrains.jet.renderer.DescriptorRenderer import org.jetbrains.jet.plugin.completion.handlers.BaseDeclarationInsertHandler @@ -37,10 +37,10 @@ import org.jetbrains.jet.plugin.completion.handlers.JetPropertyInsertHandler import com.intellij.psi.PsiClass import org.jetbrains.jet.asJava.KotlinLightClass import org.jetbrains.jet.lang.resolve.java.JavaResolverPsiUtils -import org.jetbrains.jet.plugin.completion.handlers.JetJavaClassInsertHandler +import org.jetbrains.jet.plugin.completion.handlers.KotlinJavaClassInsertHandler import com.intellij.codeInsight.completion.JavaPsiClassReferenceElement -public object DescriptorLookupConverter { +public object KotlinLookupElementFactory { public fun createLookupElement(analyzer: KotlinCodeAnalyzer, descriptor: DeclarationDescriptor): LookupElement { val _descriptor = if (descriptor is CallableMemberDescriptor) DescriptorUtils.unwrapFakeOverride(descriptor) @@ -50,7 +50,7 @@ public object DescriptorLookupConverter { } public fun createLookupElementForJavaClass(psiClass: PsiClass): LookupElement { - return JavaPsiClassReferenceElement(psiClass).setInsertHandler(JetJavaClassInsertHandler) + return JavaPsiClassReferenceElement(psiClass).setInsertHandler(KotlinJavaClassInsertHandler) } private fun createLookupElement(analyzer: KotlinCodeAnalyzer, descriptor: DeclarationDescriptor, declaration: PsiElement?): LookupElement { @@ -95,7 +95,7 @@ public object DescriptorLookupConverter { element = element.withInsertHandler(insertHandler) if (insertHandler is JetFunctionInsertHandler && insertHandler.lambdaInfo != null) { - element.putUserData(JetCompletionCharFilter.ACCEPT_OPENING_BRACE, true) + element.putUserData(KotlinCompletionCharFilter.ACCEPT_OPENING_BRACE, true) } element = element.withTailText(tailText, true).withTypeText(typeText).withPresentableText(presentableText) @@ -130,7 +130,7 @@ public object DescriptorLookupConverter { is PropertyDescriptor -> JetPropertyInsertHandler - is ClassDescriptor -> JetClassInsertHandler + is ClassDescriptor -> KotlinClassInsertHandler else -> BaseDeclarationInsertHandler() } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt index bc74ae8ed2f..b6c7b9ace2c 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt @@ -57,7 +57,7 @@ class LookupElementsCollector(private val prefixMatcher: PrefixMatcher, if (!descriptorFilter(descriptor)) return run { - val lookupElement = DescriptorLookupConverter.createLookupElement(resolveSession, descriptor) + val lookupElement = KotlinLookupElementFactory.createLookupElement(resolveSession, descriptor) if (suppressAutoInsertion) { addElementWithAutoInsertionSuppressed(lookupElement) } @@ -74,7 +74,7 @@ class LookupElementsCollector(private val prefixMatcher: PrefixMatcher, if (KotlinBuiltIns.getInstance().isFunctionOrExtensionFunctionType(parameterType)) { val parameterCount = KotlinBuiltIns.getInstance().getParameterTypeProjectionsFromFunctionType(parameterType).size() if (parameterCount > 1) { - val lookupElement = DescriptorLookupConverter.createLookupElement(resolveSession, descriptor) + val lookupElement = KotlinLookupElementFactory.createLookupElement(resolveSession, descriptor) addElement(object : LookupElementDecorator(lookupElement) { override fun renderElement(presentation: LookupElementPresentation) { super.renderElement(presentation) diff --git a/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt index f6232d03b87..c0f6c75939b 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt @@ -94,7 +94,7 @@ object NamedParametersCompletion { .withIcon(JetIcons.PARAMETER) .withInsertHandler(NamedParameterInsertHandler(name)) .assignPriority(ItemPriority.NAMED_PARAMETER) - lookupElement.putUserData(JetCompletionCharFilter.ACCEPT_EQ, true); + lookupElement.putUserData(KotlinCompletionCharFilter.ACCEPT_EQ, true); collector.addElement(lookupElement) } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/PackageDirectiveCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/PackageDirectiveCompletion.kt index d21d3021c02..bf6ef374712 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/PackageDirectiveCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/PackageDirectiveCompletion.kt @@ -54,7 +54,7 @@ object PackageDirectiveCompletion { val variants = TipsManager.getPackageReferenceVariants(ref.expression, bindingContext) for (variant in variants) { - val lookupElement = DescriptorLookupConverter.createLookupElement(resolveSession, variant) + val lookupElement = KotlinLookupElementFactory.createLookupElement(resolveSession, variant) if (!lookupElement.getLookupString().contains(DUMMY_IDENTIFIER)) { result.addElement(lookupElement) } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt index caa7fb7333e..1ae53660aea 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt @@ -56,7 +56,7 @@ class TypesCompletion(val parameters: CompletionParameters, val resolveSession: addLookupElementForCompiledKotlinClass(psiClass, collector) } else { - collector.addElementWithAutoInsertionSuppressed(DescriptorLookupConverter.createLookupElementForJavaClass(psiClass)) + collector.addElementWithAutoInsertionSuppressed(KotlinLookupElementFactory.createLookupElementForJavaClass(psiClass)) } } }) diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetCallableInsertHandler.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt similarity index 100% rename from idea/src/org/jetbrains/jet/plugin/completion/handlers/JetCallableInsertHandler.kt rename to idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.kt rename to idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt index 54ffe112254..9fbd92cc73c 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt @@ -26,7 +26,7 @@ import org.jetbrains.jet.plugin.completion.DeclarationLookupObject import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.plugin.completion.qualifiedNameForSourceCode -public object JetClassInsertHandler : BaseDeclarationInsertHandler() { +public object KotlinClassInsertHandler : BaseDeclarationInsertHandler() { override fun handleInsert(context: InsertionContext, item: LookupElement) { super.handleInsert(context, item) diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetJavaClassInsertHandler.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinJavaClassInsertHandler.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/completion/handlers/JetJavaClassInsertHandler.kt rename to idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinJavaClassInsertHandler.kt index aad37f77af8..e50fd691452 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetJavaClassInsertHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinJavaClassInsertHandler.kt @@ -28,7 +28,7 @@ import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper * Handler for inserting java class completion. * - Should place import directive if necessary. */ -object JetJavaClassInsertHandler : InsertHandler { +object KotlinJavaClassInsertHandler : InsertHandler { override fun handleInsert(context: InsertionContext, item: JavaPsiClassReferenceElement) { PsiDocumentManager.getInstance(context.getProject()).commitAllDocuments() diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetKeywordInsertHandler.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinKeywordInsertHandler.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/completion/handlers/JetKeywordInsertHandler.kt rename to idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinKeywordInsertHandler.kt index 7a25a8322bb..42a36d249b1 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetKeywordInsertHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinKeywordInsertHandler.kt @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.psi.JetFunction import org.jetbrains.jet.lang.psi.JetPsiUtil import org.jetbrains.jet.lexer.JetTokens -public object JetKeywordInsertHandler : InsertHandler { +public object KotlinKeywordInsertHandler : InsertHandler { private val NO_SPACE_AFTER = setOf(JetTokens.THIS_KEYWORD.toString(), JetTokens.SUPER_KEYWORD.toString(), JetTokens.CAPITALIZED_THIS_KEYWORD.toString(), diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/LambdaItems.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/LambdaItems.kt index e30e0cf7408..721910c1f4d 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/LambdaItems.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/LambdaItems.kt @@ -21,7 +21,7 @@ import com.intellij.codeInsight.lookup.LookupElementBuilder import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.plugin.completion.handlers.insertLambdaTemplate import com.intellij.openapi.util.TextRange -import org.jetbrains.jet.plugin.completion.JetCompletionCharFilter +import org.jetbrains.jet.plugin.completion.KotlinCompletionCharFilter import org.jetbrains.jet.plugin.completion.ExpectedInfo import org.jetbrains.jet.plugin.completion.handlers.buildLambdaPresentation import org.jetbrains.jet.plugin.completion.suppressAutoInsertion @@ -38,7 +38,7 @@ object LambdaItems { .withInsertHandler(ArtificialElementInsertHandler("{ ", " }", false)) .suppressAutoInsertion() .addTailAndNameSimilarity(functionExpectedInfos) - lookupElement.putUserData(JetCompletionCharFilter.ACCEPT_OPENING_BRACE, true) + lookupElement.putUserData(KotlinCompletionCharFilter.ACCEPT_OPENING_BRACE, true) collection.add(lookupElement) } @@ -54,7 +54,7 @@ object LambdaItems { }) .suppressAutoInsertion() .addTailAndNameSimilarity(functionExpectedInfos.filter { it.type == functionType }) - lookupElement.putUserData(JetCompletionCharFilter.ACCEPT_OPENING_BRACE, true) + lookupElement.putUserData(KotlinCompletionCharFilter.ACCEPT_OPENING_BRACE, true) collection.add(lookupElement) } } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt index be403a70f78..477eec4bac2 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt @@ -96,7 +96,7 @@ class TypeInstantiationItems(val resolveSession: ResolveSessionForBodies, val vi (if (visibleConstructors.size == 0) JetFunctionInsertHandler.NO_PARAMETERS_HANDLER else if (visibleConstructors.size == 1) - DescriptorLookupConverter.getDefaultInsertHandler(visibleConstructors.single()) + KotlinLookupElementFactory.getDefaultInsertHandler(visibleConstructors.single()) else JetFunctionInsertHandler.WITH_PARAMETERS_HANDLER) as JetFunctionInsertHandler insertHandler = object : InsertHandler { @@ -113,7 +113,7 @@ class TypeInstantiationItems(val resolveSession: ResolveSessionForBodies, val vi lookupElement = lookupElement.keepOldArgumentListOnTab() } if (baseInsertHandler.lambdaInfo != null) { - lookupElement.putUserData(JetCompletionCharFilter.ACCEPT_OPENING_BRACE, true) + lookupElement.putUserData(KotlinCompletionCharFilter.ACCEPT_OPENING_BRACE, true) } } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt index 147fec6d83a..8be39ffc9ef 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt @@ -162,7 +162,7 @@ fun functionType(function: FunctionDescriptor): JetType? { } fun createLookupElement(descriptor: DeclarationDescriptor, resolveSession: ResolveSessionForBodies): LookupElement { - val element = DescriptorLookupConverter.createLookupElement(resolveSession, descriptor) + val element = KotlinLookupElementFactory.createLookupElement(resolveSession, descriptor) return if (descriptor is FunctionDescriptor && descriptor.getValueParameters().isNotEmpty()) element.keepOldArgumentListOnTab() else element }