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

Convert function to property: suggest on fun keyword

Browse Source 
#KT-34450 Fixed
This commit is contained in:
Toshiaki Kameyama
2019-11-11 18:58:01 +09:00
committed by Vladimir Dolzhenko
parent 820b8c3c54
commit 79c15e49b6
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt
+4 -5
View File
@@ -20,6 +20,7 @@ import com.intellij.codeInsight.intention.LowPriorityAction
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Key import com.intellij.openapi.util.Key
import com.intellij.openapi.util.TextRange
import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.util.text.StringUtil
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.PsiMethod import com.intellij.psi.PsiMethod
@@ -45,10 +46,7 @@ import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.KtPsiFactory.CallableBuilder.Target.READ_ONLY_PROPERTY import org.jetbrains.kotlin.psi.KtPsiFactory.CallableBuilder.Target.READ_ONLY_PROPERTY
import org.jetbrains.kotlin.psi.psiUtil.endOffset import org.jetbrains.kotlin.psi.psiUtil.*
import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch
import org.jetbrains.kotlin.psi.psiUtil.getStartOffsetIn
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.resolve.scopes.utils.findVariable import org.jetbrains.kotlin.resolve.scopes.utils.findVariable
@@ -198,8 +196,9 @@ class ConvertFunctionToPropertyIntention :
override fun startInWriteAction(): Boolean = false override fun startInWriteAction(): Boolean = false
override fun isApplicableTo(element: KtNamedFunction, caretOffset: Int): Boolean { override fun isApplicableTo(element: KtNamedFunction, caretOffset: Int): Boolean {
val funKeyword = element.funKeyword ?: return false
val identifier = element.nameIdentifier ?: return false val identifier = element.nameIdentifier ?: return false
if (!identifier.textRange.containsOffset(caretOffset)) return false if (!TextRange(funKeyword.startOffset, identifier.endOffset).containsOffset(caretOffset)) return false
if (element.valueParameters.isNotEmpty() || element.isLocal) return false if (element.valueParameters.isNotEmpty() || element.isLocal) return false
idea/testData/intentions/convertFunctionToProperty/onFunKeyword.kt
Vendored
+1
View File
@@ -0,0 +1 @@
<caret>fun foo(): Int = 1
idea/testData/intentions/convertFunctionToProperty/onFunKeyword.kt.after
Vendored
+2
View File
@@ -0,0 +1,2 @@
val foo: Int
get() = 1
idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
Generated
+5
View File
@@ -4500,6 +4500,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
runTest("idea/testData/intentions/convertFunctionToProperty/nothingFun.kt"); runTest("idea/testData/intentions/convertFunctionToProperty/nothingFun.kt");
} }
@TestMetadata("onFunKeyword.kt")
public void testOnFunKeyword() throws Exception {
runTest("idea/testData/intentions/convertFunctionToProperty/onFunKeyword.kt");
}
@TestMetadata("otherRefs.kt") @TestMetadata("otherRefs.kt")
public void testOtherRefs() throws Exception { public void testOtherRefs() throws Exception {
runTest("idea/testData/intentions/convertFunctionToProperty/otherRefs.kt"); runTest("idea/testData/intentions/convertFunctionToProperty/otherRefs.kt");