From cd61f545a802bbe7df6c009af6340a4dbcda5c7c Mon Sep 17 00:00:00 2001 From: Justin Paupore Date: Wed, 11 Jan 2023 15:29:34 -0800 Subject: [PATCH] [AA] Clean up typos in KtTypeRenderer. --- .../analysis/api/impl/base/components/KtRendererProvider.kt | 2 +- .../api/renderer/declarations/KtRendererTypeApproximator.kt | 2 +- .../declarations/impl/KtDeclarationRendererForSource.kt | 2 +- .../api/renderer/types/impl/KtTypeRendererForDebug.kt | 2 +- .../api/renderer/types/impl/KtTypeRendererForSource.kt | 4 ++-- .../api/renderer/types/renderers/KtCapturedTypeRenderer.kt | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/KtRendererProvider.kt b/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/KtRendererProvider.kt index e5cbc1fb8fd..61484117fd7 100644 --- a/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/KtRendererProvider.kt +++ b/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/KtRendererProvider.kt @@ -25,7 +25,7 @@ open class KtRendererProviderImpl( override fun renderType(type: KtType, renderer: KtTypeRenderer, position: Variance): String { return with(analysisSession) { - val approximatedType = KtRendererTypeApproximator.TO_DENNOTABLE.approximateType(type, position) + val approximatedType = KtRendererTypeApproximator.TO_DENOTABLE.approximateType(type, position) prettyPrint { renderer.renderType(approximatedType, this) } } } diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/KtRendererTypeApproximator.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/KtRendererTypeApproximator.kt index 5234b1d36bf..612d73fe192 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/KtRendererTypeApproximator.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/KtRendererTypeApproximator.kt @@ -13,7 +13,7 @@ public interface KtRendererTypeApproximator { context(KtAnalysisSession) public fun approximateType(type: KtType, position: Variance): KtType - public object TO_DENNOTABLE : KtRendererTypeApproximator { + public object TO_DENOTABLE : KtRendererTypeApproximator { context(KtAnalysisSession) override fun approximateType(type: KtType, position: Variance): KtType { return when (position) { diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/impl/KtDeclarationRendererForSource.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/impl/KtDeclarationRendererForSource.kt index 8c210882dcd..448adda2f11 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/impl/KtDeclarationRendererForSource.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/impl/KtDeclarationRendererForSource.kt @@ -80,7 +80,7 @@ public object KtDeclarationRendererForSource { typeRenderer = KtTypeRendererForSource.WITH_QUALIFIED_NAMES annotationRenderer = KtAnnotationRendererForSource.WITH_QUALIFIED_NAMES - declarationTypeApproximator = KtRendererTypeApproximator.TO_DENNOTABLE + declarationTypeApproximator = KtRendererTypeApproximator.TO_DENOTABLE returnTypeFilter = KtCallableReturnTypeFilter.NO_UNIT_FOR_FUNCTIONS } diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/impl/KtTypeRendererForDebug.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/impl/KtTypeRendererForDebug.kt index 8cfca176fc7..403660a8937 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/impl/KtTypeRendererForDebug.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/impl/KtTypeRendererForDebug.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.analysis.api.renderer.types.renderers.KtUnresolvedCl public object KtTypeRendererForDebug { public val WITH_QUALIFIED_NAMES: KtTypeRenderer = KtTypeRendererForSource.WITH_QUALIFIED_NAMES.with { - capturedTypeRenderer = KtCapturedTypeRenderer.AS_CAPUTRED_TYPE_WITH_PROJECTION + capturedTypeRenderer = KtCapturedTypeRenderer.AS_CAPTURED_TYPE_WITH_PROJECTION flexibleTypeRenderer = KtFlexibleTypeRenderer.AS_SHORT typeErrorTypeRenderer = KtTypeErrorTypeRenderer.WITH_ERROR_MESSAGE unresolvedClassErrorTypeRenderer = KtUnresolvedClassErrorTypeRenderer.WITH_ERROR_MESSAGE diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/impl/KtTypeRendererForSource.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/impl/KtTypeRendererForSource.kt index 9b823e173a9..a4f0b5e78f2 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/impl/KtTypeRendererForSource.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/impl/KtTypeRendererForSource.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.analysis.api.renderer.types.renderers.* public object KtTypeRendererForSource { public val WITH_QUALIFIED_NAMES: KtTypeRenderer = KtTypeRenderer { - capturedTypeRenderer = KtCapturedTypeRenderer.AS_RPOJECTION + capturedTypeRenderer = KtCapturedTypeRenderer.AS_PROJECTION definitelyNotNullTypeRenderer = KtDefinitelyNotNullTypeRenderer.AS_TYPE_INTERSECTION dynamicTypeRenderer = KtDynamicTypeRenderer.AS_DYNAMIC_WORD flexibleTypeRenderer = KtFlexibleTypeRenderer.AS_SHORT @@ -27,7 +27,7 @@ public object KtTypeRendererForSource { usualClassTypeRenderer = KtUsualClassTypeRenderer.AS_CLASS_TYPE_WITH_TYPE_ARGUMENTS classIdRenderer = KtClassTypeQualifierRenderer.WITH_QUALIFIED_NAMES typeNameRenderer = KtTypeNameRenderer.QUOTED - typeApproximator = KtRendererTypeApproximator.TO_DENNOTABLE + typeApproximator = KtRendererTypeApproximator.TO_DENOTABLE typeProjectionRenderer = KtTypeProjectionRenderer.WITH_VARIANCE annotationsRenderer = KtAnnotationRendererForSource.WITH_QUALIFIED_NAMES contextReceiversRenderer = KtContextReceiversRendererForSource.WITH_LABELS diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtCapturedTypeRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtCapturedTypeRenderer.kt index 4be38835153..1625e8ea29a 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtCapturedTypeRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtCapturedTypeRenderer.kt @@ -15,18 +15,18 @@ public interface KtCapturedTypeRenderer { context(KtAnalysisSession, KtTypeRenderer) public fun renderType(type: KtCapturedType, printer: PrettyPrinter) - public object AS_RPOJECTION : KtCapturedTypeRenderer { + public object AS_PROJECTION : KtCapturedTypeRenderer { context(KtAnalysisSession, KtTypeRenderer) override fun renderType(type: KtCapturedType, printer: PrettyPrinter) { typeProjectionRenderer.renderTypeProjection(type.projection, printer) } } - public object AS_CAPUTRED_TYPE_WITH_PROJECTION : KtCapturedTypeRenderer { + public object AS_CAPTURED_TYPE_WITH_PROJECTION : KtCapturedTypeRenderer { context(KtAnalysisSession, KtTypeRenderer) override fun renderType(type: KtCapturedType, printer: PrettyPrinter) { printer.append("CapturedType(") - AS_RPOJECTION.renderType(type, printer) + AS_PROJECTION.renderType(type, printer) printer.append(")") } }