diff --git a/java/java-impl/src/META-INF/JavaPlugin.xml b/java/java-impl/src/META-INF/JavaPlugin.xml index c87604b00dac..3f762b52895b 100644 --- a/java/java-impl/src/META-INF/JavaPlugin.xml +++ b/java/java-impl/src/META-INF/JavaPlugin.xml @@ -2511,15 +2511,6 @@ - - - - diff --git a/jvm/jvm-analysis-impl/resources/META-INF/JvmAnalysisPlugin.xml b/jvm/jvm-analysis-impl/resources/META-INF/JvmAnalysisPlugin.xml index ffe7a967211d..e867ea43c617 100644 --- a/jvm/jvm-analysis-impl/resources/META-INF/JvmAnalysisPlugin.xml +++ b/jvm/jvm-analysis-impl/resources/META-INF/JvmAnalysisPlugin.xml @@ -181,6 +181,15 @@ + + + + diff --git a/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/LogFinderHyperlinkHandler.kt b/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/LogFinderHyperlinkHandler.kt index 9c0cdb1c28a6..af49b08c6bcf 100644 --- a/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/LogFinderHyperlinkHandler.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/LogFinderHyperlinkHandler.kt @@ -4,6 +4,7 @@ package com.intellij.analysis.customization.console import com.intellij.analysis.JvmAnalysisBundle import com.intellij.codeInsight.CodeInsightBundle import com.intellij.codeInsight.navigation.PsiTargetNavigator +import com.intellij.codeInspection.logging.* import com.intellij.execution.filters.HyperlinkInfoFactory import com.intellij.ide.util.EditSourceUtil import com.intellij.openapi.actionSystem.ex.ActionUtil.underModalProgress @@ -18,7 +19,6 @@ import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement import com.intellij.psi.PsiManager import com.intellij.psi.PsiRecursiveElementVisitor -import com.intellij.util.logging.* import org.jetbrains.uast.* internal class LogFinderHyperlinkHandler(private val probableClassName: ProbableClassName) : HyperlinkInfoFactory.HyperlinkHandler { diff --git a/java/java-impl/src/com/intellij/lang/logging/resolve/JvmLoggerArgumentSymbol.kt b/jvm/jvm-analysis-impl/src/com/intellij/analysis/logging/resolve/JvmLoggerArgumentSymbol.kt similarity index 87% rename from java/java-impl/src/com/intellij/lang/logging/resolve/JvmLoggerArgumentSymbol.kt rename to jvm/jvm-analysis-impl/src/com/intellij/analysis/logging/resolve/JvmLoggerArgumentSymbol.kt index d9b277550957..c17973eaae94 100644 --- a/java/java-impl/src/com/intellij/lang/logging/resolve/JvmLoggerArgumentSymbol.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/analysis/logging/resolve/JvmLoggerArgumentSymbol.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.lang.logging.resolve +package com.intellij.analysis.logging.resolve import com.intellij.find.usages.api.SearchTarget import com.intellij.find.usages.api.UsageHandler @@ -12,10 +12,10 @@ import com.intellij.platform.backend.navigation.NavigationTarget import com.intellij.platform.backend.presentation.TargetPresentation import com.intellij.psi.PsiElement import com.intellij.psi.SmartPointerManager -import com.intellij.util.logging.LOGGER_RESOLVE_TYPE_SEARCHERS -import com.intellij.util.logging.LoggingUtil -import com.intellij.util.logging.detectLoggerMethod -import com.intellij.util.logging.getPlaceholderContext +import com.intellij.codeInspection.logging.LOGGER_RESOLVE_TYPE_SEARCHERS +import com.intellij.codeInspection.logging.LoggingUtil +import com.intellij.codeInspection.logging.detectLoggerMethod +import com.intellij.codeInspection.logging.getPlaceholderContext import org.jetbrains.uast.UCallExpression import org.jetbrains.uast.UExpression import org.jetbrains.uast.getParentOfType diff --git a/java/java-impl/src/com/intellij/lang/logging/resolve/JvmLoggerArgumentSymbolReference.kt b/jvm/jvm-analysis-impl/src/com/intellij/analysis/logging/resolve/JvmLoggerArgumentSymbolReference.kt similarity index 93% rename from java/java-impl/src/com/intellij/lang/logging/resolve/JvmLoggerArgumentSymbolReference.kt rename to jvm/jvm-analysis-impl/src/com/intellij/analysis/logging/resolve/JvmLoggerArgumentSymbolReference.kt index 75b080f13a97..862883552b50 100644 --- a/java/java-impl/src/com/intellij/lang/logging/resolve/JvmLoggerArgumentSymbolReference.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/analysis/logging/resolve/JvmLoggerArgumentSymbolReference.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.lang.logging.resolve +package com.intellij.analysis.logging.resolve import com.intellij.model.Symbol import com.intellij.model.psi.PsiSymbolReference diff --git a/java/java-impl/src/com/intellij/lang/logging/resolve/JvmLoggerSymbolReferenceProvider.kt b/jvm/jvm-analysis-impl/src/com/intellij/analysis/logging/resolve/JvmLoggerSymbolReferenceProvider.kt similarity index 95% rename from java/java-impl/src/com/intellij/lang/logging/resolve/JvmLoggerSymbolReferenceProvider.kt rename to jvm/jvm-analysis-impl/src/com/intellij/analysis/logging/resolve/JvmLoggerSymbolReferenceProvider.kt index a8094a8616d6..5e09c5cf4c37 100644 --- a/java/java-impl/src/com/intellij/lang/logging/resolve/JvmLoggerSymbolReferenceProvider.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/analysis/logging/resolve/JvmLoggerSymbolReferenceProvider.kt @@ -1,6 +1,7 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.lang.logging.resolve +package com.intellij.analysis.logging.resolve +import com.intellij.codeInspection.logging.* import com.intellij.model.Symbol import com.intellij.model.psi.PsiExternalReferenceHost import com.intellij.model.psi.PsiSymbolReference @@ -10,8 +11,7 @@ import com.intellij.model.search.SearchRequest import com.intellij.openapi.project.Project import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement -import com.intellij.util.logging.* -import com.intellij.util.logging.PlaceholderLoggerType.* +import com.intellij.codeInspection.logging.PlaceholderLoggerType.* import org.jetbrains.uast.* class JvmLoggerSymbolReferenceProvider : PsiSymbolReferenceProvider { diff --git a/java/java-impl/src/com/intellij/lang/logging/resolve/JvmLoggerUsageSearcher.kt b/jvm/jvm-analysis-impl/src/com/intellij/analysis/logging/resolve/JvmLoggerUsageSearcher.kt similarity index 95% rename from java/java-impl/src/com/intellij/lang/logging/resolve/JvmLoggerUsageSearcher.kt rename to jvm/jvm-analysis-impl/src/com/intellij/analysis/logging/resolve/JvmLoggerUsageSearcher.kt index ec6a88730b14..c45e48325abe 100644 --- a/java/java-impl/src/com/intellij/lang/logging/resolve/JvmLoggerUsageSearcher.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/analysis/logging/resolve/JvmLoggerUsageSearcher.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.lang.logging.resolve +package com.intellij.analysis.logging.resolve import com.intellij.find.usages.api.PsiUsage import com.intellij.find.usages.api.Usage diff --git a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingConditionDisagreesWithLogLevelStatementInspection.kt b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingConditionDisagreesWithLogLevelStatementInspection.kt index 06c045325187..400260ba5f0a 100644 --- a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingConditionDisagreesWithLogLevelStatementInspection.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingConditionDisagreesWithLogLevelStatementInspection.kt @@ -3,7 +3,6 @@ package com.intellij.codeInspection.logging import com.intellij.analysis.JvmAnalysisBundle import com.intellij.codeInspection.* -import com.intellij.util.logging.LoggingUtil import com.intellij.modcommand.ModPsiUpdater import com.intellij.modcommand.PsiUpdateModCommandQuickFix import com.intellij.openapi.project.Project diff --git a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingGuardedByConditionInspection.kt b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingGuardedByConditionInspection.kt index 86b58823ed16..e493a37a85b7 100644 --- a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingGuardedByConditionInspection.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingGuardedByConditionInspection.kt @@ -16,7 +16,6 @@ import com.intellij.psi.PsiElementVisitor import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.util.PsiTreeUtil import com.intellij.uast.UastHintedVisitorAdapter -import com.intellij.util.logging.LoggingUtil import org.jetbrains.uast.* import org.jetbrains.uast.generate.replace import org.jetbrains.uast.visitor.AbstractUastNonRecursiveVisitor diff --git a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingPlaceholderCountMatchesArgumentCountInspection.kt b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingPlaceholderCountMatchesArgumentCountInspection.kt index 146c7b281c4b..d14d37ced1dc 100644 --- a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingPlaceholderCountMatchesArgumentCountInspection.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingPlaceholderCountMatchesArgumentCountInspection.kt @@ -9,7 +9,6 @@ import com.intellij.codeInspection.options.OptPane import com.intellij.codeInspection.util.InspectionMessage import com.intellij.psi.PsiElementVisitor import com.intellij.uast.UastHintedVisitorAdapter -import com.intellij.util.logging.* import org.jetbrains.uast.UCallExpression import org.jetbrains.uast.UExpression import org.jetbrains.uast.visitor.AbstractUastNonRecursiveVisitor diff --git a/java/java-impl/src/com/intellij/util/logging/LoggingPlaceholderUtil.kt b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingPlaceholderUtil.kt similarity index 99% rename from java/java-impl/src/com/intellij/util/logging/LoggingPlaceholderUtil.kt rename to jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingPlaceholderUtil.kt index 64967fc09e91..56aeadb7b0de 100644 --- a/java/java-impl/src/com/intellij/util/logging/LoggingPlaceholderUtil.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingPlaceholderUtil.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.util.logging +package com.intellij.codeInspection.logging import com.intellij.openapi.util.TextRange import com.intellij.psi.* diff --git a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingSimilarMessageInspection.kt b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingSimilarMessageInspection.kt index 7402a6dad433..862187967cf1 100644 --- a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingSimilarMessageInspection.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingSimilarMessageInspection.kt @@ -18,7 +18,6 @@ import com.intellij.psi.PsiElementVisitor import com.intellij.psi.SmartPointerManager import com.intellij.psi.util.PsiTreeUtil import com.intellij.uast.UastHintedVisitorAdapter -import com.intellij.util.logging.* import org.jetbrains.annotations.Nls import org.jetbrains.uast.* import org.jetbrains.uast.visitor.AbstractUastNonRecursiveVisitor diff --git a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingStatementNotGuardedByLogConditionInspection.kt b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingStatementNotGuardedByLogConditionInspection.kt index 6f039eb610d2..4b0fda585451 100644 --- a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingStatementNotGuardedByLogConditionInspection.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingStatementNotGuardedByLogConditionInspection.kt @@ -7,7 +7,7 @@ import com.intellij.codeInsight.options.JavaIdentifierValidator import com.intellij.codeInspection.AbstractBaseUastLocalInspectionTool import com.intellij.codeInspection.LocalInspectionToolSession import com.intellij.codeInspection.ProblemsHolder -import com.intellij.util.logging.LoggingUtil.LimitLevelType +import com.intellij.codeInspection.logging.LoggingUtil.LimitLevelType import com.intellij.codeInspection.options.OptDescribedComponent import com.intellij.codeInspection.options.OptPane import com.intellij.codeInspection.options.OptRegularComponent @@ -24,7 +24,6 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager import com.intellij.psi.impl.LanguageConstantExpressionEvaluator import com.intellij.psi.util.PsiTreeUtil import com.intellij.uast.UastHintedVisitorAdapter -import com.intellij.util.logging.LoggingUtil import com.siyeh.ig.psiutils.CommentTracker import com.siyeh.ig.psiutils.JavaLoggingUtils import org.jetbrains.uast.* diff --git a/java/java-impl/src/com/intellij/util/logging/LoggingStringPartEvaluator.kt b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingStringPartEvaluator.kt similarity index 99% rename from java/java-impl/src/com/intellij/util/logging/LoggingStringPartEvaluator.kt rename to jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingStringPartEvaluator.kt index f60e5d0ff04c..cd91fbd06799 100644 --- a/java/java-impl/src/com/intellij/util/logging/LoggingStringPartEvaluator.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingStringPartEvaluator.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.util.logging +package com.intellij.codeInspection.logging import com.intellij.openapi.progress.ProgressManager import com.intellij.psi.PsiTypes diff --git a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingStringTemplateAsArgumentInspection.kt b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingStringTemplateAsArgumentInspection.kt index 2dee74ea0f2d..2cd55a2294f0 100644 --- a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingStringTemplateAsArgumentInspection.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingStringTemplateAsArgumentInspection.kt @@ -12,11 +12,10 @@ import com.intellij.psi.PsiType import com.intellij.psi.util.InheritanceUtil import com.intellij.psi.util.TypeConversionUtil import com.intellij.uast.UastHintedVisitorAdapter -import com.intellij.util.logging.LoggingUtil -import com.intellij.util.logging.LoggingUtil.Companion -import com.intellij.util.logging.LoggingUtil.Companion.LOG_MATCHERS -import com.intellij.util.logging.LoggingUtil.Companion.countPlaceHolders -import com.intellij.util.logging.LoggingUtil.Companion.isGuarded +import com.intellij.codeInspection.logging.LoggingUtil.Companion +import com.intellij.codeInspection.logging.LoggingUtil.Companion.LOG_MATCHERS +import com.intellij.codeInspection.logging.LoggingUtil.Companion.countPlaceHolders +import com.intellij.codeInspection.logging.LoggingUtil.Companion.isGuarded import org.jetbrains.uast.* import org.jetbrains.uast.expressions.UInjectionHost import org.jetbrains.uast.generate.getUastElementFactory diff --git a/java/java-impl/src/com/intellij/util/logging/LoggingUtil.kt b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingUtil.kt similarity index 97% rename from java/java-impl/src/com/intellij/util/logging/LoggingUtil.kt rename to jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingUtil.kt index e36e2748e2aa..e0cf1a4c6482 100644 --- a/java/java-impl/src/com/intellij/util/logging/LoggingUtil.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingUtil.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.util.logging +package com.intellij.codeInspection.logging import com.intellij.java.library.JavaLibraryUtil import com.intellij.psi.util.CachedValueProvider @@ -78,12 +78,12 @@ class LoggingUtil { val loggerLevel = getLoggerLevel(node) if (loggerLevel == null) return true val notSkip: Boolean = when (loggerLevel) { - Companion.LevelType.FATAL -> false - Companion.LevelType.ERROR -> false - Companion.LevelType.WARN -> myLimitLevelType.ordinal == LimitLevelType.WARN_AND_LOWER.ordinal - Companion.LevelType.INFO -> myLimitLevelType.ordinal <= LimitLevelType.INFO_AND_LOWER.ordinal - Companion.LevelType.DEBUG -> myLimitLevelType.ordinal <= LimitLevelType.DEBUG_AND_LOWER.ordinal - Companion.LevelType.TRACE -> myLimitLevelType.ordinal <= LimitLevelType.TRACE.ordinal + LevelType.FATAL -> false + LevelType.ERROR -> false + LevelType.WARN -> myLimitLevelType.ordinal == LimitLevelType.WARN_AND_LOWER.ordinal + LevelType.INFO -> myLimitLevelType.ordinal <= LimitLevelType.INFO_AND_LOWER.ordinal + LevelType.DEBUG -> myLimitLevelType.ordinal <= LimitLevelType.DEBUG_AND_LOWER.ordinal + LevelType.TRACE -> myLimitLevelType.ordinal <= LimitLevelType.TRACE.ordinal } return !notSkip } diff --git a/jvm/jvm-analysis-internal-testFramework/src/com/intellij/jvm/analysis/internal/testFramework/logging/LoggingStatementNotGuardedByLogConditionInspectionTestBase.kt b/jvm/jvm-analysis-internal-testFramework/src/com/intellij/jvm/analysis/internal/testFramework/logging/LoggingStatementNotGuardedByLogConditionInspectionTestBase.kt index efe271cbce76..04d591a4ac1d 100644 --- a/jvm/jvm-analysis-internal-testFramework/src/com/intellij/jvm/analysis/internal/testFramework/logging/LoggingStatementNotGuardedByLogConditionInspectionTestBase.kt +++ b/jvm/jvm-analysis-internal-testFramework/src/com/intellij/jvm/analysis/internal/testFramework/logging/LoggingStatementNotGuardedByLogConditionInspectionTestBase.kt @@ -4,7 +4,7 @@ import com.intellij.codeHighlighting.HighlightDisplayLevel import com.intellij.codeInsight.daemon.HighlightDisplayKey import com.intellij.codeInspection.logging.LoggingStatementNotGuardedByLogConditionInspection import com.intellij.profile.codeInspection.ProjectInspectionProfileManager.Companion.getInstance -import com.intellij.util.logging.LoggingUtil +import com.intellij.codeInspection.logging.LoggingUtil abstract class LoggingStatementNotGuardedByLogConditionInspectionTestBase : LoggingInspectionTestBase() { override val inspection = LoggingStatementNotGuardedByLogConditionInspection() diff --git a/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/logging/KotlinLoggingStringTemplateAsArgumentInspectionTest.kt b/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/logging/KotlinLoggingStringTemplateAsArgumentInspectionTest.kt index a1e304ab8a7b..cf54daee5557 100644 --- a/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/logging/KotlinLoggingStringTemplateAsArgumentInspectionTest.kt +++ b/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/logging/KotlinLoggingStringTemplateAsArgumentInspectionTest.kt @@ -5,7 +5,7 @@ import com.intellij.codeInspection.logging.LoggingStringTemplateAsArgumentInspec import com.intellij.jvm.analysis.KotlinJvmAnalysisTestUtil import com.intellij.jvm.analysis.internal.testFramework.logging.LoggingStringTemplateAsArgumentInspectionTestBase import com.intellij.testFramework.TestDataPath -import com.intellij.util.logging.LoggingUtil +import com.intellij.codeInspection.logging.LoggingUtil import org.junit.experimental.runners.Enclosed import org.junit.runner.RunWith