diff --git a/java/java-impl/src/META-INF/JavaPlugin.xml b/java/java-impl/src/META-INF/JavaPlugin.xml index ba8c629ae4f6..5c58cdc1923d 100644 --- a/java/java-impl/src/META-INF/JavaPlugin.xml +++ b/java/java-impl/src/META-INF/JavaPlugin.xml @@ -1383,7 +1383,7 @@ - + diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ExcludeLoggerFromCompletionLookupActionProvider.kt b/java/java-impl/src/com/intellij/codeInsight/completion/ExcludeLoggerFromCompletionLookupActionProvider.kt index 49ed93d4d2d3..4ffe95f37cc4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/ExcludeLoggerFromCompletionLookupActionProvider.kt +++ b/java/java-impl/src/com/intellij/codeInsight/completion/ExcludeLoggerFromCompletionLookupActionProvider.kt @@ -10,7 +10,7 @@ import com.intellij.util.Consumer class ExcludeLoggerFromCompletionLookupActionProvider : LookupActionProvider { override fun fillActions(lookupElement: LookupElement, lookup: Lookup, consumer: Consumer) { - if (lookupElement is LoggerLookupElement) { + if (lookupElement is JvmLoggerLookupElement) { for (s in AddImportAction.getAllExcludableStrings(lookupElement.typeName)) { consumer.consume(ExcludeFromCompletionAction(lookup.project, s)) } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaLoggerCompletionContributor.kt b/java/java-impl/src/com/intellij/codeInsight/completion/JvmLoggerCompletionContributor.kt similarity index 93% rename from java/java-impl/src/com/intellij/codeInsight/completion/JavaLoggerCompletionContributor.kt rename to java/java-impl/src/com/intellij/codeInsight/completion/JvmLoggerCompletionContributor.kt index 86421aa3e5f2..e928e12b7435 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaLoggerCompletionContributor.kt +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JvmLoggerCompletionContributor.kt @@ -10,7 +10,7 @@ import com.intellij.psi.PsiExpressionStatement import com.intellij.psi.PsiJavaToken import com.intellij.util.ProcessingContext -class JavaLoggerCompletionContributor : CompletionContributor() { +class JvmLoggerCompletionContributor : CompletionContributor() { init { extend(CompletionType.BASIC, psiElement() @@ -35,7 +35,7 @@ class JavaLoggerCompletionContributor : CompletionContributor() { val place = possiblePlaces.firstOrNull() ?: return for (logger in availableLoggers) { - val lookupElement = LoggerLookupElement(logger, place) + val lookupElement = JvmLoggerLookupElement(logger, place) javaResultWithSorting.addElement(lookupElement) } } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/LoggerLookupElement.kt b/java/java-impl/src/com/intellij/codeInsight/completion/JvmLoggerLookupElement.kt similarity index 92% rename from java/java-impl/src/com/intellij/codeInsight/completion/LoggerLookupElement.kt rename to java/java-impl/src/com/intellij/codeInsight/completion/JvmLoggerLookupElement.kt index 0f2040825858..2766ed2b8cbd 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/LoggerLookupElement.kt +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JvmLoggerLookupElement.kt @@ -9,7 +9,7 @@ import com.intellij.psi.* import com.intellij.psi.statistics.StatisticsInfo import com.intellij.psi.util.parentOfType -class LoggerLookupElement(private val logger: JvmLogger, private val place: PsiClass) : LookupElement(), JavaCompletionStatistician.CustomStatisticsInfoProvider { +class JvmLoggerLookupElement(private val logger: JvmLogger, private val place: PsiClass) : LookupElement(), JavaCompletionStatistician.CustomStatisticsInfoProvider { val typeName: String = logger.loggerTypeName override fun getLookupString(): String = JvmLoggerFieldDelegate.LOGGER_IDENTIFIER diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/LoggerWeigher.kt b/java/java-impl/src/com/intellij/codeInsight/completion/LoggerWeigher.kt index 3e57c5f5a6f1..b758f8437753 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/LoggerWeigher.kt +++ b/java/java-impl/src/com/intellij/codeInsight/completion/LoggerWeigher.kt @@ -5,7 +5,7 @@ import com.intellij.codeInsight.lookup.LookupElement class LoggerWeigher : CompletionWeigher() { override fun weigh(element: LookupElement, location: CompletionLocation): Comparable<*> = when (element) { - is LoggerLookupElement -> -1 + is JvmLoggerLookupElement -> -1 else -> 1 } } \ No newline at end of file