From 0f3e50ed041395d95df215df90df6ea67e0cb1e6 Mon Sep 17 00:00:00 2001 From: Mikhail Pyltsin Date: Wed, 3 Apr 2024 11:12:36 +0200 Subject: [PATCH] [java-inspections] IDEA-337706 Support conversion System.out to log calls - fix lombok test GitOrigin-RevId: 09fc8a64fab84df1c3aa661f2107bb451b447420 --- .../codeInsight/completion/JvmLoggerLookupElement.kt | 1 + .../plugin/logging/LombokApacheCommonsLogger.kt | 3 ++- .../intellij/plugin/logging/LombokLog4j2Logger.kt | 3 ++- .../intellij/plugin/logging/LombokLog4jLogger.kt | 3 ++- .../intellij/plugin/logging/LombokLoggingUtils.kt | 5 +++++ .../intellij/plugin/logging/LombokSlf4jLogger.kt | 3 ++- .../java/lomboktest/LombokLoggerCompletionTest.kt | 10 +++++----- 7 files changed, 19 insertions(+), 9 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JvmLoggerLookupElement.kt b/java/java-impl/src/com/intellij/codeInsight/completion/JvmLoggerLookupElement.kt index 9a305db52b77..cb629773304e 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JvmLoggerLookupElement.kt +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JvmLoggerLookupElement.kt @@ -11,6 +11,7 @@ import com.intellij.psi.util.parentOfType class JvmLoggerLookupElement(private val logger: JvmLogger, private val place: PsiClass) : LookupElement(), JavaCompletionStatistician.CustomStatisticsInfoProvider { val typeName: String = logger.loggerTypeName + val typeId: String = logger.id override fun getLookupString(): String { return logger.getLogFieldName(place) ?: JvmLoggerFieldDelegate.LOGGER_IDENTIFIER diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokApacheCommonsLogger.kt b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokApacheCommonsLogger.kt index dc8c44913877..c828f34a5a7d 100644 --- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokApacheCommonsLogger.kt +++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokApacheCommonsLogger.kt @@ -3,9 +3,10 @@ package de.plushnikov.intellij.plugin.logging import com.intellij.lang.logging.JvmLogger import com.siyeh.ig.psiutils.JavaLoggingUtils + class LombokApacheCommonsLogger : JvmLogger by JvmLoggerAnnotationDelegate( JavaLoggingUtils.COMMONS_LOGGING, - "Lombok Apache Commons Logging", + LombokLoggingUtils.ID_LOMBOK_APACHE_COMMONS_LOGGING, LombokLoggingUtils.COMMONS_ANNOTATION, 500 ) { diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4j2Logger.kt b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4j2Logger.kt index e189eb945220..7576d5fddd75 100644 --- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4j2Logger.kt +++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4j2Logger.kt @@ -3,9 +3,10 @@ package de.plushnikov.intellij.plugin.logging import com.intellij.lang.logging.JvmLogger import com.siyeh.ig.psiutils.JavaLoggingUtils + class LombokLog4j2Logger : JvmLogger by JvmLoggerAnnotationDelegate( JavaLoggingUtils.LOG4J2, - "Lombok Log4j2", + LombokLoggingUtils.ID_LOMBOK_LOG_4_J_2, LombokLoggingUtils.LOG4J2_ANNOTATION, 600 ) { diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4jLogger.kt b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4jLogger.kt index f435360aa4f0..8ee9ed48653e 100644 --- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4jLogger.kt +++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4jLogger.kt @@ -3,9 +3,10 @@ package de.plushnikov.intellij.plugin.logging import com.intellij.lang.logging.JvmLogger import com.siyeh.ig.psiutils.JavaLoggingUtils + class LombokLog4jLogger : JvmLogger by JvmLoggerAnnotationDelegate( JavaLoggingUtils.LOG4J, - "Lombok Log4j", + LombokLoggingUtils.ID_LOMBOK_LOG_4_J, LombokLoggingUtils.LOG4J_ANNOTATION, 400 ) { diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLoggingUtils.kt b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLoggingUtils.kt index a5981e087f37..a0c1a40499dd 100644 --- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLoggingUtils.kt +++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLoggingUtils.kt @@ -5,4 +5,9 @@ object LombokLoggingUtils { const val LOG4J2_ANNOTATION = "lombok.extern.log4j.Log4j2" const val LOG4J_ANNOTATION = "lombok.extern.log4j.Log4j" const val COMMONS_ANNOTATION = "lombok.extern.apachecommons.CommonsLog" + + const val ID_LOMBOK_APACHE_COMMONS_LOGGING = "Lombok Apache Commons Logging" + const val ID_LOMBOK_SLF_4_J = "Lombok Slf4j" + const val ID_LOMBOK_LOG_4_J_2 = "Lombok Log4j2" + const val ID_LOMBOK_LOG_4_J = "Lombok Log4j" } \ No newline at end of file diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokSlf4jLogger.kt b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokSlf4jLogger.kt index f21ebb5e2228..0dde9951a1a7 100644 --- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokSlf4jLogger.kt +++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokSlf4jLogger.kt @@ -3,9 +3,10 @@ package de.plushnikov.intellij.plugin.logging import com.intellij.lang.logging.JvmLogger import com.siyeh.ig.psiutils.JavaLoggingUtils + class LombokSlf4jLogger : JvmLogger by JvmLoggerAnnotationDelegate( JavaLoggingUtils.SLF4J, - "Lombok Slf4j", + LombokLoggingUtils.ID_LOMBOK_SLF_4_J, LombokLoggingUtils.SLF4J_ANNOTATION, 700 ) { diff --git a/plugins/lombok/src/test/java/com/intellij/java/lomboktest/LombokLoggerCompletionTest.kt b/plugins/lombok/src/test/java/com/intellij/java/lomboktest/LombokLoggerCompletionTest.kt index dfad148c7542..155f69ef186a 100644 --- a/plugins/lombok/src/test/java/com/intellij/java/lomboktest/LombokLoggerCompletionTest.kt +++ b/plugins/lombok/src/test/java/com/intellij/java/lomboktest/LombokLoggerCompletionTest.kt @@ -15,28 +15,28 @@ class LombokLoggerCompletionTest : LightFixtureCompletionTestCase() { fun testSlf4j() { JvmLoggerTestSetupUtil.setupSlf4j(myFixture) - doTest(LombokLoggingUtils.SLF4J_ANNOTATION, "long", "log", "log", "clone") + doTest(LombokLoggingUtils.ID_LOMBOK_SLF_4_J, "long", "log", "log", "clone") } @NeedsIndex.SmartMode(reason = "Logger completion is not supported in the dumb mode") fun testLog4j2() { JvmLoggerTestSetupUtil.setupLog4j2(myFixture) - doTest(LombokLoggingUtils.LOG4J2_ANNOTATION, "long", "log", "log", "clone") + doTest(LombokLoggingUtils.ID_LOMBOK_LOG_4_J_2, "long", "log", "log", "clone") } @NeedsIndex.SmartMode(reason = "Logger completion is not supported in the dumb mode") fun testLog4j() { JvmLoggerTestSetupUtil.setupLog4j(myFixture) - doTest(LombokLoggingUtils.LOG4J_ANNOTATION, "long", "log", "log", "clone") + doTest(LombokLoggingUtils.ID_LOMBOK_LOG_4_J, "long", "log", "log", "clone") } @NeedsIndex.SmartMode(reason = "Logger completion is not supported in the dumb mode") fun testApacheCommons() { JvmLoggerTestSetupUtil.setupApacheCommons(myFixture) - doTest(LombokLoggingUtils.COMMONS_ANNOTATION, "long", "log", "log", "clone") + doTest(LombokLoggingUtils.ID_LOMBOK_APACHE_COMMONS_LOGGING, "long", "log", "log", "clone") } override fun getBasePath(): String = "community/plugins/lombok/testData/completion/logger" @@ -48,7 +48,7 @@ class LombokLoggerCompletionTest : LightFixtureCompletionTestCase() { configureByFile("before$name.java") assertStringItems(*names) - val item = lookup.items.find { it is JvmLoggerLookupElement && it.typeName == typeName } + val item = lookup.items.find { it is JvmLoggerLookupElement && it.typeId == typeName } TestCase.assertNotNull(item) selectItem(item) checkResultByFile("after$name.java")