From 2851622a6f33dce28830a62a1d7a42b523dc403a Mon Sep 17 00:00:00 2001 From: Marco Pennekamp Date: Mon, 28 Nov 2022 17:28:27 +0100 Subject: [PATCH] [AA] Fix typos in renderers --- ...malAnalysisSourceModuleRendererTestGenerated.java | 12 ++++++------ ...entAnalysisSourceModuleRendererTestGenerated.java | 12 ++++++------ ...malAnalysisSourceModuleRendererTestGenerated.java | 12 ++++++------ ...malAnalysisSourceModuleRendererTestGenerated.java | 12 ++++++------ .../renderer/declarations/KtDeclarationRenderer.kt | 8 ++++---- .../impl/KtDeclarationRendererForSource.kt | 2 +- .../api/renderer/declarations/ktRendererUtils.kt | 2 +- .../renderers/KtClassInitializerRenderer.kt | 2 +- .../renderers/KtTypeParametersRenderer.kt | 2 +- .../callables/KtBackingFieldSymbolRenderer.kt | 2 +- ...atureRender.kt => KtCallableSignatureRenderer.kt} | 4 ++-- .../KtNamedClassOrObjectSymbolRenderer.kt | 2 +- .../analysis/api/renderer/types/KtTypeRenderer.kt | 11 +++++------ .../renderer/types/impl/KtTypeRendererForDebug.kt | 8 ++++---- .../renderer/types/impl/KtTypeRendererForSource.kt | 6 +++--- .../{renders => renderers}/KtCapturedTypeRenderer.kt | 2 +- .../KtClassTypeQualifierRenderer.kt | 2 +- .../KtDefinitelyNotNullTypeRenderer.kt | 2 +- .../{renders => renderers}/KtDynamicTypeRenderer.kt | 2 +- .../{renders => renderers}/KtFlexibleTypeRenderer.kt | 4 ++-- .../KtFunctionalTypeRenderer.kt | 12 ++++++------ .../KtIntegerLiteralTypeRenderer.kt | 2 +- .../KtIntersectionTypeRenderer.kt | 2 +- .../KtTypeErrorTypeRenderer.kt | 2 +- .../{renders => renderers}/KtTypeNameRenderer.kt | 2 +- .../KtTypeParameterTypeRenderer.kt | 4 ++-- .../KtTypeProjectionRenderer.kt | 2 +- .../KtUnresolvedClassErrorTypeRenderer.kt | 4 ++-- .../KtUsualClassTypeRenderer.kt | 4 ++-- .../{annotaionOnTypes.kt => annotationOnTypes.kt} | 0 ...onOnTypes.rendered => annotationOnTypes.rendered} | 0 ....kt => annotationOnTypesWithComplexExpression.kt} | 0 ... annotationOnTypesWithComplexExpression.rendered} | 0 33 files changed, 71 insertions(+), 72 deletions(-) rename analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/callables/{KtCallableSignatureRender.kt => KtCallableSignatureRenderer.kt} (95%) rename analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/{renders => renderers}/KtCapturedTypeRenderer.kt (95%) rename analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/{renders => renderers}/KtClassTypeQualifierRenderer.kt (97%) rename analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/{renders => renderers}/KtDefinitelyNotNullTypeRenderer.kt (93%) rename analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/{renders => renderers}/KtDynamicTypeRenderer.kt (93%) rename analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/{renders => renderers}/KtFlexibleTypeRenderer.kt (96%) rename analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/{renders => renderers}/KtFunctionalTypeRenderer.kt (81%) rename analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/{renders => renderers}/KtIntegerLiteralTypeRenderer.kt (93%) rename analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/{renders => renderers}/KtIntersectionTypeRenderer.kt (93%) rename analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/{renders => renderers}/KtTypeErrorTypeRenderer.kt (95%) rename analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/{renders => renderers}/KtTypeNameRenderer.kt (94%) rename analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/{renders => renderers}/KtTypeParameterTypeRenderer.kt (89%) rename analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/{renders => renderers}/KtTypeProjectionRenderer.kt (96%) rename analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/{renders => renderers}/KtUnresolvedClassErrorTypeRenderer.kt (92%) rename analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/{renders => renderers}/KtUsualClassTypeRenderer.kt (89%) rename analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/{annotaionOnTypes.kt => annotationOnTypes.kt} (100%) rename analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/{annotaionOnTypes.rendered => annotationOnTypes.rendered} (100%) rename analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/{annotaionOnTypesWithComplexExpression.kt => annotationOnTypesWithComplexExpression.kt} (100%) rename analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/{annotaionOnTypesWithComplexExpression.rendered => annotationOnTypesWithComplexExpression.rendered} (100%) diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/symbolDeclarationRenderer/Fe10IdeNormalAnalysisSourceModuleRendererTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/symbolDeclarationRenderer/Fe10IdeNormalAnalysisSourceModuleRendererTestGenerated.java index 00214d292ac..062ff7f11d6 100644 --- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/symbolDeclarationRenderer/Fe10IdeNormalAnalysisSourceModuleRendererTestGenerated.java +++ b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/symbolDeclarationRenderer/Fe10IdeNormalAnalysisSourceModuleRendererTestGenerated.java @@ -218,15 +218,15 @@ public class Fe10IdeNormalAnalysisSourceModuleRendererTestGenerated extends Abst } @Test - @TestMetadata("annotaionOnTypes.kt") - public void testAnnotaionOnTypes() throws Exception { - runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypes.kt"); + @TestMetadata("annotationOnTypes.kt") + public void testAnnotationOnTypes() throws Exception { + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotationOnTypes.kt"); } @Test - @TestMetadata("annotaionOnTypesWithComplexExpression.kt") - public void testAnnotaionOnTypesWithComplexExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypesWithComplexExpression.kt"); + @TestMetadata("annotationOnTypesWithComplexExpression.kt") + public void testAnnotationOnTypesWithComplexExpression() throws Exception { + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotationOnTypesWithComplexExpression.kt"); } } } diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/symbolDeclarationRenderer/FirIdeDependentAnalysisSourceModuleRendererTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/symbolDeclarationRenderer/FirIdeDependentAnalysisSourceModuleRendererTestGenerated.java index 46e85307cf0..558774a9a6e 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/symbolDeclarationRenderer/FirIdeDependentAnalysisSourceModuleRendererTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/symbolDeclarationRenderer/FirIdeDependentAnalysisSourceModuleRendererTestGenerated.java @@ -218,15 +218,15 @@ public class FirIdeDependentAnalysisSourceModuleRendererTestGenerated extends Ab } @Test - @TestMetadata("annotaionOnTypes.kt") - public void testAnnotaionOnTypes() throws Exception { - runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypes.kt"); + @TestMetadata("annotationOnTypes.kt") + public void testAnnotationOnTypes() throws Exception { + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotationOnTypes.kt"); } @Test - @TestMetadata("annotaionOnTypesWithComplexExpression.kt") - public void testAnnotaionOnTypesWithComplexExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypesWithComplexExpression.kt"); + @TestMetadata("annotationOnTypesWithComplexExpression.kt") + public void testAnnotationOnTypesWithComplexExpression() throws Exception { + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotationOnTypesWithComplexExpression.kt"); } } } diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/symbolDeclarationRenderer/FirIdeNormalAnalysisSourceModuleRendererTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/symbolDeclarationRenderer/FirIdeNormalAnalysisSourceModuleRendererTestGenerated.java index 9549d89feca..8727f13c551 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/symbolDeclarationRenderer/FirIdeNormalAnalysisSourceModuleRendererTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/symbolDeclarationRenderer/FirIdeNormalAnalysisSourceModuleRendererTestGenerated.java @@ -218,15 +218,15 @@ public class FirIdeNormalAnalysisSourceModuleRendererTestGenerated extends Abstr } @Test - @TestMetadata("annotaionOnTypes.kt") - public void testAnnotaionOnTypes() throws Exception { - runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypes.kt"); + @TestMetadata("annotationOnTypes.kt") + public void testAnnotationOnTypes() throws Exception { + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotationOnTypes.kt"); } @Test - @TestMetadata("annotaionOnTypesWithComplexExpression.kt") - public void testAnnotaionOnTypesWithComplexExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypesWithComplexExpression.kt"); + @TestMetadata("annotationOnTypesWithComplexExpression.kt") + public void testAnnotationOnTypesWithComplexExpression() throws Exception { + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotationOnTypesWithComplexExpression.kt"); } } } diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/symbolDeclarationRenderer/FirStandaloneNormalAnalysisSourceModuleRendererTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/symbolDeclarationRenderer/FirStandaloneNormalAnalysisSourceModuleRendererTestGenerated.java index b3e7234cecc..e38bb48835d 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/symbolDeclarationRenderer/FirStandaloneNormalAnalysisSourceModuleRendererTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/symbolDeclarationRenderer/FirStandaloneNormalAnalysisSourceModuleRendererTestGenerated.java @@ -218,15 +218,15 @@ public class FirStandaloneNormalAnalysisSourceModuleRendererTestGenerated extend } @Test - @TestMetadata("annotaionOnTypes.kt") - public void testAnnotaionOnTypes() throws Exception { - runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypes.kt"); + @TestMetadata("annotationOnTypes.kt") + public void testAnnotationOnTypes() throws Exception { + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotationOnTypes.kt"); } @Test - @TestMetadata("annotaionOnTypesWithComplexExpression.kt") - public void testAnnotaionOnTypesWithComplexExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypesWithComplexExpression.kt"); + @TestMetadata("annotationOnTypesWithComplexExpression.kt") + public void testAnnotationOnTypesWithComplexExpression() throws Exception { + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotationOnTypesWithComplexExpression.kt"); } } } diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/KtDeclarationRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/KtDeclarationRenderer.kt index 0730d1667a4..61f0040883a 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/KtDeclarationRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/KtDeclarationRenderer.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.analysis.utils.printer.PrettyPrinter public class KtDeclarationRenderer private constructor( public val nameRenderer: KtDeclarationNameRenderer, - public val keywordRender: KtKeywordRenderer, + public val keywordRenderer: KtKeywordRenderer, public val codeStyle: KtRendererCodeStyle, public val typeRenderer: KtTypeRenderer, public val annotationRenderer: KtAnnotationRenderer, @@ -55,7 +55,7 @@ public class KtDeclarationRenderer private constructor( public val typeParametersRenderer: KtTypeParametersRenderer, public val typeParametersFilter: KtTypeParameterRendererFilter, - public val callableSignatureRenderer: KtCallableSignatureRender, + public val callableSignatureRenderer: KtCallableSignatureRenderer, public val anonymousFunctionRenderer: KtAnonymousFunctionSymbolRenderer, public val backingFieldRenderer: KtBackingFieldSymbolRenderer, @@ -109,7 +109,7 @@ public class KtDeclarationRenderer private constructor( val renderer = this return KtDeclarationRenderer { this.nameRenderer = renderer.nameRenderer - this.keywordRender = renderer.keywordRender + this.keywordRender = renderer.keywordRenderer this.codeStyle = renderer.codeStyle this.typeRenderer = renderer.typeRenderer this.annotationRenderer = renderer.annotationRenderer @@ -201,7 +201,7 @@ public class KtDeclarationRenderer private constructor( public lateinit var valueParametersRenderer: KtCallableParameterRenderer public lateinit var typeParametersRenderer: KtTypeParametersRenderer public lateinit var typeParametersFilter: KtTypeParameterRendererFilter - public lateinit var callableSignatureRenderer: KtCallableSignatureRender + public lateinit var callableSignatureRenderer: KtCallableSignatureRenderer public lateinit var anonymousFunctionRenderer: KtAnonymousFunctionSymbolRenderer public lateinit var backingFieldRenderer: KtBackingFieldSymbolRenderer 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 87518a212cd..96549f59ca0 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 @@ -62,7 +62,7 @@ public object KtDeclarationRendererForSource { valueParameterRenderer = KtValueParameterSymbolRenderer.AS_SOURCE samConstructorRenderer = KtSamConstructorSymbolRenderer.NOT_RENDER - callableSignatureRenderer = KtCallableSignatureRender.FOR_SOURCE + callableSignatureRenderer = KtCallableSignatureRenderer.FOR_SOURCE accessorBodyRenderer = KtPropertyAccessorBodyRenderer.NO_BODY parameterDefaultValueRenderer = KtParameterDefaultValueRenderer.NO_DEFAULT_VALUE variableInitializerRenderer = KtVariableInitializerRenderer.NO_INITIALIZER diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/ktRendererUtils.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/ktRendererUtils.kt index 5229bab9d8f..a4acc8d440f 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/ktRendererUtils.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/ktRendererUtils.kt @@ -39,7 +39,7 @@ public fun renderAnnotationsAndModifiers( } withPrefix(separator) { - keywordRender.renderKeywords(keywords, symbol, printer) + keywordRenderer.renderKeywords(keywords, symbol, printer) } } diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/KtClassInitializerRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/KtClassInitializerRenderer.kt index b4bc85635d0..90c949a07c2 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/KtClassInitializerRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/KtClassInitializerRenderer.kt @@ -19,7 +19,7 @@ public interface KtClassInitializerRenderer { context(KtAnalysisSession, KtDeclarationRenderer) override fun renderClassInitializer(symbol: KtClassInitializerSymbol, printer: PrettyPrinter): Unit = printer { " ".separated( - { keywordRender.renderKeyword(KtTokens.INIT_KEYWORD, symbol, this) }, + { keywordRenderer.renderKeyword(KtTokens.INIT_KEYWORD, symbol, this) }, { printer.withIndentInBraces {} }, ) } diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/KtTypeParametersRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/KtTypeParametersRenderer.kt index 750d7d7e372..332e6726cfe 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/KtTypeParametersRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/KtTypeParametersRenderer.kt @@ -78,7 +78,7 @@ public interface KtTypeParametersRenderer { } }.ifEmpty { return } " ".separated( - { keywordRender.renderKeyword(KtTokens.WHERE_KEYWORD, symbol, printer) }, + { keywordRenderer.renderKeyword(KtTokens.WHERE_KEYWORD, symbol, printer) }, { printer.printCollection(allBounds) { (typeParameter, bound) -> " : ".separated( diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/callables/KtBackingFieldSymbolRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/callables/KtBackingFieldSymbolRenderer.kt index 3a01ed35b99..cb099c37d6c 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/callables/KtBackingFieldSymbolRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/callables/KtBackingFieldSymbolRenderer.kt @@ -18,7 +18,7 @@ public interface KtBackingFieldSymbolRenderer { public object AS_FIELD_KEYWROD : KtBackingFieldSymbolRenderer { context(KtAnalysisSession, KtDeclarationRenderer) override fun renderSymbol(symbol: KtBackingFieldSymbol, printer: PrettyPrinter): Unit = printer { - keywordRender.renderKeyword(KtTokens.FIELD_KEYWORD, symbol, printer) + keywordRenderer.renderKeyword(KtTokens.FIELD_KEYWORD, symbol, printer) } } } \ No newline at end of file diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/callables/KtCallableSignatureRender.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/callables/KtCallableSignatureRenderer.kt similarity index 95% rename from analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/callables/KtCallableSignatureRender.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/callables/KtCallableSignatureRenderer.kt index c9887413820..1e2174c62aa 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/callables/KtCallableSignatureRender.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/callables/KtCallableSignatureRenderer.kt @@ -13,11 +13,11 @@ import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol import org.jetbrains.kotlin.analysis.utils.printer.PrettyPrinter import org.jetbrains.kotlin.lexer.KtKeywordToken -public interface KtCallableSignatureRender { +public interface KtCallableSignatureRenderer { context(KtAnalysisSession, KtDeclarationRenderer) public fun renderCallableSignature(symbol: KtCallableSymbol, keyword: KtKeywordToken?, printer: PrettyPrinter) - public object FOR_SOURCE : KtCallableSignatureRender { + public object FOR_SOURCE : KtCallableSignatureRenderer { context(KtAnalysisSession, KtDeclarationRenderer) override fun renderCallableSignature(symbol: KtCallableSymbol, keyword: KtKeywordToken?, printer: PrettyPrinter): Unit = printer { " ".separated( diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/classifiers/KtNamedClassOrObjectSymbolRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/classifiers/KtNamedClassOrObjectSymbolRenderer.kt index 6c63da69ed7..7949288ffe8 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/classifiers/KtNamedClassOrObjectSymbolRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/renderers/classifiers/KtNamedClassOrObjectSymbolRenderer.kt @@ -44,7 +44,7 @@ public interface KtNamedClassOrObjectSymbolRenderer { val annotationsPrinted = checkIfPrinted { renderAnnotationsAndModifiers(primaryConstructor, printer) } if (annotationsPrinted) { withPrefix(" ") { - keywordRender.renderKeyword(KtTokens.CONSTRUCTOR_KEYWORD, primaryConstructor, printer) + keywordRenderer.renderKeyword(KtTokens.CONSTRUCTOR_KEYWORD, primaryConstructor, printer) } } if (primaryConstructor.valueParameters.isNotEmpty()) { diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/KtTypeRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/KtTypeRenderer.kt index c07514e91a5..6cd31456b29 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/KtTypeRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/KtTypeRenderer.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.renderer.base.KtKeywordRenderer import org.jetbrains.kotlin.analysis.api.renderer.base.annotations.KtAnnotationRenderer import org.jetbrains.kotlin.analysis.api.renderer.declarations.KtRendererTypeApproximator -import org.jetbrains.kotlin.analysis.api.renderer.types.renders.* +import org.jetbrains.kotlin.analysis.api.renderer.types.renderers.* import org.jetbrains.kotlin.analysis.api.types.* import org.jetbrains.kotlin.analysis.utils.printer.PrettyPrinter @@ -30,7 +30,7 @@ public class KtTypeRenderer private constructor( public val typeNameRenderer: KtTypeNameRenderer, public val typeApproximator: KtRendererTypeApproximator, public val typeProjectionRenderer: KtTypeProjectionRenderer, - public val annotationsRender: KtAnnotationRenderer, + public val annotationsRenderer: KtAnnotationRenderer, public val keywordRenderer: KtKeywordRenderer, ) { context(KtAnalysisSession) @@ -68,7 +68,7 @@ public class KtTypeRenderer private constructor( this.typeNameRenderer = renderer.typeNameRenderer this.typeApproximator = renderer.typeApproximator this.typeProjectionRenderer = renderer.typeProjectionRenderer - this.annotationsRender = renderer.annotationsRender + this.annotationsRenderer = renderer.annotationsRenderer this.keywordRenderer = renderer.keywordRenderer action() } @@ -95,10 +95,9 @@ public class KtTypeRenderer private constructor( public lateinit var typeNameRenderer: KtTypeNameRenderer public lateinit var typeApproximator: KtRendererTypeApproximator public lateinit var typeProjectionRenderer: KtTypeProjectionRenderer - public lateinit var annotationsRender: KtAnnotationRenderer + public lateinit var annotationsRenderer: KtAnnotationRenderer public lateinit var keywordRenderer: KtKeywordRenderer - public fun build(): KtTypeRenderer = KtTypeRenderer( capturedTypeRenderer, definitelyNotNullTypeRenderer, @@ -115,7 +114,7 @@ public class KtTypeRenderer private constructor( typeNameRenderer, typeApproximator, typeProjectionRenderer, - annotationsRender, + annotationsRenderer, keywordRenderer, ) } 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 0543f462e04..8cfca176fc7 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 @@ -6,10 +6,10 @@ package org.jetbrains.kotlin.analysis.api.renderer.types.impl import org.jetbrains.kotlin.analysis.api.renderer.types.KtTypeRenderer -import org.jetbrains.kotlin.analysis.api.renderer.types.renders.KtCapturedTypeRenderer -import org.jetbrains.kotlin.analysis.api.renderer.types.renders.KtFlexibleTypeRenderer -import org.jetbrains.kotlin.analysis.api.renderer.types.renders.KtTypeErrorTypeRenderer -import org.jetbrains.kotlin.analysis.api.renderer.types.renders.KtUnresolvedClassErrorTypeRenderer +import org.jetbrains.kotlin.analysis.api.renderer.types.renderers.KtCapturedTypeRenderer +import org.jetbrains.kotlin.analysis.api.renderer.types.renderers.KtFlexibleTypeRenderer +import org.jetbrains.kotlin.analysis.api.renderer.types.renderers.KtTypeErrorTypeRenderer +import org.jetbrains.kotlin.analysis.api.renderer.types.renderers.KtUnresolvedClassErrorTypeRenderer public object KtTypeRendererForDebug { public val WITH_QUALIFIED_NAMES: KtTypeRenderer = KtTypeRendererForSource.WITH_QUALIFIED_NAMES.with { 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 d0ee54d1233..8c512797d6d 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 @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.analysis.api.renderer.base.KtKeywordRenderer import org.jetbrains.kotlin.analysis.api.renderer.base.annotations.KtAnnotationRendererForSource import org.jetbrains.kotlin.analysis.api.renderer.declarations.KtRendererTypeApproximator import org.jetbrains.kotlin.analysis.api.renderer.types.KtTypeRenderer -import org.jetbrains.kotlin.analysis.api.renderer.types.renders.* +import org.jetbrains.kotlin.analysis.api.renderer.types.renderers.* public object KtTypeRendererForSource { public val WITH_QUALIFIED_NAMES: KtTypeRenderer = KtTypeRenderer { @@ -28,12 +28,12 @@ public object KtTypeRendererForSource { typeNameRenderer = KtTypeNameRenderer.QUOTED typeApproximator = KtRendererTypeApproximator.TO_DENNOTABLE typeProjectionRenderer = KtTypeProjectionRenderer.WITH_VARIANCE - annotationsRender = KtAnnotationRendererForSource.WITH_QUALIFIED_NAMES + annotationsRenderer = KtAnnotationRendererForSource.WITH_QUALIFIED_NAMES keywordRenderer = KtKeywordRenderer.AS_WORD } public val WITH_SHORT_NAMES: KtTypeRenderer = WITH_QUALIFIED_NAMES.with { classIdRenderer = KtClassTypeQualifierRenderer.WITH_SHORT_NAMES_WITH_NESTED_CLASSIFIERS - annotationsRender = KtAnnotationRendererForSource.WITH_SHORT_NAMES + annotationsRenderer = KtAnnotationRendererForSource.WITH_SHORT_NAMES } } \ No newline at end of file diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtCapturedTypeRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtCapturedTypeRenderer.kt similarity index 95% rename from analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtCapturedTypeRenderer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtCapturedTypeRenderer.kt index 66f21ea1343..4be38835153 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtCapturedTypeRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtCapturedTypeRenderer.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.renderer.types.renders +package org.jetbrains.kotlin.analysis.api.renderer.types.renderers import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.renderer.types.KtTypeRenderer diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtClassTypeQualifierRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtClassTypeQualifierRenderer.kt similarity index 97% rename from analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtClassTypeQualifierRenderer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtClassTypeQualifierRenderer.kt index 9601ce459ed..08221613e36 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtClassTypeQualifierRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtClassTypeQualifierRenderer.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.renderer.types.renders +package org.jetbrains.kotlin.analysis.api.renderer.types.renderers import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.renderer.types.KtTypeRenderer diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtDefinitelyNotNullTypeRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtDefinitelyNotNullTypeRenderer.kt similarity index 93% rename from analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtDefinitelyNotNullTypeRenderer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtDefinitelyNotNullTypeRenderer.kt index 95876ebe3a1..1005408dda8 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtDefinitelyNotNullTypeRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtDefinitelyNotNullTypeRenderer.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.renderer.types.renders +package org.jetbrains.kotlin.analysis.api.renderer.types.renderers import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.renderer.types.KtTypeRenderer diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtDynamicTypeRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtDynamicTypeRenderer.kt similarity index 93% rename from analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtDynamicTypeRenderer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtDynamicTypeRenderer.kt index c4b8286be1a..09643582887 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtDynamicTypeRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtDynamicTypeRenderer.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.renderer.types.renders +package org.jetbrains.kotlin.analysis.api.renderer.types.renderers import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.renderer.types.KtTypeRenderer diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtFlexibleTypeRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtFlexibleTypeRenderer.kt similarity index 96% rename from analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtFlexibleTypeRenderer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtFlexibleTypeRenderer.kt index 8b2baed78e9..c39473dda7e 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtFlexibleTypeRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtFlexibleTypeRenderer.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.renderer.types.renders +package org.jetbrains.kotlin.analysis.api.renderer.types.renderers import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.renderer.types.KtTypeRenderer @@ -43,7 +43,7 @@ public interface KtFlexibleTypeRenderer { isMutabilityFlexibleType(lower, upper) -> { " ".separated( - { annotationsRender.renderAnnotations(type, printer) }, + { annotationsRenderer.renderAnnotations(type, printer) }, { append(lower.classId.asFqNameString().replace("Mutable", "(Mutable)")) }, ) printCollectionIfNotEmpty(lower.ownTypeArguments, prefix = "<", postfix = ">") { typeArgument -> diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtFunctionalTypeRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtFunctionalTypeRenderer.kt similarity index 81% rename from analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtFunctionalTypeRenderer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtFunctionalTypeRenderer.kt index 96514850a9c..624d972eecc 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtFunctionalTypeRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtFunctionalTypeRenderer.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.renderer.types.renders +package org.jetbrains.kotlin.analysis.api.renderer.types.renderers import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.renderer.types.KtTypeRenderer @@ -20,9 +20,9 @@ public interface KtFunctionalTypeRenderer { public object AS_FUNCTIONAL_TYPE : KtFunctionalTypeRenderer { context(KtAnalysisSession, KtTypeRenderer) override fun renderType(type: KtFunctionalType, printer: PrettyPrinter): Unit = printer { - val annotationsRendererd = checkIfPrinted { annotationsRender.renderAnnotations(type, this) } - if (annotationsRendererd) printer.append(" ") - if (annotationsRendererd || type.nullability == KtTypeNullability.NULLABLE) append("(") + val annotationsRendered = checkIfPrinted { annotationsRenderer.renderAnnotations(type, this) } + if (annotationsRendered) printer.append(" ") + if (annotationsRendered || type.nullability == KtTypeNullability.NULLABLE) append("(") " ".separated( { if (type.isSuspend) { @@ -38,7 +38,7 @@ public interface KtFunctionalTypeRenderer { renderType(type.returnType, printer) }, ) - if (annotationsRendererd || type.nullability == KtTypeNullability.NULLABLE) append(")") + if (annotationsRendered || type.nullability == KtTypeNullability.NULLABLE) append(")") if (type.nullability == KtTypeNullability.NULLABLE) append("?") } } @@ -47,7 +47,7 @@ public interface KtFunctionalTypeRenderer { context(KtAnalysisSession, KtTypeRenderer) override fun renderType(type: KtFunctionalType, printer: PrettyPrinter): Unit = printer { " ".separated( - { annotationsRender.renderAnnotations(type, printer) }, + { annotationsRenderer.renderAnnotations(type, printer) }, { classIdRenderer.renderClassTypeQualifier(type, printer) if (type.nullability == KtTypeNullability.NULLABLE) { diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtIntegerLiteralTypeRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtIntegerLiteralTypeRenderer.kt similarity index 93% rename from analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtIntegerLiteralTypeRenderer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtIntegerLiteralTypeRenderer.kt index a433710ac3a..6dbe0a66d40 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtIntegerLiteralTypeRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtIntegerLiteralTypeRenderer.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.renderer.types.renders +package org.jetbrains.kotlin.analysis.api.renderer.types.renderers import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.renderer.types.KtTypeRenderer diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtIntersectionTypeRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtIntersectionTypeRenderer.kt similarity index 93% rename from analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtIntersectionTypeRenderer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtIntersectionTypeRenderer.kt index 00a152c978e..2479dd2ecd7 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtIntersectionTypeRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtIntersectionTypeRenderer.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.renderer.types.renders +package org.jetbrains.kotlin.analysis.api.renderer.types.renderers import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.renderer.types.KtTypeRenderer diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtTypeErrorTypeRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtTypeErrorTypeRenderer.kt similarity index 95% rename from analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtTypeErrorTypeRenderer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtTypeErrorTypeRenderer.kt index 82c23f6a152..b3d081bef2a 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtTypeErrorTypeRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtTypeErrorTypeRenderer.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.renderer.types.renders +package org.jetbrains.kotlin.analysis.api.renderer.types.renderers import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.renderer.types.KtTypeRenderer diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtTypeNameRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtTypeNameRenderer.kt similarity index 94% rename from analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtTypeNameRenderer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtTypeNameRenderer.kt index 5ee85eca1e4..75933361583 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtTypeNameRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtTypeNameRenderer.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.renderer.types.renders +package org.jetbrains.kotlin.analysis.api.renderer.types.renderers import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.renderer.types.KtTypeRenderer diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtTypeParameterTypeRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtTypeParameterTypeRenderer.kt similarity index 89% rename from analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtTypeParameterTypeRenderer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtTypeParameterTypeRenderer.kt index 63da3ae120a..e04ae058b13 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtTypeParameterTypeRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtTypeParameterTypeRenderer.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.renderer.types.renders +package org.jetbrains.kotlin.analysis.api.renderer.types.renderers import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.renderer.types.KtTypeRenderer @@ -20,7 +20,7 @@ public interface KtTypeParameterTypeRenderer { context(KtAnalysisSession, KtTypeRenderer) override fun renderType(type: KtTypeParameterType, printer: PrettyPrinter): Unit = printer { " ".separated( - { annotationsRender.renderAnnotations(type, printer) }, + { annotationsRenderer.renderAnnotations(type, printer) }, { typeNameRenderer.renderName(type.name, type, printer) if (type.nullability == KtTypeNullability.NULLABLE) { diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtTypeProjectionRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtTypeProjectionRenderer.kt similarity index 96% rename from analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtTypeProjectionRenderer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtTypeProjectionRenderer.kt index 71548a6d43a..1212dc8dd49 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtTypeProjectionRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtTypeProjectionRenderer.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.renderer.types.renders +package org.jetbrains.kotlin.analysis.api.renderer.types.renderers import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtStarTypeProjection diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtUnresolvedClassErrorTypeRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtUnresolvedClassErrorTypeRenderer.kt similarity index 92% rename from analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtUnresolvedClassErrorTypeRenderer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtUnresolvedClassErrorTypeRenderer.kt index eef1659b5f2..ee66fdaa2fe 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtUnresolvedClassErrorTypeRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtUnresolvedClassErrorTypeRenderer.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.renderer.types.renders +package org.jetbrains.kotlin.analysis.api.renderer.types.renderers import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.renderer.types.KtTypeRenderer @@ -17,7 +17,7 @@ public interface KtUnresolvedClassErrorTypeRenderer { public object UNRESOLVED_QUALIFIER : KtUnresolvedClassErrorTypeRenderer { context(KtAnalysisSession, KtTypeRenderer) override fun renderType(type: KtClassErrorType, printer: PrettyPrinter): Unit = printer { - annotationsRender.renderAnnotations(type, printer) + annotationsRenderer.renderAnnotations(type, printer) classIdRenderer.renderClassTypeQualifier(type, printer) } } diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtUsualClassTypeRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtUsualClassTypeRenderer.kt similarity index 89% rename from analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtUsualClassTypeRenderer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtUsualClassTypeRenderer.kt index 530e1134a96..5b16caa8a50 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renders/KtUsualClassTypeRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtUsualClassTypeRenderer.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.renderer.types.renders +package org.jetbrains.kotlin.analysis.api.renderer.types.renderers import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.renderer.types.KtTypeRenderer @@ -20,7 +20,7 @@ public interface KtUsualClassTypeRenderer { context(KtAnalysisSession, KtTypeRenderer) override fun renderType(type: KtUsualClassType, printer: PrettyPrinter): Unit = printer { " ".separated( - { annotationsRender.renderAnnotations(type, printer) }, + { annotationsRenderer.renderAnnotations(type, printer) }, { classIdRenderer.renderClassTypeQualifier(type, printer) if (type.nullability == KtTypeNullability.NULLABLE) { diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypes.kt b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotationOnTypes.kt similarity index 100% rename from analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypes.kt rename to analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotationOnTypes.kt diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypes.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotationOnTypes.rendered similarity index 100% rename from analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypes.rendered rename to analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotationOnTypes.rendered diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypesWithComplexExpression.kt b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotationOnTypesWithComplexExpression.kt similarity index 100% rename from analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypesWithComplexExpression.kt rename to analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotationOnTypesWithComplexExpression.kt diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypesWithComplexExpression.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotationOnTypesWithComplexExpression.rendered similarity index 100% rename from analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypesWithComplexExpression.rendered rename to analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotationOnTypesWithComplexExpression.rendered