azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create Function From Usage: Make ClassCandidateListCellRenderer nested class

Browse Source
This commit is contained in:
Alexey Sedunov
2014-09-23 16:27:49 +04:00
parent 06ab4e1c9a
commit d9318fdc57
2 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/ClassCandidateListCellRenderer.kt
-25
View File
@@ -1,25 +0,0 @@
package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction
import com.intellij.ide.util.PsiElementListCellRenderer
import org.jetbrains.jet.lang.psi.JetClass
import org.jetbrains.jet.plugin.presentation.JetClassPresenter
import javax.swing.*
import java.awt.*
class ClassCandidateListCellRenderer : PsiElementListCellRenderer<JetClass>() {
private val presenter = JetClassPresenter()
override fun getElementText(element: JetClass): String? =
presenter.getPresentation(element)?.getPresentableText()
protected override fun getContainerText(element: JetClass?, name: String?): String? =
element?.let { presenter.getPresentation(it) }?.getLocationString()
override fun getIconFlags(): Int = 0
public override fun getListCellRendererComponent(
list: JList<out Any?>, value: Any?, index: Int, isSelected: Boolean, cellHasFocus: Boolean
): Component? =
super.getListCellRendererComponent(list, (value as ClassCandidate).jetClass, index, isSelected, cellHasFocus)
}
idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromUsageFix.kt
+20
View File
@@ -68,6 +68,9 @@ import org.jetbrains.jet.plugin.quickfix.QuickFixUtil
import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase
import org.jetbrains.jet.plugin.refactoring.EmptyValidator import org.jetbrains.jet.plugin.refactoring.EmptyValidator
import org.jetbrains.jet.plugin.refactoring.CollectingValidator import org.jetbrains.jet.plugin.refactoring.CollectingValidator
import com.intellij.ide.util.PsiElementListCellRenderer
import org.jetbrains.jet.plugin.presentation.JetClassPresenter
import java.awt.Component
private val TYPE_PARAMETER_LIST_VARIABLE_NAME = "typeParameterList" private val TYPE_PARAMETER_LIST_VARIABLE_NAME = "typeParameterList"
private val TEMPLATE_FROM_USAGE_FUNCTION_BODY = "New Kotlin Function Body.kt" private val TEMPLATE_FROM_USAGE_FUNCTION_BODY = "New Kotlin Function Body.kt"
@@ -325,6 +328,23 @@ public class CreateFunctionFromUsageFix internal (
private val returnType: TypeOrExpressionThereof, private val returnType: TypeOrExpressionThereof,
private val parameters: List<Parameter> = Collections.emptyList() private val parameters: List<Parameter> = Collections.emptyList()
) : CreateFromUsageFixBase(element) { ) : CreateFromUsageFixBase(element) {
private class ClassCandidateListCellRenderer : PsiElementListCellRenderer<JetClass>() {
private val presenter = JetClassPresenter()
override fun getElementText(element: JetClass): String? =
presenter.getPresentation(element)?.getPresentableText()
protected override fun getContainerText(element: JetClass?, name: String?): String? =
element?.let { presenter.getPresentation(it) }?.getLocationString()
override fun getIconFlags(): Int = 0
public override fun getListCellRendererComponent(
list: JList<out Any?>, value: Any?, index: Int, isSelected: Boolean, cellHasFocus: Boolean
): Component? =
super.getListCellRendererComponent(list, (value as ClassCandidate).jetClass, index, isSelected, cellHasFocus)
}
private var isUnit: Boolean = false private var isUnit: Boolean = false
private var isExtension: Boolean = false private var isExtension: Boolean = false
private var currentFile: JetFile by Delegates.notNull() private var currentFile: JetFile by Delegates.notNull()