From 08400d930fe41e8e76dbe63c69c539a6795da099 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 17 Jul 2023 12:08:12 +0200 Subject: [PATCH] [Analysis API, FIR] migrate `::class.java` -> `::class` inside error messages They seem to provide similar results and the `.java` part is redundant --- .../kotlin/analysis/api/fir/components/KtFirCallResolver.kt | 2 +- .../analysis/api/fir/references/KtFirReferenceResolver.kt | 2 +- .../expressionTypeProvider/AbstractHLExpressionTypeTest.kt | 2 +- .../AbstractAnalysisApiExpressionPsiTypeProviderTest.kt | 2 +- .../analysis/api/impl/base/test/cases/components/testUtils.kt | 2 +- .../kotlin/analysis/api/symbols/DebugSymbolRenderer.kt | 2 +- .../analysis/low/level/api/fir/util/containingFileUtils.kt | 2 +- .../base/AbstractSymbolLightClassesParentingTestBase.kt | 2 +- .../src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt | 2 +- .../src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt index 6d974503c52..d50ee7562fa 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt @@ -1283,7 +1283,7 @@ internal class KtFirCallResolver( action() } catch (e: Exception) { rethrowExceptionWithDetails( - "Error during resolving call ${element::class.java.name}", + "Error during resolving call ${element::class}", exception = e, ) { withPsiEntry("psi", element, analysisSession::getModule) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/KtFirReferenceResolver.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/KtFirReferenceResolver.kt index bc6bb83764b..a48789e1f03 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/KtFirReferenceResolver.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/KtFirReferenceResolver.kt @@ -29,7 +29,7 @@ object KtFirReferenceResolver : ResolveCache.PolyVariantResolver { } catch (e: Exception) { if (shouldIjPlatformExceptionBeRethrown(e)) throw e - errorWithAttachment("Unable to resolve reference ${ref.element::class.java}", cause = e) { + errorWithAttachment("Unable to resolve reference ${ref.element::class}", cause = e) { withPsiEntry("reference", ref.element) } } diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/expressionTypeProvider/AbstractHLExpressionTypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/expressionTypeProvider/AbstractHLExpressionTypeTest.kt index 5f7c539e81e..731094bcc4e 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/expressionTypeProvider/AbstractHLExpressionTypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/expressionTypeProvider/AbstractHLExpressionTypeTest.kt @@ -31,7 +31,7 @@ abstract class AbstractHLExpressionTypeTest : AbstractAnalysisApiSingleFileTest( is KtExpression -> selected is KtValueArgument -> selected.getArgumentExpression() else -> null - } ?: error("expect an expression but got ${selected.text}, ${selected::class.java}") + } ?: error("expect an expression but got ${selected.text}, ${selected::class}") val type = executeOnPooledThreadInReadAction { analyseForTest(expression) { expression.getKtType()?.render(renderer, position = Variance.INVARIANT) } } diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiExpressionPsiTypeProviderTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiExpressionPsiTypeProviderTest.kt index 44865d1ac24..1675c043660 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiExpressionPsiTypeProviderTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiExpressionPsiTypeProviderTest.kt @@ -25,7 +25,7 @@ abstract class AbstractAnalysisApiExpressionPsiTypeProviderTest : AbstractAnalys val declarationAtCaret = when (val element = testServices.expressionMarkerProvider.getSelectedElement(ktFile)) { is KtExpression -> element is KtValueArgument -> element.getArgumentExpression()!! - else -> error("Unexpected element: $element of ${element::class.java}") + else -> error("Unexpected element: $element of ${element::class}") } val containingDeclaration = declarationAtCaret.parentOfType() ?: error("Can't find containing declaration for $declarationAtCaret") diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/testUtils.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/testUtils.kt index 49ea2410ab5..c7191d2423f 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/testUtils.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/testUtils.kt @@ -42,7 +42,7 @@ internal fun KtAnalysisSession.stringRepresentation(any: Any): String = with(any is KtConstructorSymbol -> "" is KtPropertyGetterSymbol -> callableIdIfNonLocal ?: "" is KtPropertySetterSymbol -> callableIdIfNonLocal ?: "" - else -> error("unexpected symbol kind in KtCall: ${this@with::class.java}") + else -> error("unexpected symbol kind in KtCall: ${this@with::class}") } ) append("(") diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt index f9ea551a7e5..4419343072c 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt @@ -187,7 +187,7 @@ public class DebugSymbolRenderer( is KtClassLikeSymbol -> renderId(symbol.classIdIfNonLocal, symbol) is KtCallableSymbol -> renderId(symbol.callableIdIfNonLocal, symbol) is KtNamedSymbol -> renderValue(symbol.name, renderSymbolsFully = false) - else -> error("Unsupported symbol ${symbol::class.java.name}") + else -> error("Unsupported symbol ${symbol::class}") } append(")") } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/containingFileUtils.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/containingFileUtils.kt index 25172fae9f1..914034689c4 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/containingFileUtils.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/containingFileUtils.kt @@ -34,6 +34,6 @@ fun FirElementWithResolveState.getContainingFile(): FirFile? { moduleComponents.cache.getCachedFirFile(ktFile) ?: error("Fir file for dandling modifier list cannot be null") } - else -> errorWithFirSpecificEntries("Unsupported declaration ${this::class.java}", fir = this) + else -> errorWithFirSpecificEntries("Unsupported declaration ${this::class}", fir = this) } } diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesParentingTestBase.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesParentingTestBase.kt index c22b74c0a3a..b61a239ceb3 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesParentingTestBase.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesParentingTestBase.kt @@ -230,7 +230,7 @@ open class AbstractSymbolLightClassesParentingTestBase( assertions.assertTrue(owner is SymbolLightMemberModifierList<*>) else -> - throw IllegalStateException("Unexpected annotation owner kind: ${lastDeclaration::class.java}") + throw IllegalStateException("Unexpected annotation owner kind: ${lastDeclaration::class}") } } diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt index 0b89bb0eba8..7ee9b25e903 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt @@ -90,7 +90,7 @@ interface ConeTypeContext : TypeSystemContext, TypeSystemOptimizationContext, Ty is ConeClassLikeType -> fullyExpandedType(session) is ConeSimpleKotlinType -> this is ConeFlexibleType -> null - else -> errorWithAttachment("Unknown simpleType: ${this::class.java}") { + else -> errorWithAttachment("Unknown simpleType: ${this::class}") { withConeTypeEntry("type", this@asSimpleType as? ConeKotlinType) } } diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt index 50b751c53e0..da1162ff9b9 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt @@ -1198,7 +1198,7 @@ open class PsiRawFirBuilder( block = when (file) { is KtExpressionCodeFragment -> file.getContentElement()?.toFirBlock() ?: buildEmptyExpressionBlock() is KtBlockCodeFragment -> configureBlockWithoutBuilding(file.getContentElement()).build() - else -> error("Unexpected code fragment type: " + file::class.java) + else -> error("Unexpected code fragment type: ${file::class}") } } } @@ -2267,7 +2267,7 @@ open class PsiRawFirBuilder( is KtEscapeStringTemplateEntry -> KtNodeTypes.ESCAPE_STRING_TEMPLATE_ENTRY is KtSimpleNameStringTemplateEntry -> KtNodeTypes.SHORT_STRING_TEMPLATE_ENTRY is KtBlockStringTemplateEntry -> KtNodeTypes.LONG_STRING_TEMPLATE_ENTRY - else -> errorWithAttachment("invalid node type ${element::class.java}") { + else -> errorWithAttachment("invalid node type ${element::class}") { withPsiEntry("element", element) } }