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

Renamed class

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-26 13:19:21 +02:00
parent 498e746689
commit 4fc67c27b0
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/JetTypeLookupExpression.kt → idea/src/org/jetbrains/kotlin/idea/intentions/ChooseValueExpression.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import com.intellij.openapi.editor.Editor
import com.intellij.openapi.util.TextRange import com.intellij.openapi.util.TextRange
import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil
public abstract class JetTypeLookupExpression<T : Any>( public abstract class ChooseValueExpression<T : Any>(
lookupItems: List<T>, lookupItems: List<T>,
protected val defaultItem: T, protected val defaultItem: T,
private val advertisementText: String? = null private val advertisementText: String? = null
idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
+1 -1
View File
@@ -79,7 +79,7 @@ public class SpecifyTypeExplicitlyIntention : JetSelfTargetingIntention<JetCalla
val types = if (isAnonymous) ArrayList<JetType>() else arrayListOf(exprType) val types = if (isAnonymous) ArrayList<JetType>() else arrayListOf(exprType)
types.addAll(allSupertypes) types.addAll(allSupertypes)
return object : JetTypeLookupExpression<JetType>(types, types.first()) { return object : ChooseValueExpression<JetType>(types, types.first()) {
override fun getLookupString(element: JetType) = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(element) override fun getLookupString(element: JetType) = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(element)
override fun getResult(element: JetType) = IdeDescriptorRenderers.SOURCE_CODE.renderType(element) override fun getResult(element: JetType) = IdeDescriptorRenderers.SOURCE_CODE.renderType(element)
} }
idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
+2 -2
View File
@@ -27,7 +27,7 @@ import com.intellij.psi.PsiDocumentManager
import org.apache.commons.lang.StringEscapeUtils.escapeJava import org.apache.commons.lang.StringEscapeUtils.escapeJava
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
import org.jetbrains.kotlin.idea.intentions.JetTypeLookupExpression import org.jetbrains.kotlin.idea.intentions.ChooseValueExpression
import org.jetbrains.kotlin.idea.intentions.branchedTransformations.convertToIfNotNullExpression import org.jetbrains.kotlin.idea.intentions.branchedTransformations.convertToIfNotNullExpression
import org.jetbrains.kotlin.idea.intentions.branchedTransformations.convertToIfNullExpression import org.jetbrains.kotlin.idea.intentions.branchedTransformations.convertToIfNullExpression
import org.jetbrains.kotlin.idea.intentions.branchedTransformations.introduceValueForCondition import org.jetbrains.kotlin.idea.intentions.branchedTransformations.introduceValueForCondition
@@ -69,7 +69,7 @@ public class DoubleBangToIfThenIntention : JetSelfTargetingRangeIntention<JetPos
val kotlinNullPtrExceptionText = "KotlinNullPointerException()" val kotlinNullPtrExceptionText = "KotlinNullPointerException()"
val exceptionLookupExpression = val exceptionLookupExpression =
object: JetTypeLookupExpression<String>(listOf(nullPtrExceptionText, kotlinNullPtrExceptionText), object: ChooseValueExpression<String>(listOf(nullPtrExceptionText, kotlinNullPtrExceptionText),
nullPtrExceptionText) { nullPtrExceptionText) {
override fun getLookupString(element: String) = element override fun getLookupString(element: String) = element
override fun getResult(element: String) = element override fun getResult(element: String) = element