Commit 25370dc6 authored by Roman Golyshev's avatar Roman Golyshev Committed by intellij-monorepo-bot
Browse files

[FIR IDE] Small refactoring of `KtClassMember`

- optimize imports
- use @NlsSafe to avoid warning
- remove checking `KtFunctionSymbol is KtConstructorSymbol` (it is always false)

GitOrigin-RevId: cca3fe99c5a5a129ca0e836254333e914ad27d05
parent f8b48ec4
Branches unavailable Tags unavailable
Showing with 6 additions and 14 deletions
+6 -14
......@@ -6,17 +6,17 @@ import com.intellij.codeInsight.generation.ClassMember
import com.intellij.codeInsight.generation.MemberChooserObject
import com.intellij.codeInsight.generation.MemberChooserObjectBase
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.NlsSafe
import com.intellij.psi.PsiDocCommentOwner
import org.jetbrains.kotlin.idea.core.TemplateKind
import org.jetbrains.kotlin.idea.core.getFunctionBodyTextFromTemplate
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions
import org.jetbrains.kotlin.analysis.api.components.RendererModifier
import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtConstructorSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySymbol
import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
import org.jetbrains.kotlin.idea.core.TemplateKind
import org.jetbrains.kotlin.idea.core.getFunctionBodyTextFromTemplate
import org.jetbrains.kotlin.idea.j2k.IdeaDocCommentConverter
import org.jetbrains.kotlin.idea.kdoc.KDocElementFactory
import org.jetbrains.kotlin.lexer.KtTokens
......@@ -32,7 +32,7 @@ import javax.swing.Icon
internal data class KtClassMemberInfo(
// TODO: use a `KtSymbolPointer` instead to avoid storing `KtSymbol` in an object after KT-46249 is fixed.
val symbol: KtCallableSymbol,
val memberText: String,
@NlsSafe val memberText: String,
val memberIcon: Icon?,
val containingSymbolText: String?,
val containingSymbolIcon: Icon?,
......@@ -157,16 +157,8 @@ private fun KtAnalysisSession.generateFunction(
val factory = KtPsiFactory(project)
val functionText = symbol.render(renderOptions.copy(forceRenderingOverrideModifier = isOverride)) + body
return when (symbol) {
is KtConstructorSymbol -> {
if (symbol.isPrimary) {
factory.createPrimaryConstructor(functionText)
} else {
factory.createSecondaryConstructor(functionText)
}
}
else -> factory.createFunction(functionText)
}
return factory.createFunction(functionText)
}
private fun KtAnalysisSession.generateProperty(
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment