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

Add getter: don't suggest when property has no type or initializer

Browse Source 
So #KT-24632 Fixed
This commit is contained in:
Toshiaki Kameyama
2018-05-29 16:13:33 +03:00
committed by Mikhail Glukhikh
parent 8969e7a6e1
commit b4962a1880
6 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/AddAccessorIntentions.kt
+5 -4
View File
@@ -27,21 +27,22 @@ import org.jetbrains.kotlin.psi.KtProperty
import org.jetbrains.kotlin.psi.KtPsiFactory
abstract class AbstractAddAccessorsIntention(
private val addGetter: Boolean,
private val addSetter: Boolean
private val addGetter: Boolean,
private val addSetter: Boolean
) : SelfTargetingRangeIntention<KtProperty>(KtProperty::class.java, createFamilyName(addGetter, addSetter)) {
override fun applicabilityRange(element: KtProperty): TextRange? {
if (element.isLocal || element.isAbstract() || element.hasDelegate() ||
element.hasModifier(KtTokens.LATEINIT_KEYWORD) ||
element.hasModifier(KtTokens.CONST_KEYWORD)) {
element.hasModifier(KtTokens.CONST_KEYWORD)
) {
return null
}
val descriptor = element.resolveToDescriptorIfAny() as? CallableMemberDescriptor ?: return null
if (descriptor.isExpect) return null
if (addSetter && (!element.isVar || element.setter != null)) return null
if (addGetter && element.getter != null) return null
if (addGetter && ((element.typeReference == null && element.initializer == null) || element.getter != null)) return null
return element.nameIdentifier?.textRange
}
idea/testData/intentions/addPropertyAccessors/both/noType.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// IS_APPLICABLE: false
// SKIP_ERRORS_BEFORE
// SKIP_ERRORS_AFTER
var x<caret>
idea/testData/intentions/addPropertyAccessors/getter/noType.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// IS_APPLICABLE: false
// SKIP_ERRORS_BEFORE
// SKIP_ERRORS_AFTER
var x<caret>
idea/testData/intentions/addPropertyAccessors/setter/noType.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
// SKIP_ERRORS_BEFORE
// SKIP_ERRORS_AFTER
var x<caret>
idea/testData/intentions/addPropertyAccessors/setter/noType.kt.after
Vendored
+6
View File
@@ -0,0 +1,6 @@
// SKIP_ERRORS_BEFORE
// SKIP_ERRORS_AFTER
var x
set(value) {
field = value
}
idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
Generated
+15
View File
@@ -1475,6 +1475,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
runTest("idea/testData/intentions/addPropertyAccessors/both/local.kt");
}
@TestMetadata("noType.kt")
public void testNoType() throws Exception {
runTest("idea/testData/intentions/addPropertyAccessors/both/noType.kt");
}
@TestMetadata("top.kt")
public void testTop() throws Exception {
runTest("idea/testData/intentions/addPropertyAccessors/both/top.kt");
@@ -1543,6 +1548,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
runTest("idea/testData/intentions/addPropertyAccessors/getter/local.kt");
}
@TestMetadata("noType.kt")
public void testNoType() throws Exception {
runTest("idea/testData/intentions/addPropertyAccessors/getter/noType.kt");
}
@TestMetadata("top.kt")
public void testTop() throws Exception {
runTest("idea/testData/intentions/addPropertyAccessors/getter/top.kt");
@@ -1606,6 +1616,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
runTest("idea/testData/intentions/addPropertyAccessors/setter/local.kt");
}
@TestMetadata("noType.kt")
public void testNoType() throws Exception {
runTest("idea/testData/intentions/addPropertyAccessors/setter/noType.kt");
}
@TestMetadata("top.kt")
public void testTop() throws Exception {
runTest("idea/testData/intentions/addPropertyAccessors/setter/top.kt");