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

Renamed intention class

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-10 10:55:11 +03:00
parent 744e760444
commit 2203fb3231
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/intentionDescriptions/InsertExplicitTypeArguments/after.kt.template → idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/after.kt.template
View File
idea/resources/intentionDescriptions/InsertExplicitTypeArguments/before.kt.template → idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/before.kt.template
View File
idea/resources/intentionDescriptions/InsertExplicitTypeArguments/description.html → idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/description.html
View File
idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -727,7 +727,7 @@
</intentionAction> </intentionAction>
<intentionAction> <intentionAction>
<className>org.jetbrains.kotlin.idea.intentions.InsertExplicitTypeArguments</className> <className>org.jetbrains.kotlin.idea.intentions.InsertExplicitTypeArgumentsIntention</className>
<category>Kotlin</category> <category>Kotlin</category>
</intentionAction> </intentionAction>
idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt
+2 -2
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.idea.util.application.runReadAction
import com.intellij.psi.PsiManager import com.intellij.psi.PsiManager
import com.intellij.psi.impl.PsiModificationTrackerImpl import com.intellij.psi.impl.PsiModificationTrackerImpl
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.idea.intentions.InsertExplicitTypeArguments import org.jetbrains.kotlin.idea.intentions.InsertExplicitTypeArgumentsIntention
import org.jetbrains.kotlin.idea.util.psi.patternMatching.toRange import org.jetbrains.kotlin.idea.util.psi.patternMatching.toRange
import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
@@ -252,7 +252,7 @@ private fun addDebugExpressionBeforeContextElement(codeFragment: JetCodeFragment
private fun replaceByRunFunction(expression: JetExpression): JetCallExpression { private fun replaceByRunFunction(expression: JetExpression): JetCallExpression {
val callExpression = JetPsiFactory(expression).createExpression("run { \n${expression.getText()} \n}") as JetCallExpression val callExpression = JetPsiFactory(expression).createExpression("run { \n${expression.getText()} \n}") as JetCallExpression
val replaced = expression.replaced(callExpression) val replaced = expression.replaced(callExpression)
val typeArguments = InsertExplicitTypeArguments.createTypeArguments(replaced, replaced.analyze()) val typeArguments = InsertExplicitTypeArgumentsIntention.createTypeArguments(replaced, replaced.analyze())
if (typeArguments?.getArguments()?.isNotEmpty() ?: false) { if (typeArguments?.getArguments()?.isNotEmpty() ?: false) {
val calleeExpression = replaced.getCalleeExpression() val calleeExpression = replaced.getCalleeExpression()
replaced.addAfter(typeArguments!!, calleeExpression) replaced.addAfter(typeArguments!!, calleeExpression)
idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt → idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArgumentsIntention.kt
+1 -1
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.types.ErrorUtils
public class InsertExplicitTypeArguments : JetSelfTargetingRangeIntention<JetCallExpression>(javaClass(), "Add explicit type arguments"), LowPriorityAction { public class InsertExplicitTypeArgumentsIntention : JetSelfTargetingRangeIntention<JetCallExpression>(javaClass(), "Add explicit type arguments"), LowPriorityAction {
override fun applicabilityRange(element: JetCallExpression): TextRange? { override fun applicabilityRange(element: JetCallExpression): TextRange? {
return if (isApplicableTo(element, element.analyze())) element.getCalleeExpression()!!.getTextRange() else null return if (isApplicableTo(element, element.analyze())) element.getCalleeExpression()!!.getTextRange() else null
} }
idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceWithAnnotationAnalyzer.kt
+3 -3
View File
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.idea.core.copied
import org.jetbrains.kotlin.idea.core.replaced import org.jetbrains.kotlin.idea.core.replaced
import org.jetbrains.kotlin.idea.imports.canBeReferencedViaImport import org.jetbrains.kotlin.idea.imports.canBeReferencedViaImport
import org.jetbrains.kotlin.idea.imports.importableFqName import org.jetbrains.kotlin.idea.imports.importableFqName
import org.jetbrains.kotlin.idea.intentions.InsertExplicitTypeArguments import org.jetbrains.kotlin.idea.intentions.InsertExplicitTypeArgumentsIntention
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.FqNameUnsafe import org.jetbrains.kotlin.name.FqNameUnsafe
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
@@ -100,8 +100,8 @@ object ReplaceWithAnnotationAnalyzer {
val typeArgsToAdd = ArrayList<Pair<JetCallExpression, JetTypeArgumentList>>() val typeArgsToAdd = ArrayList<Pair<JetCallExpression, JetTypeArgumentList>>()
expression.forEachDescendantOfType<JetCallExpression> { expression.forEachDescendantOfType<JetCallExpression> {
if (InsertExplicitTypeArguments.isApplicableTo(it, bindingContext)) { if (InsertExplicitTypeArgumentsIntention.isApplicableTo(it, bindingContext)) {
typeArgsToAdd.add(it to InsertExplicitTypeArguments.createTypeArguments(it, bindingContext)!!) typeArgsToAdd.add(it to InsertExplicitTypeArgumentsIntention.createTypeArguments(it, bindingContext)!!)
} }
} }
idea/testData/intentions/insertExplicitTypeArguments/.intention
Vendored
+1 -1
View File
@@ -1 +1 @@
org.jetbrains.kotlin.idea.intentions.InsertExplicitTypeArguments org.jetbrains.kotlin.idea.intentions.InsertExplicitTypeArgumentsIntention