From 7a745cfe5c1196add7c06d5d4aad01c5a2513c77 Mon Sep 17 00:00:00 2001 From: Tianyu Geng Date: Thu, 29 Apr 2021 11:00:17 -0700 Subject: [PATCH] FIR IDE: Remove unnecessary renderAnnotations option --- .../idea/core/overrideImplement/KtGenerateMembersHandler.kt | 1 - .../api/components/KtSymbolDeclarationRendererProvider.kt | 3 --- .../idea/frontend/api/fir/renderer/ConeTypeIdeRenderer.kt | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/idea/idea-fir/src/org/jetbrains/kotlin/idea/core/overrideImplement/KtGenerateMembersHandler.kt b/idea/idea-fir/src/org/jetbrains/kotlin/idea/core/overrideImplement/KtGenerateMembersHandler.kt index d7a121b583f..5311125bf2f 100644 --- a/idea/idea-fir/src/org/jetbrains/kotlin/idea/core/overrideImplement/KtGenerateMembersHandler.kt +++ b/idea/idea-fir/src/org/jetbrains/kotlin/idea/core/overrideImplement/KtGenerateMembersHandler.kt @@ -308,7 +308,6 @@ internal abstract class KtGenerateMembersHandler : AbstractGenerateMembersHandle typeRendererOptions = KtTypeRendererOptions( shortQualifiedNames = true, renderFunctionType = true, - renderAnnotations = false ) ) } diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolDeclarationRendererProvider.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolDeclarationRendererProvider.kt index 4b39ebbc077..aad26cf72c9 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolDeclarationRendererProvider.kt +++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolDeclarationRendererProvider.kt @@ -7,7 +7,6 @@ package org.jetbrains.kotlin.idea.frontend.api.components import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol import org.jetbrains.kotlin.idea.frontend.api.types.KtType -import javax.swing.Icon /** * KtType to string renderer options @@ -25,8 +24,6 @@ data class KtTypeRendererOptions( * @sample Function0 returns () -> Int */ val renderFunctionType: Boolean = true, - - val renderAnnotations: Boolean = true, ) { companion object { val DEFAULT = KtTypeRendererOptions() diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/renderer/ConeTypeIdeRenderer.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/renderer/ConeTypeIdeRenderer.kt index 6eb89db887e..4608944f934 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/renderer/ConeTypeIdeRenderer.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/renderer/ConeTypeIdeRenderer.kt @@ -36,7 +36,7 @@ internal class ConeTypeIdeRenderer( private var filterExtensionFunctionType: Boolean = false private fun StringBuilder.renderAnnotationList(annotations: List?) { - if (annotations != null && options.renderAnnotations) { + if (annotations != null) { val filteredExtensionIfNeeded = annotations.applyIf(filterExtensionFunctionType) { annotations.filterNot { it.toAnnotationClassId() == StandardClassIds.extensionFunctionType } }